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.228 by root, Mon Aug 13 15:31:20 2007 UTC vs.
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
85/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 87#define FOW_DARKNESS 50
88#define DARKNESS_ADJUST(n) (n)
62 89
63#define MAP_EXTEND_X 32 90#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 91#define MAP_EXTEND_Y 512
65 92
66#define MIN_FONT_HEIGHT 10 93#define MIN_FONT_HEIGHT 10
67 94
68#if 0 95/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 96#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 97
71# define PARACHUTE 0 98#define KMOD_LRAM 0x10000 // our extension
72#endif 99
100#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3
73 103
74static AV *texture_av; 104static AV *texture_av;
75 105
76static struct 106static struct
77{ 107{
… …
120 150
121#include "pango-font.c" 151#include "pango-font.c"
122#include "pango-fontmap.c" 152#include "pango-fontmap.c"
123#include "pango-render.c" 153#include "pango-render.c"
124 154
125typedef IV CFPlus__Channel; 155typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 156typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 157typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 158typedef Mix_Music *DC__MixMusic;
129 159
130typedef PangoFontDescription *CFPlus__Font; 160typedef PangoFontDescription *DC__Font;
131 161
132static int 162static int
133shape_attr_p (PangoLayoutRun *run) 163shape_attr_p (PangoLayoutRun *run)
134{ 164{
135 GSList *attrs = run->item->analysis.extra_attrs; 165 GSList *attrs = run->item->analysis.extra_attrs;
… …
149 179
150typedef struct cf_layout { 180typedef struct cf_layout {
151 PangoLayout *pl; 181 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 182 float r, g, b, a; // default color for rgba mode
153 int base_height; 183 int base_height;
154 CFPlus__Font font; 184 DC__Font font;
155 rc_t *rc; 185 rc_t *rc;
156} *CFPlus__Layout; 186} *DC__Layout;
157 187
158static CFPlus__Font default_font; 188static DC__Font default_font;
159static PangoContext *opengl_context; 189static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 190static PangoFontMap *opengl_fontmap;
161 191
162static void 192static void
163substitute_func (FcPattern *pattern, gpointer data) 193substitute_func (FcPattern *pattern, gpointer data)
… …
168#endif 198#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 199 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 200}
171 201
172static void 202static void
173layout_update_font (CFPlus__Layout self) 203layout_update_font (DC__Layout self)
174{ 204{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 205 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 206 * reasonably well with dejavu/bistream fonts
177 */ 207 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 208 PangoFontDescription *font = self->font ? self->font : default_font;
179 209
180 pango_font_description_set_absolute_size (font, 210 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 211 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 212
183 pango_layout_set_font_description (self->pl, font); 213 pango_layout_set_font_description (self->pl, font);
184} 214}
185 215
186static void 216static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 217layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 218{
189 PangoRectangle rect; 219 PangoRectangle rect;
190 220
191 // get_pixel_* wrongly rounds down 221 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 222 pango_layout_get_extents (self->pl, 0, &rect);
… …
209 int w, h; 239 int w, h;
210 float s, t; 240 float s, t;
211 uint8_t r, g, b, a; 241 uint8_t r, g, b, a;
212 tileid smoothtile; 242 tileid smoothtile;
213 uint8_t smoothlevel; 243 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */
214} maptex; 245} maptex;
215 246
216typedef struct { 247typedef struct {
217 uint32_t player; 248 uint32_t player;
218 tileid tile[3]; 249 tileid tile[3];
… …
231 int faces; tileid *face2tile; // [faceid] 262 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 263 int texs; maptex *tex; // [tileid]
233 264
234 int32_t rows; 265 int32_t rows;
235 maprow *row; 266 maprow *row;
236} *CFPlus__Map; 267} *DC__Map;
237 268
238static char * 269static char *
239prepend (char *ptr, int sze, int inc) 270prepend (char *ptr, int sze, int inc)
240{ 271{
241 char *p; 272 char *p;
… …
279 self->texs *= 2; 310 self->texs *= 2;
280 } 311 }
281} 312}
282 313
283static maprow * 314static maprow *
284map_get_row (CFPlus__Map self, int y) 315map_get_row (DC__Map self, int y)
285{ 316{
286 if (0 > y) 317 if (0 > y)
287 { 318 {
288 int extend = - y + MAP_EXTEND_Y; 319 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 320 Prepend (maprow, self->row, self->rows, extend);
… …
327 358
328 return row->col + (x - row->c0); 359 return row->col + (x - row->c0);
329} 360}
330 361
331static mapcell * 362static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 363map_get_cell (DC__Map self, int x, int y)
333{ 364{
334 return row_get_cell (map_get_row (self, y), x); 365 return row_get_cell (map_get_row (self, y), x);
335} 366}
336 367
337static void 368static void
338map_clear (CFPlus__Map self) 369map_clear (DC__Map self)
339{ 370{
340 int r; 371 int r;
341 372
342 for (r = 0; r < self->rows; r++) 373 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 374 Safefree (self->row[r].col);
… …
350 self->oy = 0; 381 self->oy = 0;
351 self->row = 0; 382 self->row = 0;
352 self->rows = 0; 383 self->rows = 0;
353} 384}
354 385
386#define CELL_CLEAR(cell) \
387 do { \
388 if ((cell)->player) \
389 (cell)->tile [2] = 0; \
390 (cell)->darkness = 0; \
391 (cell)->stat_hp = 0; \
392 (cell)->flags = 0; \
393 (cell)->player = 0; \
394 } while (0)
395
355static void 396static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 397map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 398{
358 int x, y; 399 int x, y;
359 maprow *row; 400 maprow *row;
360 mapcell *cell; 401 mapcell *cell;
361 402
… …
373 if (x >= row->c1) 414 if (x >= row->c1)
374 break; 415 break;
375 416
376 cell = row->col + x - row->c0; 417 cell = row->col + x - row->c0;
377 418
378 cell->darkness = 0; 419 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 420 }
383 } 421 }
384} 422}
385 423
386typedef struct { 424typedef struct {
… …
440 n |= n >> 16; 478 n |= n >> 16;
441 479
442 return n + 1; 480 return n + 1;
443} 481}
444 482
483static unsigned int
484popcount (unsigned int n)
485{
486 n -= (n >> 1) & 0x55555555U;
487 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
488 n = ((n >> 4) + n) & 0x0f0f0f0fU;
489 n *= 0x01010101U;
490
491 return n >> 24;
492}
493
445/* SDL should provide this, really. */ 494/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 495#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 496#define SDLK_MODIFIER_MAX 314
448 497
449/******************************************************************************/ 498/******************************************************************************/
… …
487 return 0; 536 return 0;
488 537
489 return 1; 538 return 1;
490} 539}
491 540
492MODULE = CFPlus PACKAGE = CFPlus 541/******************************************************************************/
542
543/* process keyboard modifiers */
544static int
545mod_munge (int mod)
546{
547 mod &= MOD_MASK;
548
549 if (mod & (KMOD_META | KMOD_ALT))
550 mod |= KMOD_LRAM;
551
552 return mod;
553}
554
555static void
556deliantra_main ()
557{
558 char *argv[] = { 0 };
559 call_argv ("::main", G_DISCARD | G_VOID, argv);
560}
561
562#ifdef __MACOSX__
563 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main()
565 * on OS X, so... we provide one and call the original main(), which,
566 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
567 * and which calls our main (== SDL_main) back.
568 */
569 extern C_LINKAGE int
570 main (int argc, char *argv[])
571 {
572 deliantra_main ();
573 }
574
575 #undef main
576
577 extern C_LINKAGE int main (int argc, char *argv[]);
578
579 static void
580 SDL_braino (void)
581 {
582 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv);
584 }
585#else
586 static void
587 SDL_braino (void)
588 {
589 deliantra_main ();
590 }
591#endif
592
593MODULE = Deliantra::Client PACKAGE = DC
493 594
494PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
495 596
496BOOT: 597BOOT:
497{ 598{
498 HV *stash = gv_stashpv ("CFPlus", 1); 599 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 600 static const struct {
500 const char *name; 601 const char *name;
501 IV iv; 602 IV iv;
502 } *civ, const_iv[] = { 603 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 604# define const_iv(name) { # name, (IV)name }
… …
525 626
526 const_iv (SDL_APPINPUTFOCUS), 627 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 628 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 629 const_iv (SDL_APPACTIVE),
529 630
631
632 const_iv (SDLK_UNKNOWN),
633 const_iv (SDLK_FIRST),
634 const_iv (SDLK_BACKSPACE),
635 const_iv (SDLK_TAB),
636 const_iv (SDLK_CLEAR),
637 const_iv (SDLK_RETURN),
638 const_iv (SDLK_PAUSE),
639 const_iv (SDLK_ESCAPE),
640 const_iv (SDLK_SPACE),
641 const_iv (SDLK_EXCLAIM),
642 const_iv (SDLK_QUOTEDBL),
643 const_iv (SDLK_HASH),
644 const_iv (SDLK_DOLLAR),
645 const_iv (SDLK_AMPERSAND),
646 const_iv (SDLK_QUOTE),
647 const_iv (SDLK_LEFTPAREN),
648 const_iv (SDLK_RIGHTPAREN),
649 const_iv (SDLK_ASTERISK),
650 const_iv (SDLK_PLUS),
651 const_iv (SDLK_COMMA),
652 const_iv (SDLK_MINUS),
653 const_iv (SDLK_PERIOD),
654 const_iv (SDLK_SLASH),
655 const_iv (SDLK_0),
656 const_iv (SDLK_1),
657 const_iv (SDLK_2),
658 const_iv (SDLK_3),
659 const_iv (SDLK_4),
660 const_iv (SDLK_5),
661 const_iv (SDLK_6),
662 const_iv (SDLK_7),
663 const_iv (SDLK_8),
664 const_iv (SDLK_9),
665 const_iv (SDLK_COLON),
666 const_iv (SDLK_SEMICOLON),
667 const_iv (SDLK_LESS),
668 const_iv (SDLK_EQUALS),
669 const_iv (SDLK_GREATER),
670 const_iv (SDLK_QUESTION),
671 const_iv (SDLK_AT),
672
673 const_iv (SDLK_LEFTBRACKET),
674 const_iv (SDLK_BACKSLASH),
675 const_iv (SDLK_RIGHTBRACKET),
676 const_iv (SDLK_CARET),
677 const_iv (SDLK_UNDERSCORE),
678 const_iv (SDLK_BACKQUOTE),
679 const_iv (SDLK_DELETE),
680
681 const_iv (SDLK_FIRST),
682 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 683 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 684 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 685 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 686 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 687 const_iv (SDLK_KP4),
… …
606 const_iv (KMOD_LMETA), 759 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 760 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 761 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 762 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 763 const_iv (KMOD_MODE),
764
765 const_iv (KMOD_LRAM),
766
767 const_iv (MIX_DEFAULT_FORMAT),
768
769 const_iv (SDL_INIT_TIMER),
770 const_iv (SDL_INIT_AUDIO),
771 const_iv (SDL_INIT_VIDEO),
772 const_iv (SDL_INIT_CDROM),
773 const_iv (SDL_INIT_JOYSTICK),
774 const_iv (SDL_INIT_EVERYTHING),
775 const_iv (SDL_INIT_NOPARACHUTE),
776 const_iv (SDL_INIT_EVENTTHREAD),
777
778 const_iv (SDL_GL_RED_SIZE),
779 const_iv (SDL_GL_GREEN_SIZE),
780 const_iv (SDL_GL_BLUE_SIZE),
781 const_iv (SDL_GL_ALPHA_SIZE),
782 const_iv (SDL_GL_DOUBLEBUFFER),
783 const_iv (SDL_GL_BUFFER_SIZE),
784 const_iv (SDL_GL_DEPTH_SIZE),
785 const_iv (SDL_GL_STENCIL_SIZE),
786 const_iv (SDL_GL_ACCUM_RED_SIZE),
787 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
788 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
789 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
790 const_iv (SDL_GL_STEREO),
791 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
792 const_iv (SDL_GL_MULTISAMPLESAMPLES),
793 const_iv (SDL_GL_ACCELERATED_VISUAL),
794 const_iv (SDL_GL_SWAP_CONTROL),
795
796 const_iv (FOW_DARKNESS)
611# undef const_iv 797# undef const_iv
612 }; 798 };
613 799
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 800 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
633 819
634NV floor (NV x) 820NV floor (NV x)
635 821
636NV ceil (NV x) 822NV ceil (NV x)
637 823
824IV minpot (UV n)
825
826IV popcount (UV n)
827
828NV distance (NV dx, NV dy)
829 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT:
832 RETVAL
833
638void 834void
639pango_init () 835pango_init ()
640 CODE: 836 CODE:
641{ 837{
642 opengl_fontmap = pango_opengl_font_map_new (); 838 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 839 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 840 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
841 /*pango_context_set_font_description (opengl_context, default_font);*/
842#if PANGO_VERSION_CHECK (1, 15, 2)
843 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
844 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
845#endif
645} 846}
646 847
647char *
648SDL_GetError () 848char *SDL_GetError ()
649 849
650int 850void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 851
653void 852int SDL_Init (U32 flags)
853
854int SDL_InitSubSystem (U32 flags)
855
856void SDL_QuitSubSystem (U32 flags)
857
654SDL_Quit () 858void SDL_Quit ()
859
860int SDL_GL_SetAttribute (int attr, int value)
861
862int SDL_GL_GetAttribute (int attr)
863 CODE:
864 if (SDL_GL_GetAttribute (attr, &RETVAL))
865 XSRETURN_UNDEF;
866 OUTPUT:
867 RETVAL
655 868
656void 869void
657SDL_ListModes (int rgb, int alpha) 870SDL_ListModes (int rgb, int alpha)
658 PPCODE: 871 PPCODE:
659{ 872{
… …
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 887
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 888 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 889 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 890
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 891 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 892
683 if (m && m != (SDL_Rect **)-1) 893 if (m && m != (SDL_Rect **)-1)
684 while (*m) 894 while (*m)
685 { 895 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 896 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 897 {
688 AV *av = newAV (); 898 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 899 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 900 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 901 av_push (av, newSViv (rgb));
… …
715 925
716 if (RETVAL) 926 if (RETVAL)
717 { 927 {
718 av_clear (texture_av); 928 av_clear (texture_av);
719 929
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 930 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 931#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 932#include "glfunc.h"
723#undef GL_FUNC 933#undef GL_FUNC
724 } 934 }
725} 935}
… …
732char * 942char *
733SDL_GetKeyName (int sym) 943SDL_GetKeyName (int sym)
734 944
735int 945int
736SDL_GetAppState () 946SDL_GetAppState ()
947
948int
949SDL_GetModState ()
737 950
738void 951void
739poll_events () 952poll_events ()
740 PPCODE: 953 PPCODE:
741{ 954{
… …
751 { 964 {
752 case SDL_KEYDOWN: 965 case SDL_KEYDOWN:
753 case SDL_KEYUP: 966 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 967 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 968 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 969 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 970 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 971 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 972 break;
760 973
761 case SDL_ACTIVEEVENT: 974 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 975 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
780 x = ev.motion.x; 993 x = ev.motion.x;
781 y = ev.motion.y; 994 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 995 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 996 }
784 997
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 999 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1000 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1001 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1002 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1003 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1004 }
792 break; 1005 break;
793 1006
794 case SDL_MOUSEBUTTONDOWN: 1007 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1008 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1009 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1010
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1011 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1013 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1014 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1019 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1020 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1021 break;
809 } 1022 }
810 1023
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1024 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1025 }
813} 1026}
814 1027
815int 1028int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1030 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1031 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1032 Mix_ChannelFinished (channel_finished);
1033
1034void
1035Mix_QuerySpec ()
1036 PPCODE:
1037{
1038 int freq, channels;
1039 Uint16 format;
1040
1041 if (Mix_QuerySpec (&freq, &format, &channels))
1042 {
1043 EXTEND (SP, 3);
1044 PUSHs (sv_2mortal (newSViv (freq)));
1045 PUSHs (sv_2mortal (newSViv (format)));
1046 PUSHs (sv_2mortal (newSViv (channels)));
1047 }
1048}
820 1049
821void 1050void
822Mix_CloseAudio () 1051Mix_CloseAudio ()
823 1052
824int 1053int
… …
859 } 1088 }
860 } 1089 }
861#endif 1090#endif
862} 1091}
863 1092
864void 1093int
865add_font (char *file) 1094add_font (char *file)
866 CODE: 1095 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT:
1098 RETVAL
868 1099
869void 1100void
870load_image_inline (SV *image_) 1101load_image_inline (SV *image_)
871 ALIAS: 1102 ALIAS:
872 load_image_file = 1 1103 load_image_file = 1
… …
958void 1189void
959error (char *message) 1190error (char *message)
960 CODE: 1191 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1192 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1193#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1195#endif
965 1196
966void 1197void
967fatal (char *message) 1198fatal (char *message)
968 CODE: 1199 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1200 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1201#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1202 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1203#endif
973 _exit (1); 1204 _exit (1);
974 1205
975void 1206void
976_exit (int retval = 0) 1207_exit (int retval = 0)
… …
988#if DEBUG 1219#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1220 VALGRIND_DO_LEAK_CHECK;
990#endif 1221#endif
991} 1222}
992 1223
993MODULE = CFPlus PACKAGE = CFPlus::Font 1224int
1225SvREFCNT (SV *sv)
1226 CODE:
1227 RETVAL = SvREFCNT (sv);
1228 OUTPUT:
1229 RETVAL
1230
1231MODULE = Deliantra::Client PACKAGE = DC::Font
994 1232
995PROTOTYPES: DISABLE 1233PROTOTYPES: DISABLE
996 1234
997CFPlus::Font 1235DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1236new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1237 CODE:
1000{ 1238{
1001 int count; 1239 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1240 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1005} 1243}
1006 OUTPUT: 1244 OUTPUT:
1007 RETVAL 1245 RETVAL
1008 1246
1009void 1247void
1010DESTROY (CFPlus::Font self) 1248DESTROY (DC::Font self)
1011 CODE: 1249 CODE:
1012 pango_font_description_free (self); 1250 pango_font_description_free (self);
1013 1251
1014void 1252void
1015make_default (CFPlus::Font self) 1253make_default (DC::Font self)
1016 PROTOTYPE: $ 1254 PROTOTYPE: $
1017 CODE: 1255 CODE:
1018 default_font = self; 1256 default_font = self;
1019 1257
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1258MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1259
1022PROTOTYPES: DISABLE 1260PROTOTYPES: DISABLE
1023 1261
1024void 1262void
1025reset_glyph_cache () 1263glyph_cache_backup ()
1026 PROTOTYPE: 1264 PROTOTYPE:
1027 CODE: 1265 CODE:
1266 tc_backup ();
1267
1268void
1269glyph_cache_restore ()
1270 PROTOTYPE:
1271 CODE:
1028 tc_clear (); 1272 tc_restore ();
1029 1273
1030CFPlus::Layout 1274DC::Layout
1031new (SV *class) 1275new (SV *class)
1032 CODE: 1276 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1277 New (0, RETVAL, 1, struct cf_layout);
1034 1278
1035 RETVAL->pl = pango_layout_new (opengl_context); 1279 RETVAL->pl = pango_layout_new (opengl_context);
… …
1045 layout_update_font (RETVAL); 1289 layout_update_font (RETVAL);
1046 OUTPUT: 1290 OUTPUT:
1047 RETVAL 1291 RETVAL
1048 1292
1049void 1293void
1050DESTROY (CFPlus::Layout self) 1294DESTROY (DC::Layout self)
1051 CODE: 1295 CODE:
1052 g_object_unref (self->pl); 1296 g_object_unref (self->pl);
1053 rc_free (self->rc); 1297 rc_free (self->rc);
1054 Safefree (self); 1298 Safefree (self);
1055 1299
1056void 1300void
1057set_text (CFPlus::Layout self, SV *text_) 1301set_text (DC::Layout self, SV *text_)
1058 CODE: 1302 CODE:
1059{ 1303{
1060 STRLEN textlen; 1304 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1305 char *text = SvPVutf8 (text_, textlen);
1062 1306
1063 pango_layout_set_text (self->pl, text, textlen); 1307 pango_layout_set_text (self->pl, text, textlen);
1064} 1308}
1065 1309
1066void 1310void
1067set_markup (CFPlus::Layout self, SV *text_) 1311set_markup (DC::Layout self, SV *text_)
1068 CODE: 1312 CODE:
1069{ 1313{
1070 STRLEN textlen; 1314 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1315 char *text = SvPVutf8 (text_, textlen);
1072 1316
1073 pango_layout_set_markup (self->pl, text, textlen); 1317 pango_layout_set_markup (self->pl, text, textlen);
1074} 1318}
1075 1319
1076void 1320void
1077set_shapes (CFPlus::Layout self, ...) 1321set_shapes (DC::Layout self, ...)
1078 CODE: 1322 CODE:
1079{ 1323{
1080 PangoAttrList *attrs = 0; 1324 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1325 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1326 const char *pos = text;
… …
1117 if (attrs) 1361 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1362 pango_layout_set_attributes (self->pl, attrs);
1119} 1363}
1120 1364
1121void 1365void
1122get_shapes (CFPlus::Layout self) 1366get_shapes (DC::Layout self)
1123 PPCODE: 1367 PPCODE:
1124{ 1368{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1369 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1370
1127 do 1371 do
1128 { 1372 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1373 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1374
1131 if (run && shape_attr_p (run)) 1375 if (run && shape_attr_p (run))
1132 { 1376 {
1133 PangoRectangle extents; 1377 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1378 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1142 1386
1143 pango_layout_iter_free (iter); 1387 pango_layout_iter_free (iter);
1144} 1388}
1145 1389
1146int 1390int
1147has_wrapped (CFPlus::Layout self) 1391has_wrapped (DC::Layout self)
1148 CODE: 1392 CODE:
1149{ 1393{
1150 int lines = 1; 1394 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1395 const char *text = pango_layout_get_text (self->pl);
1152 1396
… …
1157} 1401}
1158 OUTPUT: 1402 OUTPUT:
1159 RETVAL 1403 RETVAL
1160 1404
1161SV * 1405SV *
1162get_text (CFPlus::Layout self) 1406get_text (DC::Layout self)
1163 CODE: 1407 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1408 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1409 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1410 OUTPUT:
1167 RETVAL 1411 RETVAL
1168 1412
1169void 1413void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1414set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1415 CODE:
1172 self->r = r; 1416 self->r = r;
1173 self->g = g; 1417 self->g = g;
1174 self->b = b; 1418 self->b = b;
1175 self->a = a; 1419 self->a = a;
1176 1420
1177void 1421void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1422set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1423 CODE:
1180 if (self->font != font) 1424 if (self->font != font)
1181 { 1425 {
1182 self->font = font; 1426 self->font = font;
1183 layout_update_font (self); 1427 layout_update_font (self);
1184 } 1428 }
1185 1429
1186void 1430void
1187set_height (CFPlus::Layout self, int base_height) 1431set_height (DC::Layout self, int base_height)
1188 CODE: 1432 CODE:
1189 if (self->base_height != base_height) 1433 if (self->base_height != base_height)
1190 { 1434 {
1191 self->base_height = base_height; 1435 self->base_height = base_height;
1192 layout_update_font (self); 1436 layout_update_font (self);
1193 } 1437 }
1194 1438
1195void 1439void
1196set_width (CFPlus::Layout self, int max_width = -1) 1440set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1441 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1442 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1443
1200void 1444void
1201set_indent (CFPlus::Layout self, int indent) 1445set_indent (DC::Layout self, int indent)
1202 CODE: 1446 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1447 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1448
1205void 1449void
1206set_spacing (CFPlus::Layout self, int spacing) 1450set_spacing (DC::Layout self, int spacing)
1207 CODE: 1451 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1452 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1453
1210void 1454void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1455set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1456 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1457 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1458 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1459 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1460 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1461 : PANGO_ELLIPSIZE_NONE
1218 ); 1462 );
1219 1463
1220void 1464void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1465set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1466 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1467 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1468
1225void 1469void
1226size (CFPlus::Layout self) 1470size (DC::Layout self)
1227 PPCODE: 1471 PPCODE:
1228{ 1472{
1229 int w, h; 1473 int w, h;
1230 1474
1231 layout_get_pixel_size (self, &w, &h); 1475 layout_get_pixel_size (self, &w, &h);
… …
1234 PUSHs (sv_2mortal (newSViv (w))); 1478 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1479 PUSHs (sv_2mortal (newSViv (h)));
1236} 1480}
1237 1481
1238int 1482int
1239descent (CFPlus::Layout self) 1483descent (DC::Layout self)
1240 CODE: 1484 CODE:
1241{ 1485{
1242 PangoRectangle rect; 1486 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1487 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1488 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1489 RETVAL = PANGO_DESCENT (rect);
1246} 1490}
1247 OUTPUT: 1491 OUTPUT:
1248 RETVAL 1492 RETVAL
1249 1493
1250int 1494int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1495xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1496 CODE:
1253{ 1497{
1254 int index, trailing; 1498 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1499 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1500 RETVAL = index + trailing;
1257} 1501}
1258 OUTPUT: 1502 OUTPUT:
1259 RETVAL 1503 RETVAL
1260 1504
1261void 1505void
1262cursor_pos (CFPlus::Layout self, int index) 1506cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1507 PPCODE:
1264{ 1508{
1265 PangoRectangle strong_pos; 1509 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1510 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1511
1268 EXTEND (SP, 3); 1512 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1516}
1273 1517
1274void 1518void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1519index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1520 PPCODE:
1277{ 1521{
1278 int line, x; 1522 int line, x;
1279 1523
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1524 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1525#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1526 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1527 --line;
1528#endif
1283 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1530 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1532}
1287 1533
1288void 1534void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1535line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1536 PPCODE:
1291{ 1537{
1292 PangoLayoutLine *lp; 1538 PangoLayoutLine *lp;
1293 int index, trailing; 1539 int index, trailing;
1294 1540
1295 if (line < 0) 1541 if (line < 0)
1296 XSRETURN_EMPTY; 1542 XSRETURN_EMPTY;
1297 1543
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1544 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1545 XSRETURN_EMPTY; /* do better */
1300 1546
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1547 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1548
1303 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
… …
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1555 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1556 }
1311} 1557}
1312 1558
1313void 1559void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1560render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1561 CODE:
1316 rc_clear (self->rc); 1562 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1563 pango_opengl_render_layout_subpixel (
1318 self->pl, 1564 self->pl,
1319 self->rc, 1565 self->rc,
… …
1324 // we assume that context_change actually clears/frees stuff 1570 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1571 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1572 pango_layout_context_changed (self->pl);
1327 1573
1328void 1574void
1329draw (CFPlus::Layout self) 1575draw (DC::Layout self)
1330 CODE: 1576 CODE:
1331{ 1577{
1332 glEnable (GL_TEXTURE_2D); 1578 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1579 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1580 glEnable (GL_BLEND);
… …
1342 glDisable (GL_ALPHA_TEST); 1588 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1589 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1590 glDisable (GL_TEXTURE_2D);
1345} 1591}
1346 1592
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1593MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1594
1349PROTOTYPES: ENABLE 1595PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1596
1353void 1597void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1598pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1599 CODE:
1356{ 1600{
… …
1422 glDisable (GL_ALPHA_TEST); 1666 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1667 glDisable (GL_BLEND);
1424 } 1668 }
1425} 1669}
1426 1670
1671void
1672draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1673 PROTOTYPE: @
1674 CODE:
1675{
1676 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1);
1680
1681 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.);
1684
1685 if (blend > 0.f)
1686 {
1687 float dx3 = dx * -3.f / w;
1688 float dy3 = dy * -3.f / h;
1689 GLfloat env_color[4] = { 0., 0., 0., blend };
1690
1691 /* interpolate the two shadow textures */
1692 /* stage 0 == rgb(glcolor) + alpha(t0) */
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1694
1695 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1696 gl.ActiveTexture (GL_TEXTURE1);
1697 glEnable (GL_TEXTURE_2D);
1698 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700
1701 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705
1706 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708
1709 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1715
1716 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1717 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1718
1719 glBegin (GL_QUADS);
1720 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1721 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1722 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1723 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1724 glEnd ();
1725
1726 glDisable (GL_TEXTURE_2D);
1727 gl.ActiveTexture (GL_TEXTURE0);
1728 }
1729 else
1730 {
1731 /* simple blending of one texture, also opengl <1.3 path */
1732 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1733
1734 glBegin (GL_QUADS);
1735 glTexCoord2f (0, 0); glVertex2f (0, 0);
1736 glTexCoord2f (0, t); glVertex2f (0, h);
1737 glTexCoord2f (s, t); glVertex2f (w, h);
1738 glTexCoord2f (s, 0); glVertex2f (w, 0);
1739 glEnd ();
1740 }
1741
1742 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1743 {
1744 int x, y;
1745 int dx3 = dx * 3;
1746 int dy3 = dy * 3;
1747
1748 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1749 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1750 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1751 glTranslatef (-1., -1., 0);
1752 glBegin (GL_QUADS);
1753
1754 for (y = 1; y < h; y += 3)
1755 {
1756 int y1 = y - dy3;
1757 int y1valid = y1 >= 0 && y1 < h;
1758
1759 for (x = 1; x < w; x += 3)
1760 {
1761 int x1 = x - dx3;
1762 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1763 uint8_t h2;
1764
1765 if (y1valid && x1 >= 0 && x1 < w)
1766 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 else
1768 h2 = 1; /* out of range == invisible */
1769
1770 if (h1 || h2)
1771 {
1772 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1773 glColor4f (1., 1., 1., alpha);
1774
1775 glTexCoord2f (0, 0.); glVertex2i (x , y );
1776 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1777 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1778 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1779 }
1780 }
1781 }
1782 }
1783
1784 glEnd ();
1785
1786 glPopMatrix ();
1787
1788 glDisable (GL_TEXTURE_2D);
1789 glDisable (GL_BLEND);
1790}
1791
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1792IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE: 1793 CODE:
1429{ 1794{
1430 GLint width; 1795 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1796 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1433 RETVAL = width > 0; 1798 RETVAL = width > 0;
1434} 1799}
1435 OUTPUT: 1800 OUTPUT:
1436 RETVAL 1801 RETVAL
1437 1802
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1803MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1804
1440PROTOTYPES: DISABLE 1805PROTOTYPES: DISABLE
1441 1806
1442CFPlus::Map 1807DC::Map
1443new (SV *class) 1808new (SV *class)
1444 CODE: 1809 CODE:
1445 New (0, RETVAL, 1, struct map); 1810 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1811 RETVAL->x = 0;
1447 RETVAL->y = 0; 1812 RETVAL->y = 0;
… …
1455 RETVAL->row = 0; 1820 RETVAL->row = 0;
1456 OUTPUT: 1821 OUTPUT:
1457 RETVAL 1822 RETVAL
1458 1823
1459void 1824void
1460DESTROY (CFPlus::Map self) 1825DESTROY (DC::Map self)
1461 CODE: 1826 CODE:
1462{ 1827{
1463 map_clear (self); 1828 map_clear (self);
1464 Safefree (self->face2tile); 1829 Safefree (self->face2tile);
1465 Safefree (self->tex); 1830 Safefree (self->tex);
1466 Safefree (self); 1831 Safefree (self);
1467} 1832}
1468 1833
1469void 1834void
1470resize (CFPlus::Map self, int map_width, int map_height) 1835resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1836 CODE:
1472 self->w = map_width; 1837 self->w = map_width;
1473 self->h = map_height; 1838 self->h = map_height;
1474 1839
1475void 1840void
1476clear (CFPlus::Map self) 1841clear (DC::Map self)
1477 CODE: 1842 CODE:
1478 map_clear (self); 1843 map_clear (self);
1479 1844
1480void 1845void
1481set_tileid (CFPlus::Map self, int face, int tile) 1846set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1847 CODE:
1483{ 1848{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1849 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1850 need_texid (self, tile);
1486} 1851}
1487 1852
1488void 1853void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1854set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1855 CODE:
1491{ 1856{
1492 tileid texid; 1857 tileid texid;
1493 maptex *tex; 1858 maptex *tex;
1494 1859
… …
1507 tex->smoothtile = self->face2tile [smooth]; 1872 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1873 tex->smoothlevel = level;
1509} 1874}
1510 1875
1511void 1876void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1877set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1878 CODE:
1514{ 1879{
1515 need_texid (self, texid); 1880 need_texid (self, texid);
1516 1881
1517 { 1882 {
… …
1536 // use uglier nearest interpolation because linear suffers 1901 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1902 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1903 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1904}
1540 1905
1906void
1907expire_textures (DC::Map self, int texid, int count)
1908 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count)
1910 {
1911 maptex *tex = self->tex + texid;
1912
1913 if (tex->name)
1914 {
1915 if (tex->unused)
1916 {
1917 tex->name = 0;
1918 tex->unused = 0;
1919 XPUSHs (sv_2mortal (newSViv (texid)));
1920 }
1921 else
1922 tex->unused = 1;
1923 }
1924 }
1925
1541int 1926int
1542ox (CFPlus::Map self) 1927ox (DC::Map self)
1543 ALIAS: 1928 ALIAS:
1544 oy = 1 1929 oy = 1
1545 x = 2 1930 x = 2
1546 y = 3 1931 y = 3
1547 w = 4 1932 w = 4
… …
1558 } 1943 }
1559 OUTPUT: 1944 OUTPUT:
1560 RETVAL 1945 RETVAL
1561 1946
1562void 1947void
1563scroll (CFPlus::Map self, int dx, int dy) 1948scroll (DC::Map self, int dx, int dy)
1564 CODE: 1949 CODE:
1565{ 1950{
1566 if (dx > 0) 1951 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1952 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1953 else if (dx < 0)
… …
1584 self->y += MAP_EXTEND_Y; 1969 self->y += MAP_EXTEND_Y;
1585 } 1970 }
1586} 1971}
1587 1972
1588SV * 1973SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1974map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1975 CODE:
1591{ 1976{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1977 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1978 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1979 mapcell *cell;
… …
1622 uint8_t ext, cmd; 2007 uint8_t ext, cmd;
1623 2008
1624 do 2009 do
1625 { 2010 {
1626 ext = *data++; 2011 ext = *data++;
1627 cmd = ext & 0x3f; 2012 cmd = ext & 0x7f;
1628 2013
1629 if (cmd < 4) 2014 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1631 else if (cmd == 5) // health 2016 else if (cmd == 5) // health
1632 { 2017 {
1633 cell->stat_width = 1; 2018 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2019 cell->stat_hp = *data++;
1635 } 2020 }
1636 else if (cmd == 6) // monster width 2021 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 2022 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 2023 else if (cmd == 0x47)
1639 { 2024 {
1640 if (*data == 4) 2025 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 2026 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 2029
1643 data += *data + 1; 2030 data += *data + 1;
1644 } 2031 }
1645 else if (cmd == 8) // cell flags 2032 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 2033 cell->flags = *data++;
… …
1663 cell->tile [z] = self->face2tile [face]; 2050 cell->tile [z] = self->face2tile [face];
1664 2051
1665 if (cell->tile [z]) 2052 if (cell->tile [z])
1666 { 2053 {
1667 maptex *tex = self->tex + cell->tile [z]; 2054 maptex *tex = self->tex + cell->tile [z];
2055 tex->unused = 0;
1668 if (!tex->name) 2056 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2057 av_push (missing, newSViv (cell->tile [z]));
1670 2058
1671 if (tex->smoothtile) 2059 if (tex->smoothtile)
1672 { 2060 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2061 maptex *smooth = self->tex + tex->smoothtile;
2062 smooth->unused = 0;
1674 if (!smooth->name) 2063 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2064 av_push (missing, newSViv (tex->smoothtile));
1676 } 2065 }
1677 } 2066 }
1678 } 2067 }
1679 } 2068 }
1680 else 2069 else
1681 cell->darkness = 0; 2070 CELL_CLEAR (cell);
1682 } 2071 }
1683} 2072}
1684 OUTPUT: 2073 OUTPUT:
1685 RETVAL 2074 RETVAL
1686 2075
1687SV * 2076SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2077mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2078 CODE:
1690{ 2079{
1691 int x1, x; 2080 int x1, x;
1692 int y1, y; 2081 int y1, y;
1693 int z; 2082 int z;
… …
1738} 2127}
1739 OUTPUT: 2128 OUTPUT:
1740 RETVAL 2129 RETVAL
1741 2130
1742void 2131void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 2133 CODE:
1745{ 2134{
1746 int x, y, z; 2135 int x, y, z;
1747 2136
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2140 smooth_key skey;
1752 2141 int pl_x, pl_y;
2142 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2143 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2145 rc_key_t key;
1755 rc_array_t *arr; 2146 rc_array_t *arr, *arr_hidden;
1756 2147
2148 pl_tex.name = 0;
2149
1757 // thats current max. sorry. 2150 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2151 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2152 if (sh > 255) sh = 255;
1760 2153
1761 // clear key, in case of extra padding 2154 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2155 memset (&skey, 0, sizeof (skey));
… …
1766 key.g = 255; 2159 key.g = 255;
1767 key.b = 255; 2160 key.b = 255;
1768 key.a = 255; 2161 key.a = 255;
1769 key.mode = GL_QUADS; 2162 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2163 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2164
1773 mx += self->x; 2165 mx += self->x;
1774 my += self->y; 2166 my += self->y;
1775 2167
1776 // first pass: determine smooth_max 2168 // first pass: determine smooth_max
… …
1797 2189
1798 glEnable (GL_BLEND); 2190 glEnable (GL_BLEND);
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
1802 for (z = 0; z <= 2; z++) 2197 for (z = 0; z <= 2; z++)
1803 { 2198 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2199 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1;
1805 2201
1806 for (y = 0; y < sh; y++) 2202 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2203 if (0 <= y + my && y + my < self->rows)
1808 { 2204 {
1809 maprow *row = self->row + (y + my); 2205 maprow *row = self->row + (y + my);
… …
1819 maptex tex = self->tex [tile]; 2215 maptex tex = self->tex [tile];
1820 int px, py; 2216 int px, py;
1821 2217
1822 if (key.texname != tex.name) 2218 if (key.texname != tex.name)
1823 { 2219 {
2220 self->tex [tile].unused = 0;
2221
1824 if (!tex.name) 2222 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2224
1827 key.texname = tex.name; 2225 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2226 arr = rc_array (rc, &key);
1829 } 2227 }
1830 2228
1831 px = (x + 1) * T - tex.w; 2229 px = (x + 1) * T - tex.w;
1832 py = (y + 1) * T - tex.h; 2230 py = (y + 1) * T - tex.h;
2231
2232 if (expect_false (cell->player == player) && expect_false (z == 2))
2233 {
2234 pl_x = px;
2235 pl_y = py;
2236 pl_tex = tex;
2237 continue;
2238 }
1833 2239
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838
1839 if (cell->flags && z == 2)
1840 {
1841 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1)
1843 {
1844 maptex tex = self->tex [1];
1845 int px = x * T + T * 2 / 32;
1846 int py = y * T - T * 6 / 32;
1847
1848 if (tex.name)
1849 {
1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860 }
1861 }
1862 }
1863 2244
1864 // update smooth hash 2245 // update smooth hash
1865 if (tex.smoothtile) 2246 if (tex.smoothtile)
1866 { 2247 {
1867 skey.tile = tex.smoothtile; 2248 skey.tile = tex.smoothtile;
… …
1896 // corners 2277 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1899 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1900 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2282 }
2283 }
2284
2285 if (expect_false (z == 2) && expect_false (cell->flags))
2286 {
2287 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1)
2289 {
2290 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32;
2294 int py = y * T - T * 6 / 32;
2295
2296 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov);
2298
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 } 2303 }
1902 } 2304 }
1903 } 2305 }
1904 } 2306 }
1905 2307
… …
1945 { 2347 {
1946 // this time avoiding texture state changes 2348 // this time avoiding texture state changes
1947 // save gobs of state changes. 2349 // save gobs of state changes.
1948 if (key.texname != tex.name) 2350 if (key.texname != tex.name)
1949 { 2351 {
2352 self->tex [skey->tile].unused = 0;
2353
1950 glEnd (); 2354 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2356 glBegin (GL_QUADS);
1953 } 2357 }
1954 2358
… …
1983 } 2387 }
1984 2388
1985 hv_clear (smooth); 2389 hv_clear (smooth);
1986 } 2390 }
1987 2391
2392 if (pl_tex.name)
2393 {
2394 maptex tex = pl_tex;
2395 int px = pl_x + sdx;
2396 int py = pl_y + sdy;
2397
2398 key.texname = tex.name;
2399 arr = rc_array (rc, &key);
2400
2401 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2402 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2403 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2405
2406 rc_draw (rc);
2407 }
2408
2409 rc_draw (rc_ov);
2410 rc_clear (rc_ov);
2411
1988 glDisable (GL_BLEND); 2412 glDisable (GL_BLEND);
1989 rc_free (rc); 2413 rc_free (rc);
2414 rc_free (rc_ov);
1990 2415
1991 // top layer: overlays such as the health bar 2416 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2417 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2418 if (0 <= y + my && y + my < self->rows)
1994 { 2419 {
… …
1999 { 2424 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2425 mapcell *cell = row->col + (x + mx - row->c0);
2001 2426
2002 int px = x * T; 2427 int px = x * T;
2003 int py = y * T; 2428 int py = y * T;
2429
2430 if (expect_false (cell->player == player))
2431 {
2432 px += sdx;
2433 py += sdy;
2434 }
2004 2435
2005 if (cell->stat_hp) 2436 if (cell->stat_hp)
2006 { 2437 {
2007 int width = cell->stat_width * T; 2438 int width = cell->stat_width * T;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2019 } 2450 }
2020 } 2451 }
2021} 2452}
2022 2453
2023void 2454void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2455draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2025 CODE: 2456 CODE:
2026{ 2457{
2027 static float color[16][3] = { 2458 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2459 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2460 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2461 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2462 { 1.00f, 0.00f, 0.00f },
2032 2463
2033 { 1.00F, 0.54F, 0.00F }, 2464 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2465 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2466 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2467 { 0.18f, 0.54f, 0.34f },
2037 2468
2038 { 0.56F, 0.73F, 0.56F }, 2469 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2470 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2471 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2472 { 0.99f, 0.77f, 0.26f },
2042 2473
2043 { 0.74F, 0.65F, 0.41F }, 2474 { 0.74f, 0.65f, 0.41f },
2044 2475
2045 { 0.00F, 1.00F, 1.00F }, 2476 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2477 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2478 { 1.00f, 1.00f, 0.00f },
2048 }; 2479 };
2049 2480
2050 int x, y; 2481 int x, y;
2051 2482
2052 glEnable (GL_TEXTURE_2D); 2483 glEnable (GL_TEXTURE_2D);
2484 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2485 * but the nvidia driver (185.18.14) mishandles alpha textures
2486 * and takes the colour from god knows where instead of using
2487 * Cp. MODULATE results in the same colour, but slightly different
2488 * alpha, but atcually gives us the correct colour with nvidia.
2489 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2490 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2491 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2492 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2493 glBegin (GL_QUADS);
2057 2494
2058 for (y = 0; y < h; y++) 2495 for (y = 0; y < h; y++)
… …
2062 2499
2063 if (m) 2500 if (m)
2064 { 2501 {
2065 float *c = color [m & 15]; 2502 float *c = color [m & 15];
2066 2503
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2504 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2505 float tx2 = tx1 + 0.5f;
2069 2506
2070 glColor4f (c[0], c[1], c[2], 0.75); 2507 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2508 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2509 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2510 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2511 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2512 }
… …
2079 glDisable (GL_BLEND); 2516 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2517 glDisable (GL_TEXTURE_2D);
2081} 2518}
2082 2519
2083void 2520void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2521fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2522 PPCODE:
2086{ 2523{
2087 int x, y; 2524 int x, y;
2088 int sw1 = sw + 2; 2525 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2526 int sh1 = sh + 2;
2090 int sh3 = sh * 3; 2527 int sh3 = sh * 3;
2091 int sw34 = (sw * 3 + 3) & ~3; 2528 int sw3 = sw * 3;
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095 2532
2096 SvPOK_only (darkness3_sv); 2533 SvPOK_only (darkness3_sv);
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2534 SvCUR_set (darkness3_sv, sw3 * sh3);
2098 2535
2099 mx += self->x - 1; 2536 mx += self->x - 1;
2100 my += self->y - 1; 2537 my += self->y - 1;
2101
2102 memset (darkness1, 255, sw1 * sh1);
2103 2538
2104 for (y = 0; y < sh1; y++) 2539 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2540 if (0 <= y + my && y + my < self->rows)
2106 { 2541 {
2107 maprow *row = self->row + (y + my); 2542 maprow *row = self->row + (y + my);
… …
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2545 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2546 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2547 mapcell *cell = row->col + (x + mx - row->c0);
2113 2548
2114 darkness1 [y * sw1 + x] = cell->darkness 2549 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2550 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2551 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2552 }
2118 } 2553 }
2119 2554
2120 for (y = 0; y < sh; ++y) 2555 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2556 for (x = 0; x < sw; ++x)
… …
2140 2575
2141 uint8_t r13 = (d13 + d23 + d12) / 3; 2576 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23; 2577 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3; 2578 uint8_t r33 = (d23 + d33 + d32) / 3;
2144 2579
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154 } 2589 }
2155 2590
2156 free (darkness1); 2591 free (darkness1);
2157 2592
2158 EXTEND (SP, 3); 2593 EXTEND (SP, 3);
2159 PUSHs (sv_2mortal (newSViv (sw34))); 2594 PUSHs (sv_2mortal (newSViv (sw3)));
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2595 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2596 PUSHs (darkness3_sv);
2162} 2597}
2163 2598
2164SV * 2599SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2600get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2601 CODE:
2167{ 2602{
2168 int x, y, x1, y1; 2603 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2604 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2227 else 2662 else
2228 *data++ = 0; 2663 *data++ = 0;
2229 } 2664 }
2230 } 2665 }
2231 2666
2667 /* if size is w*h + 5 then no data has been found */
2668 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2669 {
2232 SvPOK_only (data_sv); 2670 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2671 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672 }
2673
2234 RETVAL = data_sv; 2674 RETVAL = data_sv;
2235} 2675}
2236 OUTPUT: 2676 OUTPUT:
2237 RETVAL 2677 RETVAL
2238 2678
2239void 2679void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2680set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2681 PPCODE:
2242{ 2682{
2243 int x, y, z; 2683 int x, y, z;
2244 int w, h; 2684 int w, h;
2245 int x1, y1; 2685 int x1, y1;
2686 STRLEN len;
2687 uint8_t *data, *end;
2688
2689 len = SvLEN (data_sv);
2690 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691 data = SvPVbyte_nolen (data_sv);
2692 end = data + len + 8;
2693
2694 if (len < 5)
2695 XSRETURN_EMPTY;
2246 2696
2247 if (*data++ != 0) 2697 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2698 XSRETURN_EMPTY; /* version mismatch */
2249 2699
2250 w = *data++ << 8; w |= *data++; 2700 w = *data++ << 8; w |= *data++;
… …
2265 { 2715 {
2266 maprow *row = map_get_row (self, y); 2716 maprow *row = map_get_row (self, y);
2267 2717
2268 for (x = x0; x < x1; x++) 2718 for (x = x0; x < x1; x++)
2269 { 2719 {
2720 uint8_t flags;
2721
2722 if (data + 7 >= end)
2723 XSRETURN_EMPTY;
2724
2270 uint8_t flags = *data++; 2725 flags = *data++;
2271 2726
2272 if (flags) 2727 if (flags)
2273 { 2728 {
2274 mapcell *cell = row_get_cell (row, x); 2729 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2730 tileid tile[3] = { 0, 0, 0 };
… …
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2733 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2734 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2735
2281 if (cell->darkness == 0) 2736 if (cell->darkness == 0)
2282 { 2737 {
2283 cell->darkness = 0; 2738 /*cell->darkness = 0;*/
2739 EXTEND (SP, 3);
2284 2740
2285 for (z = 0; z <= 2; z++) 2741 for (z = 0; z <= 2; z++)
2286 { 2742 {
2287 tileid t = tile [z]; 2743 tileid t = tile [z];
2288 2744
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2745 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2746 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2747 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2748 need_texid (self, t);
2293 } 2749 }
2294 2750
2295 cell->tile [z] = t; 2751 cell->tile [z] = t;
2296 } 2752 }
… …
2298 } 2754 }
2299 } 2755 }
2300 } 2756 }
2301} 2757}
2302 2758
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2759MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2760
2305CFPlus::RW 2761DC::RW
2306new (SV *class, SV *data_sv) 2762new (SV *class, SV *data_sv)
2307 CODE: 2763 CODE:
2308{ 2764{
2309 STRLEN datalen; 2765 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2766 char *data = SvPVbyte (data_sv, datalen);
… …
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2768 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2769}
2314 OUTPUT: 2770 OUTPUT:
2315 RETVAL 2771 RETVAL
2316 2772
2317CFPlus::RW 2773DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2774new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2775 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2776 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2777 OUTPUT:
2322 RETVAL 2778 RETVAL
2323 2779
2324# fails on win32: 2780# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2781# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2782#void
2327#close (CFPlus::RW self) 2783#close (DC::RW self)
2328# CODE: 2784# CODE:
2329# (self->(close)) (self); 2785# (self->(close)) (self);
2330 2786
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2787MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2788
2333PROTOTYPES: DISABLE 2789PROTOTYPES: DISABLE
2334 2790
2335CFPlus::Channel 2791DC::Channel
2336find () 2792find ()
2337 CODE: 2793 CODE:
2338{ 2794{
2339 RETVAL = Mix_GroupAvailable (-1); 2795 RETVAL = Mix_GroupAvailable (-1);
2340 2796
… …
2353} 2809}
2354 OUTPUT: 2810 OUTPUT:
2355 RETVAL 2811 RETVAL
2356 2812
2357void 2813void
2358halt (CFPlus::Channel self) 2814halt (DC::Channel self)
2359 CODE: 2815 CODE:
2360 Mix_HaltChannel (self); 2816 Mix_HaltChannel (self);
2361 2817
2362void 2818void
2363expire (CFPlus::Channel self, int ticks = -1) 2819expire (DC::Channel self, int ticks = -1)
2364 CODE: 2820 CODE:
2365 Mix_ExpireChannel (self, ticks); 2821 Mix_ExpireChannel (self, ticks);
2366 2822
2367void 2823void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2824fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2825 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2826 Mix_FadeOutChannel (self, ticks);
2371 2827
2372int 2828int
2373volume (CFPlus::Channel self, int volume) 2829volume (DC::Channel self, int volume)
2374 CODE: 2830 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2831 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2832 OUTPUT:
2377 RETVAL 2833 RETVAL
2378 2834
2379void 2835void
2380unregister_all_effects (CFPlus::Channel self) 2836unregister_all_effects (DC::Channel self)
2381 CODE: 2837 CODE:
2382 Mix_UnregisterAllEffects (self); 2838 Mix_UnregisterAllEffects (self);
2383 2839
2384void 2840void
2385set_panning (CFPlus::Channel self, int left, int right) 2841set_panning (DC::Channel self, int left, int right)
2386 CODE: 2842 CODE:
2387 left = CLAMP (left , 0, 255); 2843 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2844 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2845 Mix_SetPanning (self, left, right);
2390 2846
2391void 2847void
2392set_distance (CFPlus::Channel self, int distance) 2848set_distance (DC::Channel self, int distance)
2393 CODE: 2849 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2850 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2851
2396void 2852void
2397set_position (CFPlus::Channel self, int angle, int distance) 2853set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2854 CODE:
2399 2855
2400void 2856void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2857set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2858 CODE:
2403{ 2859{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2860 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2861 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2862 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2863}
2408 2864
2409void 2865void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2866set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2867 CODE:
2412 Mix_SetReverseStereo (self, flip); 2868 Mix_SetReverseStereo (self, flip);
2413 2869
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2871
2416PROTOTYPES: DISABLE 2872PROTOTYPES: DISABLE
2417 2873
2418CFPlus::MixChunk 2874DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2875new (SV *class, DC::RW rwops)
2420 CODE: 2876 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2877 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2878 OUTPUT:
2423 RETVAL 2879 RETVAL
2424 2880
2425void 2881void
2426DESTROY (CFPlus::MixChunk self) 2882DESTROY (DC::MixChunk self)
2427 CODE: 2883 CODE:
2428 Mix_FreeChunk (self); 2884 Mix_FreeChunk (self);
2429 2885
2430int 2886int
2431volume (CFPlus::MixChunk self, int volume = -1) 2887volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2888 CODE:
2433 if (items > 1) 2889 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2890 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2891 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2892 OUTPUT:
2437 RETVAL 2893 RETVAL
2438 2894
2439CFPlus::Channel 2895DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2896play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2897 CODE:
2442{ 2898{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2900
2445 if (RETVAL < 0) 2901 if (RETVAL < 0)
… …
2452 } 2908 }
2453} 2909}
2454 OUTPUT: 2910 OUTPUT:
2455 RETVAL 2911 RETVAL
2456 2912
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458 2914
2459int 2915int
2460volume (int volume = -1) 2916volume (int volume = -1)
2461 PROTOTYPE: ;$ 2917 PROTOTYPE: ;$
2462 CODE: 2918 CODE:
… …
2474void 2930void
2475halt () 2931halt ()
2476 CODE: 2932 CODE:
2477 Mix_HaltMusic (); 2933 Mix_HaltMusic ();
2478 2934
2479CFPlus::MixMusic 2935DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2936new (SV *class, DC::RW rwops)
2481 CODE: 2937 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2938 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2939 OUTPUT:
2484 RETVAL 2940 RETVAL
2485 2941
2486void 2942void
2487DESTROY (CFPlus::MixMusic self) 2943DESTROY (DC::MixMusic self)
2488 CODE: 2944 CODE:
2489 Mix_FreeMusic (self); 2945 Mix_FreeMusic (self);
2490 2946
2491int 2947int
2492play (CFPlus::MixMusic self, int loops = -1) 2948play (DC::MixMusic self, int loops = -1)
2493 CODE: 2949 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 2950 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 2951 OUTPUT:
2496 RETVAL 2952 RETVAL
2497 2953
2498void 2954void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2955fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 2956 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 2957 Mix_FadeInMusicPos (self, loops, ms, position);
2502 2958
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2959MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 2960
2505PROTOTYPES: ENABLE 2961PROTOTYPES: ENABLE
2506 2962
2507BOOT: 2963BOOT:
2508{ 2964{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2965 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 2966 static const struct {
2511 const char *name; 2967 const char *name;
2512 IV iv; 2968 IV iv;
2513 } *civ, const_iv[] = { 2969 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 2970# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 2971 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 2972 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 2973 const_iv (GL_EXTENSIONS),
2974 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 2975 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 2976 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 2977 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 2978 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 2979 const_iv (GL_BLEND),
… …
2534 const_iv (GL_ZERO), 2991 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 2992 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 2993 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2994 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 const_iv (GL_ONE_MINUS_DST_ALPHA), 2995 const_iv (GL_ONE_MINUS_DST_ALPHA),
2996 const_iv (GL_SRC_COLOR),
2997 const_iv (GL_DST_COLOR),
2998 const_iv (GL_ONE_MINUS_SRC_COLOR),
2999 const_iv (GL_ONE_MINUS_DST_COLOR),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 3000 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 3001 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 3002 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 3003 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 3004 const_iv (GL_RGBA8),
… …
2549 const_iv (GL_INTENSITY), 3010 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 3011 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 3012 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 3013 const_iv (GL_FLOAT),
2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3014 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3015 const_iv (GL_COMPRESSED_ALPHA_ARB),
3016 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3017 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3018 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3019 const_iv (GL_COMPRESSED_RGB_ARB),
3020 const_iv (GL_COMPRESSED_RGBA_ARB),
2554 const_iv (GL_COMPILE), 3021 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 3022 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 3023 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 3024 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 3025 const_iv (GL_TEXTURE_2D),
… …
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3064 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 3065 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 3066 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 3067 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 3068 const_iv (GL_GENERATE_MIPMAP_HINT),
3069 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 3070 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 3071 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 3072 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 3073 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 3074 const_iv (GL_V3F),
2607 const_iv (GL_T2F_V3F), 3075 const_iv (GL_T2F_V3F),
2608 const_iv (GL_T2F_N3F_V3F), 3076 const_iv (GL_T2F_N3F_V3F),
3077 const_iv (GL_FUNC_ADD),
3078 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2609# undef const_iv 3080# undef const_iv
2610 }; 3081 };
2611 3082
2612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614 3085
2615 texture_av = newAV (); 3086 texture_av = newAV ();
2616 AvREAL_off (texture_av); 3087 AvREAL_off (texture_av);
2617} 3088}
2618 3089
3090void
3091disable_GL_EXT_blend_func_separate ()
3092 CODE:
3093 gl.BlendFuncSeparate = 0;
3094 gl.BlendFuncSeparateEXT = 0;
3095
3096void
3097apple_nvidia_bug (int enable)
3098
2619char * 3099char *
2620gl_vendor () 3100gl_vendor ()
2621 CODE: 3101 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 3102 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 3103 OUTPUT:
… …
2672 3152
2673void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3153void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674 CODE: 3154 CODE:
2675 gl_BlendFuncSeparate (sa, da, saa, daa); 3155 gl_BlendFuncSeparate (sa, da, saa, daa);
2676 3156
3157# void glBlendEquation (int se)
3158
2677void glDepthMask (int flag) 3159void glDepthMask (int flag)
2678 3160
2679void glLogicOp (int opcode) 3161void glLogicOp (int opcode)
2680 3162
2681void glColorMask (int red, int green, int blue, int alpha) 3163void glColorMask (int red, int green, int blue, int alpha)
… …
2715void glRotate (float angle, float x, float y, float z) 3197void glRotate (float angle, float x, float y, float z)
2716 CODE: 3198 CODE:
2717 glRotatef (angle, x, y, z); 3199 glRotatef (angle, x, y, z);
2718 3200
2719void glColor (float r, float g, float b, float a = 1.0) 3201void glColor (float r, float g, float b, float a = 1.0)
3202 PROTOTYPE: @
2720 ALIAS: 3203 ALIAS:
2721 glColor_premultiply = 1 3204 glColor_premultiply = 1
2722 CODE: 3205 CODE:
2723 if (ix) 3206 if (ix)
2724 { 3207 {
… …
2744 3227
2745void glRect (float x1, float y1, float x2, float y2) 3228void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3229 CODE:
2747 glRectf (x1, y1, x2, y2); 3230 glRectf (x1, y1, x2, y2);
2748 3231
3232void glRect_lineloop (float x1, float y1, float x2, float y2)
3233 CODE:
3234 glBegin (GL_LINE_LOOP);
3235 glVertex2f (x1, y1);
3236 glVertex2f (x2, y1);
3237 glVertex2f (x2, y2);
3238 glVertex2f (x1, y2);
3239 glEnd ();
3240
2749PROTOTYPES: ENABLE 3241PROTOTYPES: ENABLE
2750 3242
2751void glBegin (int mode) 3243void glBegin (int mode)
2752 3244
2753void glEnd () 3245void glEnd ()
… …
2785void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3277void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786 CODE: 3278 CODE:
2787 if (gl.SeparableFilter2D) 3279 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3280 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3281
2790void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3282void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791 3283
2792void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3284void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793 3285
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3286void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3287
… …
2821 3313
2822void glEndList () 3314void glEndList ()
2823 3315
2824void glCallList (int list) 3316void glCallList (int list)
2825 3317
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3318void c_init ()
3319 CODE:
3320 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3321 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3322
3323MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3324
2828PROTOTYPES: DISABLE 3325PROTOTYPES: DISABLE
2829 3326
2830void 3327void
2831find_widget (SV *self, NV x, NV y) 3328find_widget (SV *self, NV x, NV y)
… …
2835 XPUSHs (self); 3332 XPUSHs (self);
2836} 3333}
2837 3334
2838BOOT: 3335BOOT:
2839{ 3336{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3337 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3338
2842 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3339 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2843 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3340 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2844 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3341 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2845 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3342 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846} 3343}
2847 3344
2848void 3345void
2849draw (SV *self) 3346draw (SV *self)
2850 CODE: 3347 CODE:
… …
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3354 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3355 SV *draw_h_sv = GvSV (draw_h_gv);
2859 double draw_x, draw_y; 3356 double draw_x, draw_y;
2860 3357
2861 if (!SvROK (self)) 3358 if (!SvROK (self))
2862 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3359 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2863 3360
2864 hv = (HV *)SvRV (self); 3361 hv = (HV *)SvRV (self);
2865 3362
2866 if (SvTYPE (hv) != SVt_PVHV) 3363 if (SvTYPE (hv) != SVt_PVHV)
2867 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3364 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2868 3365
2869 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3366 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2870 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3367 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2871 3368
2872 if (!h || !w) 3369 if (!h || !w)
… …
2905 glEnd (); 3402 glEnd ();
2906 glDisable (GL_BLEND); 3403 glDisable (GL_BLEND);
2907 } 3404 }
2908 } 3405 }
2909#if 0 3406#if 0
2910 if ($ENV{CFPLUS_DEBUG} & 1) { 3407 // draw borders, for debugging
2911 glPushMatrix; 3408 glPushMatrix ();
2912 glColor 1, 1, 0, 1; 3409 glColor4f (1., 1., 0., 1.);
2913 glTranslate 0.375, 0.375; 3410 glTranslatef (.5, .5, 0.);
2914 glBegin GL_LINE_LOOP; 3411 glBegin (GL_LINE_LOOP);
2915 glVertex 0 , 0; 3412 glVertex2f (0 , 0);
2916 glVertex $self->{w} - 1, 0; 3413 glVertex2f (w - 1, 0);
2917 glVertex $self->{w} - 1, $self->{h} - 1; 3414 glVertex2f (w - 1, h - 1);
2918 glVertex 0 , $self->{h} - 1; 3415 glVertex2f (0 , h - 1);
2919 glEnd; 3416 glEnd ();
2920 glPopMatrix; 3417 glPopMatrix ();
2921 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2922 }
2923#endif 3418#endif
2924 PUSHMARK (SP); 3419 PUSHMARK (SP);
2925 XPUSHs (self); 3420 XPUSHs (self);
2926 PUTBACK; 3421 PUTBACK;
2927 call_method ("_draw", G_VOID | G_DISCARD); 3422 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines