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.219 by root, Mon Aug 6 05:06:32 2007 UTC vs.
Revision 1.292 by root, Fri Dec 4 15:04: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
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 95
66# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
67#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
68 101
69static AV *texture_av; 102static AV *texture_av;
70 103
71static struct 104static struct
72{ 105{
109 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
111} 144}
112 145
113#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
114 148
115#include "pango-font.c" 149#include "pango-font.c"
116#include "pango-fontmap.c" 150#include "pango-fontmap.c"
117#include "pango-render.c" 151#include "pango-render.c"
118 152
119typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
123 157
124typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
125 159
126static int 160static int
127shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
128{ 162{
129 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
143 177
144typedef struct cf_layout { 178typedef struct cf_layout {
145 PangoLayout *pl; 179 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
147 int base_height; 181 int base_height;
148 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
149} *CFPlus__Layout; 184} *DC__Layout;
150 185
151static CFPlus__Font default_font; 186static DC__Font default_font;
152static PangoContext *opengl_context; 187static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
154 189
155static void 190static void
156substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
161#endif 196#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 198}
164 199
165static void 200static void
166layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
167{ 202{
168 /* 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
169 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
170 */ 205 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
172 207
173 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 210
176 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
177} 212}
178 213
179static void 214static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 216{
182 PangoRectangle rect; 217 PangoRectangle rect;
183 218
184 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
196 231
197typedef uint16_t tileid; 232typedef uint16_t tileid;
198typedef uint16_t faceid; 233typedef uint16_t faceid;
199 234
200typedef struct { 235typedef struct {
201 int name; 236 GLuint name;
202 int w, h; 237 int w, h;
203 float s, t; 238 float s, t;
204 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
205 tileid smoothtile; 240 tileid smoothtile;
206 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
207} maptex; 243} maptex;
208 244
209typedef struct { 245typedef struct {
210 uint32_t player; 246 uint32_t player;
211 tileid tile[3]; 247 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
226 262
227 int32_t rows; 263 int32_t rows;
228 maprow *row; 264 maprow *row;
229} *CFPlus__Map; 265} *DC__Map;
230 266
231static char * 267static char *
232prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
233{ 269{
234 char *p; 270 char *p;
272 self->texs *= 2; 308 self->texs *= 2;
273 } 309 }
274} 310}
275 311
276static maprow * 312static maprow *
277map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
278{ 314{
279 if (0 > y) 315 if (0 > y)
280 { 316 {
281 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
320 356
321 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
322} 358}
323 359
324static mapcell * 360static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
326{ 362{
327 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
328} 364}
329 365
330static void 366static void
331map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
332{ 368{
333 int r; 369 int r;
334 370
335 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
343 self->oy = 0; 379 self->oy = 0;
344 self->row = 0; 380 self->row = 0;
345 self->rows = 0; 381 self->rows = 0;
346} 382}
347 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
348static void 394static void
349map_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)
350{ 396{
351 int x, y; 397 int x, y;
352 maprow *row; 398 maprow *row;
353 mapcell *cell; 399 mapcell *cell;
354 400
366 if (x >= row->c1) 412 if (x >= row->c1)
367 break; 413 break;
368 414
369 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
370 416
371 cell->darkness = 0; 417 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 418 }
376 } 419 }
377} 420}
378 421
379typedef struct { 422typedef struct {
433 n |= n >> 16; 476 n |= n >> 16;
434 477
435 return n + 1; 478 return n + 1;
436} 479}
437 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
438/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
441 495
442/******************************************************************************/ 496/******************************************************************************/
480 return 0; 534 return 0;
481 535
482 return 1; 536 return 1;
483} 537}
484 538
485MODULE = 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
486 592
487PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
488 594
489BOOT: 595BOOT:
490{ 596{
491 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 598 static const struct {
493 const char *name; 599 const char *name;
494 IV iv; 600 IV iv;
495 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
518 624
519 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
522 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),
523 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
603 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)
604# undef const_iv 795# undef const_iv
605 }; 796 };
606 797
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 817
627NV floor (NV x) 818NV floor (NV x)
628 819
629NV ceil (NV x) 820NV ceil (NV x)
630 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
631void 826void
632pango_init () 827pango_init ()
633 CODE: 828 CODE:
634{ 829{
635 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
636 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);
637 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
638} 838}
639 839
640char *
641SDL_GetError () 840char *SDL_GetError ()
642 841
643int 842void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 843
646void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
647SDL_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
648 860
649void 861void
650SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
651 PPCODE: 863 PPCODE:
652{ 864{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 879
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 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); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 882
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 884
676 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
677 while (*m) 886 while (*m)
678 { 887 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 889 {
681 AV *av = newAV (); 890 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
708 917
709 if (RETVAL) 918 if (RETVAL)
710 { 919 {
711 av_clear (texture_av); 920 av_clear (texture_av);
712 921
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 924#include "glfunc.h"
716#undef GL_FUNC 925#undef GL_FUNC
717 } 926 }
718} 927}
725char * 934char *
726SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
727 936
728int 937int
729SDL_GetAppState () 938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
730 942
731void 943void
732poll_events () 944poll_events ()
733 PPCODE: 945 PPCODE:
734{ 946{
744 { 956 {
745 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
746 case SDL_KEYUP: 958 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 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);
750 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 */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 964 break;
753 965
754 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 985 x = ev.motion.x;
774 y = ev.motion.y; 986 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 988 }
777 989
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 996 }
785 break; 997 break;
786 998
787 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 1002
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1013 break;
802 } 1014 }
803 1015
804 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))));
805 } 1017 }
806} 1018}
807 1019
808int 1020int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1022 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
1025
1026void
1027Mix_QuerySpec ()
1028 PPCODE:
1029{
1030 int freq, channels;
1031 Uint16 format;
1032
1033 if (Mix_QuerySpec (&freq, &format, &channels))
1034 {
1035 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (freq)));
1037 PUSHs (sv_2mortal (newSViv (format)));
1038 PUSHs (sv_2mortal (newSViv (channels)));
1039 }
1040}
813 1041
814void 1042void
815Mix_CloseAudio () 1043Mix_CloseAudio ()
816 1044
817int 1045int
852 } 1080 }
853 } 1081 }
854#endif 1082#endif
855} 1083}
856 1084
857void 1085int
858add_font (char *file) 1086add_font (char *file)
859 CODE: 1087 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
861 1091
862void 1092void
863load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
864 ALIAS: 1094 ALIAS:
865 load_image_file = 1 1095 load_image_file = 1
951void 1181void
952error (char *message) 1182error (char *message)
953 CODE: 1183 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1185#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1187#endif
958 1188
959void 1189void
960fatal (char *message) 1190fatal (char *message)
961 CODE: 1191 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1193#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1195#endif
966 _exit (1); 1196 _exit (1);
967 1197
968void 1198void
969_exit (int retval = 0) 1199_exit (int retval = 0)
981#if DEBUG 1211#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
983#endif 1213#endif
984} 1214}
985 1215
986MODULE = 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
987 1224
988PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
989 1226
990CFPlus::Font 1227DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1229 CODE:
993{ 1230{
994 int count; 1231 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1235}
999 OUTPUT: 1236 OUTPUT:
1000 RETVAL 1237 RETVAL
1001 1238
1002void 1239void
1003DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
1004 CODE: 1241 CODE:
1005 pango_font_description_free (self); 1242 pango_font_description_free (self);
1006 1243
1007void 1244void
1008make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1009 PROTOTYPE: $ 1246 PROTOTYPE: $
1010 CODE: 1247 CODE:
1011 default_font = self; 1248 default_font = self;
1012 1249
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1251
1015PROTOTYPES: DISABLE 1252PROTOTYPES: DISABLE
1016 1253
1017void 1254void
1018reset_glyph_cache () 1255glyph_cache_backup ()
1019 PROTOTYPE: 1256 PROTOTYPE:
1020 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
1021 tc_clear (); 1264 tc_restore ();
1022 1265
1023CFPlus::Layout 1266DC::Layout
1024new (SV *class) 1267new (SV *class)
1025 CODE: 1268 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
1027 1270
1028 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1035 1279
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
1038 OUTPUT: 1282 OUTPUT:
1039 RETVAL 1283 RETVAL
1040 1284
1041void 1285void
1042DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
1043 CODE: 1287 CODE:
1044 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
1045 Safefree (self); 1290 Safefree (self);
1046 1291
1047void 1292void
1048set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
1049 CODE: 1294 CODE:
1050{ 1295{
1051 STRLEN textlen; 1296 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
1053 1298
1054 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
1055} 1300}
1056 1301
1057void 1302void
1058set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1059 CODE: 1304 CODE:
1060{ 1305{
1061 STRLEN textlen; 1306 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1063 1308
1064 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1065} 1310}
1066 1311
1067void 1312void
1068set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1069 CODE: 1314 CODE:
1070{ 1315{
1071 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1318 const char *pos = text;
1108 if (attrs) 1353 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1110} 1355}
1111 1356
1112void 1357void
1113get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1114 PPCODE: 1359 PPCODE:
1115{ 1360{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1362
1118 do 1363 do
1119 { 1364 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1366
1122 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1123 { 1368 {
1124 PangoRectangle extents; 1369 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1378
1134 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1135} 1380}
1136 1381
1137int 1382int
1138has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1139 CODE: 1384 CODE:
1140{ 1385{
1141 int lines = 1; 1386 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1143 1388
1148} 1393}
1149 OUTPUT: 1394 OUTPUT:
1150 RETVAL 1395 RETVAL
1151 1396
1152SV * 1397SV *
1153get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1154 CODE: 1399 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1402 OUTPUT:
1158 RETVAL 1403 RETVAL
1159 1404
1160void 1405void
1161set_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.)
1162 CODE: 1407 CODE:
1163 self->r = r; 1408 self->r = r;
1164 self->g = g; 1409 self->g = g;
1165 self->b = b; 1410 self->b = b;
1166 self->a = a; 1411 self->a = a;
1167 1412
1168void 1413void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1415 CODE:
1171 if (self->font != font) 1416 if (self->font != font)
1172 { 1417 {
1173 self->font = font; 1418 self->font = font;
1174 layout_update_font (self); 1419 layout_update_font (self);
1175 } 1420 }
1176 1421
1177void 1422void
1178set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1179 CODE: 1424 CODE:
1180 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1181 { 1426 {
1182 self->base_height = base_height; 1427 self->base_height = base_height;
1183 layout_update_font (self); 1428 layout_update_font (self);
1184 } 1429 }
1185 1430
1186void 1431void
1187set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1433 CODE:
1189 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);
1190 1435
1191void 1436void
1192set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1193 CODE: 1438 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1440
1196void 1441void
1197set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1198 CODE: 1443 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1445
1201void 1446void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1448 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1209 ); 1454 );
1210 1455
1211void 1456void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1458 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1460
1216void 1461void
1217size (CFPlus::Layout self) 1462size (DC::Layout self)
1218 PPCODE: 1463 PPCODE:
1219{ 1464{
1220 int w, h; 1465 int w, h;
1221 1466
1222 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1227} 1472}
1228 1473
1229int 1474int
1230descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1231 CODE: 1476 CODE:
1232{ 1477{
1233 PangoRectangle rect; 1478 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1237} 1482}
1238 OUTPUT: 1483 OUTPUT:
1239 RETVAL 1484 RETVAL
1240 1485
1241int 1486int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1488 CODE:
1244{ 1489{
1245 int index, trailing; 1490 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1248} 1493}
1249 OUTPUT: 1494 OUTPUT:
1250 RETVAL 1495 RETVAL
1251 1496
1252void 1497void
1253cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1499 PPCODE:
1255{ 1500{
1256 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1503
1259 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1508}
1264 1509
1265void 1510void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1512 PPCODE:
1268{ 1513{
1269 int line, x; 1514 int line, x;
1270 1515
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1519 --line;
1520#endif
1274 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1524}
1278 1525
1279void 1526void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1528 PPCODE:
1282{ 1529{
1283 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1284 int index, trailing; 1531 int index, trailing;
1285 1532
1286 if (line < 0) 1533 if (line < 0)
1287 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1288 1535
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1291 1538
1292 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);
1293 1540
1294 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1548 }
1302} 1549}
1303 1550
1304void 1551void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1308 self->pl, 1556 self->pl,
1557 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1311 flags 1560 flags
1312 ); 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);
1313 1565
1314MODULE = 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
1315 1586
1316PROTOTYPES: ENABLE 1587PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1588
1320void 1589void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1590pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1591 CODE:
1323{ 1592{
1400 RETVAL = width > 0; 1669 RETVAL = width > 0;
1401} 1670}
1402 OUTPUT: 1671 OUTPUT:
1403 RETVAL 1672 RETVAL
1404 1673
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1674MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1675
1407PROTOTYPES: DISABLE 1676PROTOTYPES: DISABLE
1408 1677
1409CFPlus::Map 1678DC::Map
1410new (SV *class) 1679new (SV *class)
1411 CODE: 1680 CODE:
1412 New (0, RETVAL, 1, struct map); 1681 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1682 RETVAL->x = 0;
1414 RETVAL->y = 0; 1683 RETVAL->y = 0;
1422 RETVAL->row = 0; 1691 RETVAL->row = 0;
1423 OUTPUT: 1692 OUTPUT:
1424 RETVAL 1693 RETVAL
1425 1694
1426void 1695void
1427DESTROY (CFPlus::Map self) 1696DESTROY (DC::Map self)
1428 CODE: 1697 CODE:
1429{ 1698{
1430 map_clear (self); 1699 map_clear (self);
1431 Safefree (self->face2tile); 1700 Safefree (self->face2tile);
1432 Safefree (self->tex); 1701 Safefree (self->tex);
1433 Safefree (self); 1702 Safefree (self);
1434} 1703}
1435 1704
1436void 1705void
1437resize (CFPlus::Map self, int map_width, int map_height) 1706resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1707 CODE:
1439 self->w = map_width; 1708 self->w = map_width;
1440 self->h = map_height; 1709 self->h = map_height;
1441 1710
1442void 1711void
1443clear (CFPlus::Map self) 1712clear (DC::Map self)
1444 CODE: 1713 CODE:
1445 map_clear (self); 1714 map_clear (self);
1446 1715
1447void 1716void
1448set_tileid (CFPlus::Map self, int face, int tile) 1717set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1718 CODE:
1450{ 1719{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1720 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1721 need_texid (self, tile);
1453} 1722}
1454 1723
1455void 1724void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1725set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1726 CODE:
1458{ 1727{
1459 tileid texid; 1728 tileid texid;
1460 maptex *tex; 1729 maptex *tex;
1461 1730
1474 tex->smoothtile = self->face2tile [smooth]; 1743 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1744 tex->smoothlevel = level;
1476} 1745}
1477 1746
1478void 1747void
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) 1748set_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: 1749 CODE:
1481{ 1750{
1482 need_texid (self, texid); 1751 need_texid (self, texid);
1483 1752
1484 { 1753 {
1503 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1504 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1775}
1507 1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1796
1508int 1797int
1509ox (CFPlus::Map self) 1798ox (DC::Map self)
1510 ALIAS: 1799 ALIAS:
1511 oy = 1 1800 oy = 1
1512 x = 2 1801 x = 2
1513 y = 3 1802 y = 3
1514 w = 4 1803 w = 4
1525 } 1814 }
1526 OUTPUT: 1815 OUTPUT:
1527 RETVAL 1816 RETVAL
1528 1817
1529void 1818void
1530scroll (CFPlus::Map self, int dx, int dy) 1819scroll (DC::Map self, int dx, int dy)
1531 CODE: 1820 CODE:
1532{ 1821{
1533 if (dx > 0) 1822 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1823 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1824 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1839 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1840 self->y += MAP_EXTEND_Y;
1552 } 1841 }
1553} 1842}
1554 1843
1555void 1844SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1845map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1846 CODE:
1558{ 1847{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1849 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1850 mapcell *cell;
1562 int x, y, flags; 1851 int x, y, z, flags;
1852 AV *missing = newAV ();
1853 RETVAL = newRV_noinc ((SV *)missing);
1563 1854
1564 while (data < data_end - 1) 1855 while (data < data_end - 1)
1565 { 1856 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1857 flags = (data [0] << 8) + data [1]; data += 2;
1567 1858
1587 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1588 1879
1589 do 1880 do
1590 { 1881 {
1591 ext = *data++; 1882 ext = *data++;
1592 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1593 1884
1594 if (cmd < 4) 1885 if (cmd < 4)
1595 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1596 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1597 { 1888 {
1600 } 1891 }
1601 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1602 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1603 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1604 { 1895 {
1605 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1606 ; // decode player count 1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1607 1900
1608 data += *data + 1; 1901 data += *data + 1;
1609 } 1902 }
1610 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1611 cell->flags = *data++; 1904 cell->flags = *data++;
1618 } 1911 }
1619 else 1912 else
1620 cell->darkness = *data++ + 1; 1913 cell->darkness = *data++ + 1;
1621 } 1914 }
1622 1915
1916 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1917 if (flags & (4 >> z))
1624 { 1918 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1919 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1920 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1922
1923 if (cell->tile [z])
1924 {
1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1927 if (!tex->name)
1928 av_push (missing, newSViv (cell->tile [z]));
1929
1930 if (tex->smoothtile)
1931 {
1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1934 if (!smooth->name)
1935 av_push (missing, newSViv (tex->smoothtile));
1936 }
1937 }
1628 } 1938 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1939 }
1644 else 1940 else
1645 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1646 } 1942 }
1647} 1943}
1944 OUTPUT:
1945 RETVAL
1648 1946
1649SV * 1947SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1948mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 1949 CODE:
1652{ 1950{
1653 int x1, x; 1951 int x1, x;
1654 int y1, y; 1952 int y1, y;
1655 int z; 1953 int z;
1699 RETVAL = map_sv; 1997 RETVAL = map_sv;
1700} 1998}
1701 OUTPUT: 1999 OUTPUT:
1702 RETVAL 2000 RETVAL
1703 2001
1704SV * 2002void
1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1706 CODE: 2004 CODE:
1707{ 2005{
2006 int x, y, z;
2007
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1711 smooth_key skey; 2011 smooth_key skey;
1712 int x, y, z; 2012 int pl_x, pl_y;
1713 int last_name; 2013 maptex pl_tex;
1714 AV *missing = newAV (); 2014 rc_t *rc = rc_alloc ();
1715 RETVAL = newRV_noinc ((SV *)missing); 2015 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden;
1716 2018
2019 pl_tex.name = 0;
2020
1717 // thats current max. sorry. 2021 // that's current max. sorry.
1718 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1720 2024
1721 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
1723 2027
1724 glColor4ub (255, 255, 255, 255); 2028 memset (&key, 0, sizeof (key));
1725 2029 key.r = 255;
1726 glEnable (GL_BLEND); 2030 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2031 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 2032 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2033 key.mode = GL_QUADS;
1730 2034 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1;
1734 2035
1735 mx += self->x; 2036 mx += self->x;
1736 my += self->y; 2037 my += self->y;
1737 2038
1738 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 2056 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 2057 self->tex [cell->tile [2]].smoothlevel));
1757 } 2058 }
1758 } 2059 }
1759 2060
2061 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1760 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1761 { 2069 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1763 2072
1764 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1765 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1766 { 2075 {
1767 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
1775 if (tile) 2084 if (tile)
1776 { 2085 {
1777 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1778 int px, py; 2087 int px, py;
1779 2088
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 2089 if (key.texname != tex.name)
1783 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1784 if (!tex.name) 2093 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1788 }
1789 2095
1790 glEnd (); 2096 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2097 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 2098 }
1794 2099
1795 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 2101 py = (y + 1) * T - tex.h;
1797 2102
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2103 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 { 2104 {
1805 if (cell->flags & 1) 2105 pl_x = px;
2106 pl_y = py;
2107 pl_tex = tex;
1806 { 2108 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 } 2109 }
2110
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1821 2115
1822 // update smooth hash 2116 // update smooth hash
1823 if (tex.smoothtile) 2117 if (tex.smoothtile)
1824 { 2118 {
1825 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1856 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 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); 2151 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); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1859 } 2153 }
1860 } 2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
2190 }
2191 }
1861 } 2192 }
1862 } 2193 }
2194
2195 rc_draw (rc);
2196 rc_clear (rc);
1863 2197
1864 // go through all smoothlevels, lowest to highest, then draw. 2198 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 2199 // this is basically counting sort
1866 { 2200 {
1867 int w, b; 2201 int w, b;
1868 2202
2203 glEnable (GL_TEXTURE_2D);
2204 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2205 for (w = 0; w < 256 / 32; ++w)
1870 { 2206 {
1871 uint32_t smask = smooth_level [w]; 2207 uint32_t smask = smooth_level [w];
1872 if (smask) 2208 if (smask)
1873 for (b = 0; b < 32; ++b) 2209 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2228 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2229 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2230 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2231 float dy = tex.t * .5f ; // 2 images/column
1896 2232
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2233 if (tex.name)
1900 { 2234 {
2235 // this time avoiding texture state changes
2236 // save gobs of state changes.
1901 if (!tex.name) 2237 if (key.texname != tex.name)
1902 { 2238 {
1903 av_push (missing, newSViv (skey->tile)); 2239 self->tex [skey->tile].unused = 0;
1904 continue; // smoothing not yet available 2240
2241 glEnd ();
2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2243 glBegin (GL_QUADS);
1905 } 2244 }
1906 2245
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2246 if (border)
1913 { 2247 {
1914 float ox = border * dx; 2248 float ox = border * dx;
1915 2249
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2250 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2251 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2252 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2253 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2254 }
1921 2255
1922 if (corner) 2256 if (corner)
1923 { 2257 {
1924 float ox = corner * dx; 2258 float ox = corner * dx;
1925 2259
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2260 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2261 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2262 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2263 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2264 }
1930 } 2265 }
1931 } 2266 }
1932 } 2267 }
1933 } 2268 }
1934 } 2269 }
2270
2271 glEnd ();
2272 glDisable (GL_TEXTURE_2D);
2273 key.texname = -1;
1935 } 2274 }
1936 2275
1937 hv_clear (smooth); 2276 hv_clear (smooth);
1938 } 2277 }
1939 2278
1940 glEnd (); 2279 if (pl_tex.name)
2280 {
2281 maptex tex = pl_tex;
2282 int px = pl_x + sdx;
2283 int py = pl_y + sdy;
1941 2284
1942 glDisable (GL_TEXTURE_2D); 2285 key.texname = tex.name;
2286 arr = rc_array (rc, &key);
2287
2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2289 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2290 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2292
2293 rc_draw (rc);
2294 }
2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
1943 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2300 rc_free (rc);
2301 rc_free (rc_ov);
1944 2302
1945 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
1948 { 2306 {
1953 { 2311 {
1954 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
1955 2313
1956 int px = x * T; 2314 int px = x * T;
1957 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
1958 2322
1959 if (cell->stat_hp) 2323 if (cell->stat_hp)
1960 { 2324 {
1961 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
1962 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2335 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2336 }
1973 } 2337 }
1974 } 2338 }
1975} 2339}
1976 OUTPUT:
1977 RETVAL
1978 2340
1979void 2341void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2342draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2343 CODE:
1982{ 2344{
1983 static float color[16][3] = { 2345 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2346 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2347 { 1.00F, 1.00F, 1.00F },
2004 }; 2366 };
2005 2367
2006 int x, y; 2368 int x, y;
2007 2369
2008 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2013 2381
2014 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
2021 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2022 2390
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2024 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2025 2393
2026 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2399 }
2035 glDisable (GL_BLEND); 2403 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2404 glDisable (GL_TEXTURE_2D);
2037} 2405}
2038 2406
2039void 2407void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2408fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2409 PPCODE:
2042{ 2410{
2043 int x, y; 2411 int x, y;
2044 int sw1 = sw + 2; 2412 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2413 int sh1 = sh + 2;
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2422
2055 mx += self->x - 1; 2423 mx += self->x - 1;
2056 my += self->y - 1; 2424 my += self->y - 1;
2057 2425
2058 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2059 2427
2060 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2062 { 2430 {
2063 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2484 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2485 PUSHs (darkness3_sv);
2118} 2486}
2119 2487
2120SV * 2488SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2489get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2490 CODE:
2123{ 2491{
2124 int x, y, x1, y1; 2492 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2493 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2494 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2551 else
2184 *data++ = 0; 2552 *data++ = 0;
2185 } 2553 }
2186 } 2554 }
2187 2555
2556 /* if size is w*h + 5 then no data has been found */
2557 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2558 {
2188 SvPOK_only (data_sv); 2559 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 }
2562
2190 RETVAL = data_sv; 2563 RETVAL = data_sv;
2191} 2564}
2192 OUTPUT: 2565 OUTPUT:
2193 RETVAL 2566 RETVAL
2194 2567
2195void 2568void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2569set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2570 PPCODE:
2198{ 2571{
2199 int x, y, z; 2572 int x, y, z;
2200 int w, h; 2573 int w, h;
2201 int x1, y1; 2574 int x1, y1;
2575 STRLEN len;
2576 uint8_t *data, *end;
2577
2578 len = SvLEN (data_sv);
2579 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580 data = SvPVbyte_nolen (data_sv);
2581 end = data + len + 8;
2582
2583 if (len < 5)
2584 XSRETURN_EMPTY;
2202 2585
2203 if (*data++ != 0) 2586 if (*data++ != 0)
2204 return; /* version mismatch */ 2587 XSRETURN_EMPTY; /* version mismatch */
2205 2588
2206 w = *data++ << 8; w |= *data++; 2589 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2590 h = *data++ << 8; h |= *data++;
2208 2591
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2592 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2604 {
2222 maprow *row = map_get_row (self, y); 2605 maprow *row = map_get_row (self, y);
2223 2606
2224 for (x = x0; x < x1; x++) 2607 for (x = x0; x < x1; x++)
2225 { 2608 {
2609 uint8_t flags;
2610
2611 if (data + 7 >= end)
2612 XSRETURN_EMPTY;
2613
2226 uint8_t flags = *data++; 2614 flags = *data++;
2227 2615
2228 if (flags) 2616 if (flags)
2229 { 2617 {
2230 mapcell *cell = row_get_cell (row, x); 2618 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2619 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2622 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2623 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2624
2237 if (cell->darkness == 0) 2625 if (cell->darkness == 0)
2238 { 2626 {
2239 cell->darkness = 0; 2627 /*cell->darkness = 0;*/
2628 EXTEND (SP, 3);
2240 2629
2241 for (z = 0; z <= 2; z++) 2630 for (z = 0; z <= 2; z++)
2242 { 2631 {
2243 tileid t = tile [z]; 2632 tileid t = tile [z];
2244 2633
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2634 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2635 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2636 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2637 need_texid (self, t);
2249 } 2638 }
2250 2639
2251 cell->tile [z] = t; 2640 cell->tile [z] = t;
2252 } 2641 }
2254 } 2643 }
2255 } 2644 }
2256 } 2645 }
2257} 2646}
2258 2647
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2648MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2649
2261CFPlus::RW 2650DC::RW
2262new (SV *class, SV *data_sv) 2651new (SV *class, SV *data_sv)
2263 CODE: 2652 CODE:
2264{ 2653{
2265 STRLEN datalen; 2654 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2655 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2657 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2658}
2270 OUTPUT: 2659 OUTPUT:
2271 RETVAL 2660 RETVAL
2272 2661
2273CFPlus::RW 2662DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2663new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2664 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2665 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2666 OUTPUT:
2278 RETVAL 2667 RETVAL
2279 2668
2280# fails on win32: 2669# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2670# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2671#void
2283#close (CFPlus::RW self) 2672#close (DC::RW self)
2284# CODE: 2673# CODE:
2285# (self->(close)) (self); 2674# (self->(close)) (self);
2286 2675
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2676MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2677
2289PROTOTYPES: DISABLE 2678PROTOTYPES: DISABLE
2290 2679
2291CFPlus::Channel 2680DC::Channel
2292find () 2681find ()
2293 CODE: 2682 CODE:
2294{ 2683{
2295 RETVAL = Mix_GroupAvailable (-1); 2684 RETVAL = Mix_GroupAvailable (-1);
2296 2685
2309} 2698}
2310 OUTPUT: 2699 OUTPUT:
2311 RETVAL 2700 RETVAL
2312 2701
2313void 2702void
2314halt (CFPlus::Channel self) 2703halt (DC::Channel self)
2315 CODE: 2704 CODE:
2316 Mix_HaltChannel (self); 2705 Mix_HaltChannel (self);
2317 2706
2318void 2707void
2319expire (CFPlus::Channel self, int ticks = -1) 2708expire (DC::Channel self, int ticks = -1)
2320 CODE: 2709 CODE:
2321 Mix_ExpireChannel (self, ticks); 2710 Mix_ExpireChannel (self, ticks);
2322 2711
2323void 2712void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2713fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2714 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2715 Mix_FadeOutChannel (self, ticks);
2327 2716
2328int 2717int
2329volume (CFPlus::Channel self, int volume) 2718volume (DC::Channel self, int volume)
2330 CODE: 2719 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2720 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2721 OUTPUT:
2333 RETVAL 2722 RETVAL
2334 2723
2335void 2724void
2336unregister_all_effects (CFPlus::Channel self) 2725unregister_all_effects (DC::Channel self)
2337 CODE: 2726 CODE:
2338 Mix_UnregisterAllEffects (self); 2727 Mix_UnregisterAllEffects (self);
2339 2728
2340void 2729void
2341set_panning (CFPlus::Channel self, int left, int right) 2730set_panning (DC::Channel self, int left, int right)
2342 CODE: 2731 CODE:
2343 left = CLAMP (left , 0, 255); 2732 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2733 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2734 Mix_SetPanning (self, left, right);
2346 2735
2347void 2736void
2348set_distance (CFPlus::Channel self, int distance) 2737set_distance (DC::Channel self, int distance)
2349 CODE: 2738 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2739 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2740
2352void 2741void
2353set_position (CFPlus::Channel self, int angle, int distance) 2742set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2743 CODE:
2744
2745void
2746set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747 CODE:
2748{
2749 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2355 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2751 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752}
2356 2753
2357void 2754void
2358set_reverse_stereo (CFPlus::Channel self, int flip) 2755set_reverse_stereo (DC::Channel self, int flip)
2359 CODE: 2756 CODE:
2360 Mix_SetReverseStereo (self, flip); 2757 Mix_SetReverseStereo (self, flip);
2361 2758
2362MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2759MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2363 2760
2364PROTOTYPES: DISABLE 2761PROTOTYPES: DISABLE
2365 2762
2366CFPlus::MixChunk 2763DC::MixChunk
2367new (SV *class, CFPlus::RW rwops) 2764new (SV *class, DC::RW rwops)
2368 CODE: 2765 CODE:
2369 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2766 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2370 OUTPUT: 2767 OUTPUT:
2371 RETVAL 2768 RETVAL
2372 2769
2373void 2770void
2374DESTROY (CFPlus::MixChunk self) 2771DESTROY (DC::MixChunk self)
2375 CODE: 2772 CODE:
2376 Mix_FreeChunk (self); 2773 Mix_FreeChunk (self);
2377 2774
2378int 2775int
2379volume (CFPlus::MixChunk self, int volume = -1) 2776volume (DC::MixChunk self, int volume = -1)
2380 CODE: 2777 CODE:
2381 if (items > 1) 2778 if (items > 1)
2382 volume = CLAMP (volume, 0, 128); 2779 volume = CLAMP (volume, 0, 128);
2383 RETVAL = Mix_VolumeChunk (self, volume); 2780 RETVAL = Mix_VolumeChunk (self, volume);
2384 OUTPUT: 2781 OUTPUT:
2385 RETVAL 2782 RETVAL
2386 2783
2387CFPlus::Channel 2784DC::Channel
2388play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2785play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2389 CODE: 2786 CODE:
2390{ 2787{
2391 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2788 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2392 2789
2393 if (RETVAL < 0) 2790 if (RETVAL < 0)
2400 } 2797 }
2401} 2798}
2402 OUTPUT: 2799 OUTPUT:
2403 RETVAL 2800 RETVAL
2404 2801
2405MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2802MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2406 2803
2407int 2804int
2408volume (int volume = -1) 2805volume (int volume = -1)
2409 PROTOTYPE: ;$ 2806 PROTOTYPE: ;$
2410 CODE: 2807 CODE:
2422void 2819void
2423halt () 2820halt ()
2424 CODE: 2821 CODE:
2425 Mix_HaltMusic (); 2822 Mix_HaltMusic ();
2426 2823
2427CFPlus::MixMusic 2824DC::MixMusic
2428new (SV *class, CFPlus::RW rwops) 2825new (SV *class, DC::RW rwops)
2429 CODE: 2826 CODE:
2430 RETVAL = Mix_LoadMUS_RW (rwops); 2827 RETVAL = Mix_LoadMUS_RW (rwops);
2431 OUTPUT: 2828 OUTPUT:
2432 RETVAL 2829 RETVAL
2433 2830
2434void 2831void
2435DESTROY (CFPlus::MixMusic self) 2832DESTROY (DC::MixMusic self)
2436 CODE: 2833 CODE:
2437 Mix_FreeMusic (self); 2834 Mix_FreeMusic (self);
2438 2835
2439int 2836int
2440play (CFPlus::MixMusic self, int loops = -1) 2837play (DC::MixMusic self, int loops = -1)
2441 CODE: 2838 CODE:
2442 RETVAL = Mix_PlayMusic (self, loops); 2839 RETVAL = Mix_PlayMusic (self, loops);
2443 OUTPUT: 2840 OUTPUT:
2444 RETVAL 2841 RETVAL
2445 2842
2446void 2843void
2447fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2844fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2448 CODE: 2845 CODE:
2449 Mix_FadeInMusicPos (self, loops, ms, position); 2846 Mix_FadeInMusicPos (self, loops, ms, position);
2450 2847
2451MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2848MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2452 2849
2453PROTOTYPES: ENABLE 2850PROTOTYPES: ENABLE
2454 2851
2455BOOT: 2852BOOT:
2456{ 2853{
2457 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2854 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2458 static const struct { 2855 static const struct {
2459 const char *name; 2856 const char *name;
2460 IV iv; 2857 IV iv;
2461 } *civ, const_iv[] = { 2858 } *civ, const_iv[] = {
2462# define const_iv(name) { # name, (IV)name } 2859# define const_iv(name) { # name, (IV)name }
2497 const_iv (GL_INTENSITY), 2894 const_iv (GL_INTENSITY),
2498 const_iv (GL_LUMINANCE), 2895 const_iv (GL_LUMINANCE),
2499 const_iv (GL_LUMINANCE_ALPHA), 2896 const_iv (GL_LUMINANCE_ALPHA),
2500 const_iv (GL_FLOAT), 2897 const_iv (GL_FLOAT),
2501 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2898 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2899 const_iv (GL_COMPRESSED_ALPHA_ARB),
2900 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2901 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2902 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2903 const_iv (GL_COMPRESSED_RGB_ARB),
2904 const_iv (GL_COMPRESSED_RGBA_ARB),
2502 const_iv (GL_COMPILE), 2905 const_iv (GL_COMPILE),
2503 const_iv (GL_PROXY_TEXTURE_1D), 2906 const_iv (GL_PROXY_TEXTURE_1D),
2504 const_iv (GL_PROXY_TEXTURE_2D), 2907 const_iv (GL_PROXY_TEXTURE_2D),
2505 const_iv (GL_TEXTURE_1D), 2908 const_iv (GL_TEXTURE_1D),
2506 const_iv (GL_TEXTURE_2D), 2909 const_iv (GL_TEXTURE_2D),
2545 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2948 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2546 const_iv (GL_POINT_SMOOTH_HINT), 2949 const_iv (GL_POINT_SMOOTH_HINT),
2547 const_iv (GL_LINE_SMOOTH_HINT), 2950 const_iv (GL_LINE_SMOOTH_HINT),
2548 const_iv (GL_POLYGON_SMOOTH_HINT), 2951 const_iv (GL_POLYGON_SMOOTH_HINT),
2549 const_iv (GL_GENERATE_MIPMAP_HINT), 2952 const_iv (GL_GENERATE_MIPMAP_HINT),
2953 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2550 const_iv (GL_FASTEST), 2954 const_iv (GL_FASTEST),
2551 const_iv (GL_DONT_CARE), 2955 const_iv (GL_DONT_CARE),
2552 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2553 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2554 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2555 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2556 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2557# undef const_iv 2964# undef const_iv
2558 }; 2965 };
2559 2966
2560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2562 2969
2563 texture_av = newAV (); 2970 texture_av = newAV ();
2564 AvREAL_off (texture_av); 2971 AvREAL_off (texture_av);
2565} 2972}
2566 2973
2974void
2975disable_GL_EXT_blend_func_separate ()
2976 CODE:
2977 gl.BlendFuncSeparate = 0;
2978 gl.BlendFuncSeparateEXT = 0;
2979
2980void
2981apple_nvidia_bug (int enable)
2982
2567char * 2983char *
2568gl_vendor () 2984gl_vendor ()
2569 CODE: 2985 CODE:
2570 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2571 OUTPUT: 2987 OUTPUT:
2620 3036
2621void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2622 CODE: 3038 CODE:
2623 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2624 3040
3041# void glBlendEquation (int se)
3042
2625void glDepthMask (int flag) 3043void glDepthMask (int flag)
2626 3044
2627void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2628 3046
2629void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
2663void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2664 CODE: 3082 CODE:
2665 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2666 3084
2667void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
3086 PROTOTYPE: @
2668 ALIAS: 3087 ALIAS:
2669 glColor_premultiply = 1 3088 glColor_premultiply = 1
2670 CODE: 3089 CODE:
2671 if (ix) 3090 if (ix)
2672 { 3091 {
2692 3111
2693void glRect (float x1, float y1, float x2, float y2) 3112void glRect (float x1, float y1, float x2, float y2)
2694 CODE: 3113 CODE:
2695 glRectf (x1, y1, x2, y2); 3114 glRectf (x1, y1, x2, y2);
2696 3115
3116void glRect_lineloop (float x1, float y1, float x2, float y2)
3117 CODE:
3118 glBegin (GL_LINE_LOOP);
3119 glVertex2f (x1, y1);
3120 glVertex2f (x2, y1);
3121 glVertex2f (x2, y2);
3122 glVertex2f (x1, y2);
3123 glEnd ();
3124
2697PROTOTYPES: ENABLE 3125PROTOTYPES: ENABLE
2698 3126
2699void glBegin (int mode) 3127void glBegin (int mode)
2700 3128
2701void glEnd () 3129void glEnd ()
2733void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3161void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2734 CODE: 3162 CODE:
2735 if (gl.SeparableFilter2D) 3163 if (gl.SeparableFilter2D)
2736 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3164 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2737 3165
2738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3166void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2739 3167
2740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3168void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2741 3169
2742void glDrawPixels (int width, int height, int format, int type, char *pixels) 3170void glDrawPixels (int width, int height, int format, int type, char *pixels)
2743 3171
2769 3197
2770void glEndList () 3198void glEndList ()
2771 3199
2772void glCallList (int list) 3200void glCallList (int list)
2773 3201
2774MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3202MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2775 3203
2776PROTOTYPES: DISABLE 3204PROTOTYPES: DISABLE
2777 3205
2778void 3206void
2779find_widget (SV *self, NV x, NV y) 3207find_widget (SV *self, NV x, NV y)
2783 XPUSHs (self); 3211 XPUSHs (self);
2784} 3212}
2785 3213
2786BOOT: 3214BOOT:
2787{ 3215{
2788 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3216 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2789 3217
2790 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3218 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2791 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3219 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2792 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3220 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2793 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3221 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2794} 3222}
2795 3223
2796void 3224void
2797draw (SV *self) 3225draw (SV *self)
2798 CODE: 3226 CODE:
2802 NV x, y, w, h; 3230 NV x, y, w, h;
2803 SV *draw_x_sv = GvSV (draw_x_gv); 3231 SV *draw_x_sv = GvSV (draw_x_gv);
2804 SV *draw_y_sv = GvSV (draw_y_gv); 3232 SV *draw_y_sv = GvSV (draw_y_gv);
2805 SV *draw_w_sv = GvSV (draw_w_gv); 3233 SV *draw_w_sv = GvSV (draw_w_gv);
2806 SV *draw_h_sv = GvSV (draw_h_gv); 3234 SV *draw_h_sv = GvSV (draw_h_gv);
2807 SV *hover;
2808 double draw_x, draw_y, draw_w, draw_h; 3235 double draw_x, draw_y;
2809 3236
2810 if (!SvROK (self)) 3237 if (!SvROK (self))
2811 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3238 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2812 3239
2813 hv = (HV *)SvRV (self); 3240 hv = (HV *)SvRV (self);
2814 3241
2815 if (SvTYPE (hv) != SVt_PVHV) 3242 if (SvTYPE (hv) != SVt_PVHV)
2816 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3243 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2817 3244
2818 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3245 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2819 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3246 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2820 3247
2821 if (!h || !w) 3248 if (!h || !w)
2841 { 3268 {
2842 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3269 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2843 3270
2844 if (svp && SvTRUE (*svp)) 3271 if (svp && SvTRUE (*svp))
2845 { 3272 {
2846 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3273 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2847 glEnable (GL_BLEND); 3274 glEnable (GL_BLEND);
2848 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3275 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2849 glBegin (GL_QUADS); 3276 glBegin (GL_QUADS);
2850 glVertex2f (0, 0); 3277 glVertex2f (0, 0);
2851 glVertex2f (w, 0); 3278 glVertex2f (w, 0);
2854 glEnd (); 3281 glEnd ();
2855 glDisable (GL_BLEND); 3282 glDisable (GL_BLEND);
2856 } 3283 }
2857 } 3284 }
2858#if 0 3285#if 0
2859 if ($ENV{CFPLUS_DEBUG} & 1) { 3286 // draw borders, for debugging
2860 glPushMatrix; 3287 glPushMatrix ();
2861 glColor 1, 1, 0, 1; 3288 glColor4f (1., 1., 0., 1.);
2862 glTranslate 0.375, 0.375; 3289 glTranslatef (.5, .5, 0.);
2863 glBegin GL_LINE_LOOP; 3290 glBegin (GL_LINE_LOOP);
2864 glVertex 0 , 0; 3291 glVertex2f (0 , 0);
2865 glVertex $self->{w} - 1, 0; 3292 glVertex2f (w - 1, 0);
2866 glVertex $self->{w} - 1, $self->{h} - 1; 3293 glVertex2f (w - 1, h - 1);
2867 glVertex 0 , $self->{h} - 1; 3294 glVertex2f (0 , h - 1);
2868 glEnd; 3295 glEnd ();
2869 glPopMatrix; 3296 glPopMatrix ();
2870 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2871 }
2872#endif 3297#endif
2873 PUSHMARK (SP); 3298 PUSHMARK (SP);
2874 XPUSHs (self); 3299 XPUSHs (self);
2875 PUTBACK; 3300 PUTBACK;
2876 call_method ("_draw", G_VOID | G_DISCARD); 3301 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines