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.237 by root, Sun Oct 14 15:33:30 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 {
… …
498 return 0; 536 return 0;
499 537
500 return 1; 538 return 1;
501} 539}
502 540
503MODULE = 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
504 594
505PROTOTYPES: ENABLE 595PROTOTYPES: ENABLE
506 596
507BOOT: 597BOOT:
508{ 598{
509 HV *stash = gv_stashpv ("CFPlus", 1); 599 HV *stash = gv_stashpv ("DC", 1);
510 static const struct { 600 static const struct {
511 const char *name; 601 const char *name;
512 IV iv; 602 IV iv;
513 } *civ, const_iv[] = { 603 } *civ, const_iv[] = {
514# define const_iv(name) { # name, (IV)name } 604# define const_iv(name) { # name, (IV)name }
… …
535 const_iv (SDL_USEREVENT), 625 const_iv (SDL_USEREVENT),
536 626
537 const_iv (SDL_APPINPUTFOCUS), 627 const_iv (SDL_APPINPUTFOCUS),
538 const_iv (SDL_APPMOUSEFOCUS), 628 const_iv (SDL_APPMOUSEFOCUS),
539 const_iv (SDL_APPACTIVE), 629 const_iv (SDL_APPACTIVE),
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),
540 680
541 const_iv (SDLK_FIRST), 681 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST), 682 const_iv (SDLK_LAST),
543 const_iv (SDLK_KP0), 683 const_iv (SDLK_KP0),
544 const_iv (SDLK_KP1), 684 const_iv (SDLK_KP1),
… …
620 const_iv (KMOD_RMETA), 760 const_iv (KMOD_RMETA),
621 const_iv (KMOD_NUM), 761 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 762 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 763 const_iv (KMOD_MODE),
624 764
765 const_iv (KMOD_LRAM),
766
625 const_iv (MIX_DEFAULT_FORMAT), 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)
626# undef const_iv 797# undef const_iv
627 }; 798 };
628 799
629 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; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
652 823
653IV minpot (UV n) 824IV minpot (UV n)
654 825
655IV popcount (UV n) 826IV popcount (UV n)
656 827
828NV distance (NV dx, NV dy)
829 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT:
832 RETVAL
833
657void 834void
658pango_init () 835pango_init ()
659 CODE: 836 CODE:
660{ 837{
661 opengl_fontmap = pango_opengl_font_map_new (); 838 opengl_fontmap = pango_opengl_font_map_new ();
662 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);
663 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
664} 846}
665 847
666char *
667SDL_GetError () 848char *SDL_GetError ()
668 849
669int 850void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 851
672void 852int SDL_Init (U32 flags)
853
854int SDL_InitSubSystem (U32 flags)
855
856void SDL_QuitSubSystem (U32 flags)
857
673SDL_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
674 868
675void 869void
676SDL_ListModes (int rgb, int alpha) 870SDL_ListModes (int rgb, int alpha)
677 PPCODE: 871 PPCODE:
678{ 872{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 887
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 888 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 889 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 890
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 891 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 892
702 if (m && m != (SDL_Rect **)-1) 893 if (m && m != (SDL_Rect **)-1)
703 while (*m) 894 while (*m)
704 { 895 {
705 if ((*m)->w >= 640 && (*m)->h >= 480) 896 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 897 {
707 AV *av = newAV (); 898 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 899 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 900 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 901 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 943SDL_GetKeyName (int sym)
753 944
754int 945int
755SDL_GetAppState () 946SDL_GetAppState ()
756 947
948int
949SDL_GetModState ()
950
757void 951void
758poll_events () 952poll_events ()
759 PPCODE: 953 PPCODE:
760{ 954{
761 SDL_Event ev; 955 SDL_Event ev;
… …
770 { 964 {
771 case SDL_KEYDOWN: 965 case SDL_KEYDOWN:
772 case SDL_KEYUP: 966 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 967 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 968 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 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);
776 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 */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 971 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 972 break;
779 973
780 case SDL_ACTIVEEVENT: 974 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 975 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 993 x = ev.motion.x;
800 y = ev.motion.y; 994 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 995 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 996 }
803 997
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 998 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 999 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 1000 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 1001 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1002 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1003 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 1004 }
811 break; 1005 break;
812 1006
813 case SDL_MOUSEBUTTONDOWN: 1007 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1008 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1009 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1010
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1011 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1012 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1013 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1014 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1019 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1020 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1021 break;
828 } 1022 }
829 1023
830 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))));
831 } 1025 }
832} 1026}
833 1027
834int 1028int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
… …
894 } 1088 }
895 } 1089 }
896#endif 1090#endif
897} 1091}
898 1092
899void 1093int
900add_font (char *file) 1094add_font (char *file)
901 CODE: 1095 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT:
1098 RETVAL
903 1099
904void 1100void
905load_image_inline (SV *image_) 1101load_image_inline (SV *image_)
906 ALIAS: 1102 ALIAS:
907 load_image_file = 1 1103 load_image_file = 1
… …
993void 1189void
994error (char *message) 1190error (char *message)
995 CODE: 1191 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1192 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1193#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1195#endif
1000 1196
1001void 1197void
1002fatal (char *message) 1198fatal (char *message)
1003 CODE: 1199 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1200 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1201#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1202 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1203#endif
1008 _exit (1); 1204 _exit (1);
1009 1205
1010void 1206void
1011_exit (int retval = 0) 1207_exit (int retval = 0)
… …
1023#if DEBUG 1219#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1220 VALGRIND_DO_LEAK_CHECK;
1025#endif 1221#endif
1026} 1222}
1027 1223
1028MODULE = 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
1029 1232
1030PROTOTYPES: DISABLE 1233PROTOTYPES: DISABLE
1031 1234
1032CFPlus::Font 1235DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1236new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1237 CODE:
1035{ 1238{
1036 int count; 1239 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1240 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1040} 1243}
1041 OUTPUT: 1244 OUTPUT:
1042 RETVAL 1245 RETVAL
1043 1246
1044void 1247void
1045DESTROY (CFPlus::Font self) 1248DESTROY (DC::Font self)
1046 CODE: 1249 CODE:
1047 pango_font_description_free (self); 1250 pango_font_description_free (self);
1048 1251
1049void 1252void
1050make_default (CFPlus::Font self) 1253make_default (DC::Font self)
1051 PROTOTYPE: $ 1254 PROTOTYPE: $
1052 CODE: 1255 CODE:
1053 default_font = self; 1256 default_font = self;
1054 1257
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1258MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1259
1057PROTOTYPES: DISABLE 1260PROTOTYPES: DISABLE
1058 1261
1059void 1262void
1060reset_glyph_cache () 1263glyph_cache_backup ()
1061 PROTOTYPE: 1264 PROTOTYPE:
1062 CODE: 1265 CODE:
1266 tc_backup ();
1267
1268void
1269glyph_cache_restore ()
1270 PROTOTYPE:
1271 CODE:
1063 tc_clear (); 1272 tc_restore ();
1064 1273
1065CFPlus::Layout 1274DC::Layout
1066new (SV *class) 1275new (SV *class)
1067 CODE: 1276 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1277 New (0, RETVAL, 1, struct cf_layout);
1069 1278
1070 RETVAL->pl = pango_layout_new (opengl_context); 1279 RETVAL->pl = pango_layout_new (opengl_context);
… …
1080 layout_update_font (RETVAL); 1289 layout_update_font (RETVAL);
1081 OUTPUT: 1290 OUTPUT:
1082 RETVAL 1291 RETVAL
1083 1292
1084void 1293void
1085DESTROY (CFPlus::Layout self) 1294DESTROY (DC::Layout self)
1086 CODE: 1295 CODE:
1087 g_object_unref (self->pl); 1296 g_object_unref (self->pl);
1088 rc_free (self->rc); 1297 rc_free (self->rc);
1089 Safefree (self); 1298 Safefree (self);
1090 1299
1091void 1300void
1092set_text (CFPlus::Layout self, SV *text_) 1301set_text (DC::Layout self, SV *text_)
1093 CODE: 1302 CODE:
1094{ 1303{
1095 STRLEN textlen; 1304 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1305 char *text = SvPVutf8 (text_, textlen);
1097 1306
1098 pango_layout_set_text (self->pl, text, textlen); 1307 pango_layout_set_text (self->pl, text, textlen);
1099} 1308}
1100 1309
1101void 1310void
1102set_markup (CFPlus::Layout self, SV *text_) 1311set_markup (DC::Layout self, SV *text_)
1103 CODE: 1312 CODE:
1104{ 1313{
1105 STRLEN textlen; 1314 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1315 char *text = SvPVutf8 (text_, textlen);
1107 1316
1108 pango_layout_set_markup (self->pl, text, textlen); 1317 pango_layout_set_markup (self->pl, text, textlen);
1109} 1318}
1110 1319
1111void 1320void
1112set_shapes (CFPlus::Layout self, ...) 1321set_shapes (DC::Layout self, ...)
1113 CODE: 1322 CODE:
1114{ 1323{
1115 PangoAttrList *attrs = 0; 1324 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1325 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1326 const char *pos = text;
… …
1152 if (attrs) 1361 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1362 pango_layout_set_attributes (self->pl, attrs);
1154} 1363}
1155 1364
1156void 1365void
1157get_shapes (CFPlus::Layout self) 1366get_shapes (DC::Layout self)
1158 PPCODE: 1367 PPCODE:
1159{ 1368{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1369 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1370
1162 do 1371 do
1163 { 1372 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1373 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1374
1166 if (run && shape_attr_p (run)) 1375 if (run && shape_attr_p (run))
1167 { 1376 {
1168 PangoRectangle extents; 1377 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1378 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1177 1386
1178 pango_layout_iter_free (iter); 1387 pango_layout_iter_free (iter);
1179} 1388}
1180 1389
1181int 1390int
1182has_wrapped (CFPlus::Layout self) 1391has_wrapped (DC::Layout self)
1183 CODE: 1392 CODE:
1184{ 1393{
1185 int lines = 1; 1394 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1395 const char *text = pango_layout_get_text (self->pl);
1187 1396
… …
1192} 1401}
1193 OUTPUT: 1402 OUTPUT:
1194 RETVAL 1403 RETVAL
1195 1404
1196SV * 1405SV *
1197get_text (CFPlus::Layout self) 1406get_text (DC::Layout self)
1198 CODE: 1407 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1408 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1409 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1410 OUTPUT:
1202 RETVAL 1411 RETVAL
1203 1412
1204void 1413void
1205set_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.)
1206 CODE: 1415 CODE:
1207 self->r = r; 1416 self->r = r;
1208 self->g = g; 1417 self->g = g;
1209 self->b = b; 1418 self->b = b;
1210 self->a = a; 1419 self->a = a;
1211 1420
1212void 1421void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1422set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1423 CODE:
1215 if (self->font != font) 1424 if (self->font != font)
1216 { 1425 {
1217 self->font = font; 1426 self->font = font;
1218 layout_update_font (self); 1427 layout_update_font (self);
1219 } 1428 }
1220 1429
1221void 1430void
1222set_height (CFPlus::Layout self, int base_height) 1431set_height (DC::Layout self, int base_height)
1223 CODE: 1432 CODE:
1224 if (self->base_height != base_height) 1433 if (self->base_height != base_height)
1225 { 1434 {
1226 self->base_height = base_height; 1435 self->base_height = base_height;
1227 layout_update_font (self); 1436 layout_update_font (self);
1228 } 1437 }
1229 1438
1230void 1439void
1231set_width (CFPlus::Layout self, int max_width = -1) 1440set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1441 CODE:
1233 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);
1234 1443
1235void 1444void
1236set_indent (CFPlus::Layout self, int indent) 1445set_indent (DC::Layout self, int indent)
1237 CODE: 1446 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1447 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1448
1240void 1449void
1241set_spacing (CFPlus::Layout self, int spacing) 1450set_spacing (DC::Layout self, int spacing)
1242 CODE: 1451 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1452 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1453
1245void 1454void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1455set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1456 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1457 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1458 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1459 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1460 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1461 : PANGO_ELLIPSIZE_NONE
1253 ); 1462 );
1254 1463
1255void 1464void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1465set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1466 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1467 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1468
1260void 1469void
1261size (CFPlus::Layout self) 1470size (DC::Layout self)
1262 PPCODE: 1471 PPCODE:
1263{ 1472{
1264 int w, h; 1473 int w, h;
1265 1474
1266 layout_get_pixel_size (self, &w, &h); 1475 layout_get_pixel_size (self, &w, &h);
… …
1269 PUSHs (sv_2mortal (newSViv (w))); 1478 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1479 PUSHs (sv_2mortal (newSViv (h)));
1271} 1480}
1272 1481
1273int 1482int
1274descent (CFPlus::Layout self) 1483descent (DC::Layout self)
1275 CODE: 1484 CODE:
1276{ 1485{
1277 PangoRectangle rect; 1486 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1487 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1488 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1489 RETVAL = PANGO_DESCENT (rect);
1281} 1490}
1282 OUTPUT: 1491 OUTPUT:
1283 RETVAL 1492 RETVAL
1284 1493
1285int 1494int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1495xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1496 CODE:
1288{ 1497{
1289 int index, trailing; 1498 int index, trailing;
1290 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);
1291 RETVAL = index + trailing; 1500 RETVAL = index + trailing;
1292} 1501}
1293 OUTPUT: 1502 OUTPUT:
1294 RETVAL 1503 RETVAL
1295 1504
1296void 1505void
1297cursor_pos (CFPlus::Layout self, int index) 1506cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1507 PPCODE:
1299{ 1508{
1300 PangoRectangle strong_pos; 1509 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1510 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1511
1303 EXTEND (SP, 3); 1512 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1514 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1515 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1516}
1308 1517
1309void 1518void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1519index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1520 PPCODE:
1312{ 1521{
1313 int line, x; 1522 int line, x;
1314 1523
1315 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)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1526 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1527 --line;
1528#endif
1318 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1530 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1532}
1322 1533
1323void 1534void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1535line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1536 PPCODE:
1326{ 1537{
1327 PangoLayoutLine *lp; 1538 PangoLayoutLine *lp;
1328 int index, trailing; 1539 int index, trailing;
1329 1540
1330 if (line < 0) 1541 if (line < 0)
1331 XSRETURN_EMPTY; 1542 XSRETURN_EMPTY;
1332 1543
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1544 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1545 XSRETURN_EMPTY; /* do better */
1335 1546
1336 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);
1337 1548
1338 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
… …
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1555 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1556 }
1346} 1557}
1347 1558
1348void 1559void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1560render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1561 CODE:
1351 rc_clear (self->rc); 1562 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1563 pango_opengl_render_layout_subpixel (
1353 self->pl, 1564 self->pl,
1354 self->rc, 1565 self->rc,
… …
1359 // we assume that context_change actually clears/frees stuff 1570 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1571 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1572 pango_layout_context_changed (self->pl);
1362 1573
1363void 1574void
1364draw (CFPlus::Layout self) 1575draw (DC::Layout self)
1365 CODE: 1576 CODE:
1366{ 1577{
1367 glEnable (GL_TEXTURE_2D); 1578 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1579 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1580 glEnable (GL_BLEND);
… …
1377 glDisable (GL_ALPHA_TEST); 1588 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1589 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1590 glDisable (GL_TEXTURE_2D);
1380} 1591}
1381 1592
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1593MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1594
1384PROTOTYPES: ENABLE 1595PROTOTYPES: ENABLE
1385 1596
1386void 1597void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1598pad (SV *data_, int ow, int oh, int nw, int nh)
… …
1455 glDisable (GL_ALPHA_TEST); 1666 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1667 glDisable (GL_BLEND);
1457 } 1668 }
1458} 1669}
1459 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
1460IV 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)
1461 CODE: 1793 CODE:
1462{ 1794{
1463 GLint width; 1795 GLint width;
1464 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);
… …
1466 RETVAL = width > 0; 1798 RETVAL = width > 0;
1467} 1799}
1468 OUTPUT: 1800 OUTPUT:
1469 RETVAL 1801 RETVAL
1470 1802
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1803MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1804
1473PROTOTYPES: DISABLE 1805PROTOTYPES: DISABLE
1474 1806
1475CFPlus::Map 1807DC::Map
1476new (SV *class) 1808new (SV *class)
1477 CODE: 1809 CODE:
1478 New (0, RETVAL, 1, struct map); 1810 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1811 RETVAL->x = 0;
1480 RETVAL->y = 0; 1812 RETVAL->y = 0;
… …
1488 RETVAL->row = 0; 1820 RETVAL->row = 0;
1489 OUTPUT: 1821 OUTPUT:
1490 RETVAL 1822 RETVAL
1491 1823
1492void 1824void
1493DESTROY (CFPlus::Map self) 1825DESTROY (DC::Map self)
1494 CODE: 1826 CODE:
1495{ 1827{
1496 map_clear (self); 1828 map_clear (self);
1497 Safefree (self->face2tile); 1829 Safefree (self->face2tile);
1498 Safefree (self->tex); 1830 Safefree (self->tex);
1499 Safefree (self); 1831 Safefree (self);
1500} 1832}
1501 1833
1502void 1834void
1503resize (CFPlus::Map self, int map_width, int map_height) 1835resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1836 CODE:
1505 self->w = map_width; 1837 self->w = map_width;
1506 self->h = map_height; 1838 self->h = map_height;
1507 1839
1508void 1840void
1509clear (CFPlus::Map self) 1841clear (DC::Map self)
1510 CODE: 1842 CODE:
1511 map_clear (self); 1843 map_clear (self);
1512 1844
1513void 1845void
1514set_tileid (CFPlus::Map self, int face, int tile) 1846set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1847 CODE:
1516{ 1848{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1849 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1850 need_texid (self, tile);
1519} 1851}
1520 1852
1521void 1853void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1854set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1855 CODE:
1524{ 1856{
1525 tileid texid; 1857 tileid texid;
1526 maptex *tex; 1858 maptex *tex;
1527 1859
… …
1540 tex->smoothtile = self->face2tile [smooth]; 1872 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1873 tex->smoothlevel = level;
1542} 1874}
1543 1875
1544void 1876void
1545set_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)
1546 CODE: 1878 CODE:
1547{ 1879{
1548 need_texid (self, texid); 1880 need_texid (self, texid);
1549 1881
1550 { 1882 {
… …
1569 // use uglier nearest interpolation because linear suffers 1901 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1902 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1903 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1904}
1573 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
1574int 1926int
1575ox (CFPlus::Map self) 1927ox (DC::Map self)
1576 ALIAS: 1928 ALIAS:
1577 oy = 1 1929 oy = 1
1578 x = 2 1930 x = 2
1579 y = 3 1931 y = 3
1580 w = 4 1932 w = 4
… …
1591 } 1943 }
1592 OUTPUT: 1944 OUTPUT:
1593 RETVAL 1945 RETVAL
1594 1946
1595void 1947void
1596scroll (CFPlus::Map self, int dx, int dy) 1948scroll (DC::Map self, int dx, int dy)
1597 CODE: 1949 CODE:
1598{ 1950{
1599 if (dx > 0) 1951 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1952 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1953 else if (dx < 0)
… …
1617 self->y += MAP_EXTEND_Y; 1969 self->y += MAP_EXTEND_Y;
1618 } 1970 }
1619} 1971}
1620 1972
1621SV * 1973SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1974map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1975 CODE:
1624{ 1976{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1977 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1978 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1979 mapcell *cell;
… …
1655 uint8_t ext, cmd; 2007 uint8_t ext, cmd;
1656 2008
1657 do 2009 do
1658 { 2010 {
1659 ext = *data++; 2011 ext = *data++;
1660 cmd = ext & 0x3f; 2012 cmd = ext & 0x7f;
1661 2013
1662 if (cmd < 4) 2014 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1664 else if (cmd == 5) // health 2016 else if (cmd == 5) // health
1665 { 2017 {
1666 cell->stat_width = 1; 2018 cell->stat_width = 1;
1667 cell->stat_hp = *data++; 2019 cell->stat_hp = *data++;
1668 } 2020 }
1669 else if (cmd == 6) // monster width 2021 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 2022 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 2023 else if (cmd == 0x47)
1672 { 2024 {
1673 if (*data == 4) 2025 if (*data == 1) cell->player = data [1];
1674 ; // 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);
1675 2029
1676 data += *data + 1; 2030 data += *data + 1;
1677 } 2031 }
1678 else if (cmd == 8) // cell flags 2032 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 2033 cell->flags = *data++;
… …
1696 cell->tile [z] = self->face2tile [face]; 2050 cell->tile [z] = self->face2tile [face];
1697 2051
1698 if (cell->tile [z]) 2052 if (cell->tile [z])
1699 { 2053 {
1700 maptex *tex = self->tex + cell->tile [z]; 2054 maptex *tex = self->tex + cell->tile [z];
2055 tex->unused = 0;
1701 if (!tex->name) 2056 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2057 av_push (missing, newSViv (cell->tile [z]));
1703 2058
1704 if (tex->smoothtile) 2059 if (tex->smoothtile)
1705 { 2060 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2061 maptex *smooth = self->tex + tex->smoothtile;
2062 smooth->unused = 0;
1707 if (!smooth->name) 2063 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2064 av_push (missing, newSViv (tex->smoothtile));
1709 } 2065 }
1710 } 2066 }
1711 } 2067 }
1712 } 2068 }
1713 else 2069 else
1714 cell->darkness = 0; 2070 CELL_CLEAR (cell);
1715 } 2071 }
1716} 2072}
1717 OUTPUT: 2073 OUTPUT:
1718 RETVAL 2074 RETVAL
1719 2075
1720SV * 2076SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2077mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2078 CODE:
1723{ 2079{
1724 int x1, x; 2080 int x1, x;
1725 int y1, y; 2081 int y1, y;
1726 int z; 2082 int z;
… …
1771} 2127}
1772 OUTPUT: 2128 OUTPUT:
1773 RETVAL 2129 RETVAL
1774 2130
1775void 2131void
1776draw (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)
1777 CODE: 2133 CODE:
1778{ 2134{
1779 int x, y, z; 2135 int x, y, z;
1780 2136
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 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
1783 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)
1784 smooth_key skey; 2140 smooth_key skey;
1785 2141 int pl_x, pl_y;
2142 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2143 rc_t *rc = rc_alloc ();
2144 rc_t *rc_ov = rc_alloc ();
1787 rc_key_t key; 2145 rc_key_t key;
1788 rc_array_t *arr; 2146 rc_array_t *arr, *arr_hidden;
1789 2147
2148 pl_tex.name = 0;
2149
1790 // thats current max. sorry. 2150 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2151 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2152 if (sh > 255) sh = 255;
1793 2153
1794 // clear key, in case of extra padding 2154 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey)); 2155 memset (&skey, 0, sizeof (skey));
… …
1799 key.g = 255; 2159 key.g = 255;
1800 key.b = 255; 2160 key.b = 255;
1801 key.a = 255; 2161 key.a = 255;
1802 key.mode = GL_QUADS; 2162 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2163 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2164
1806 mx += self->x; 2165 mx += self->x;
1807 my += self->y; 2166 my += self->y;
1808 2167
1809 // first pass: determine smooth_max 2168 // first pass: determine smooth_max
… …
1830 2189
1831 glEnable (GL_BLEND); 2190 glEnable (GL_BLEND);
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2193
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
1835 for (z = 0; z <= 2; z++) 2197 for (z = 0; z <= 2; z++)
1836 { 2198 {
1837 memset (smooth_level, 0, sizeof (smooth_level)); 2199 memset (smooth_level, 0, sizeof (smooth_level));
2200 key.texname = -1;
1838 2201
1839 for (y = 0; y < sh; y++) 2202 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2203 if (0 <= y + my && y + my < self->rows)
1841 { 2204 {
1842 maprow *row = self->row + (y + my); 2205 maprow *row = self->row + (y + my);
… …
1852 maptex tex = self->tex [tile]; 2215 maptex tex = self->tex [tile];
1853 int px, py; 2216 int px, py;
1854 2217
1855 if (key.texname != tex.name) 2218 if (key.texname != tex.name)
1856 { 2219 {
2220 self->tex [tile].unused = 0;
2221
1857 if (!tex.name) 2222 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2224
1860 key.texname = tex.name; 2225 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2226 arr = rc_array (rc, &key);
1862 } 2227 }
1863 2228
1864 px = (x + 1) * T - tex.w; 2229 px = (x + 1) * T - tex.w;
1865 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 }
1866 2239
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 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);
1869 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);
1870 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);
1871
1872 if (cell->flags && z == 2)
1873 {
1874 // overlays such as the speech bubble, probably more to come
1875 if (cell->flags & 1)
1876 {
1877 maptex tex = self->tex [1];
1878 int px = x * T + T * 2 / 32;
1879 int py = y * T - T * 6 / 32;
1880
1881 if (tex.name)
1882 {
1883 if (key.texname != tex.name)
1884 {
1885 key.texname = tex.name;
1886 arr = rc_array (rc, &key);
1887 }
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1891 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1892 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1893 }
1894 }
1895 }
1896 2244
1897 // update smooth hash 2245 // update smooth hash
1898 if (tex.smoothtile) 2246 if (tex.smoothtile)
1899 { 2247 {
1900 skey.tile = tex.smoothtile; 2248 skey.tile = tex.smoothtile;
… …
1929 // corners 2277 // corners
1930 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);
1931 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);
1932 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);
1933 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);
1934 } 2303 }
1935 } 2304 }
1936 } 2305 }
1937 } 2306 }
1938 2307
… …
1978 { 2347 {
1979 // this time avoiding texture state changes 2348 // this time avoiding texture state changes
1980 // save gobs of state changes. 2349 // save gobs of state changes.
1981 if (key.texname != tex.name) 2350 if (key.texname != tex.name)
1982 { 2351 {
2352 self->tex [skey->tile].unused = 0;
2353
1983 glEnd (); 2354 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2356 glBegin (GL_QUADS);
1986 } 2357 }
1987 2358
… …
2016 } 2387 }
2017 2388
2018 hv_clear (smooth); 2389 hv_clear (smooth);
2019 } 2390 }
2020 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
2021 glDisable (GL_BLEND); 2412 glDisable (GL_BLEND);
2022 rc_free (rc); 2413 rc_free (rc);
2414 rc_free (rc_ov);
2023 2415
2024 // top layer: overlays such as the health bar 2416 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2417 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2418 if (0 <= y + my && y + my < self->rows)
2027 { 2419 {
… …
2032 { 2424 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2425 mapcell *cell = row->col + (x + mx - row->c0);
2034 2426
2035 int px = x * T; 2427 int px = x * T;
2036 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 }
2037 2435
2038 if (cell->stat_hp) 2436 if (cell->stat_hp)
2039 { 2437 {
2040 int width = cell->stat_width * T; 2438 int width = cell->stat_width * T;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2052 } 2450 }
2053 } 2451 }
2054} 2452}
2055 2453
2056void 2454void
2057draw_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)
2058 CODE: 2456 CODE:
2059{ 2457{
2060 static float color[16][3] = { 2458 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2459 { 0.00f, 0.00f, 0.00f },
2062 { 1.00F, 1.00F, 1.00F }, 2460 { 1.00f, 1.00f, 1.00f },
2063 { 0.00F, 0.00F, 0.55F }, 2461 { 0.00f, 0.00f, 0.55f },
2064 { 1.00F, 0.00F, 0.00F }, 2462 { 1.00f, 0.00f, 0.00f },
2065 2463
2066 { 1.00F, 0.54F, 0.00F }, 2464 { 1.00f, 0.54f, 0.00f },
2067 { 0.11F, 0.56F, 1.00F }, 2465 { 0.11f, 0.56f, 1.00f },
2068 { 0.93F, 0.46F, 0.00F }, 2466 { 0.93f, 0.46f, 0.00f },
2069 { 0.18F, 0.54F, 0.34F }, 2467 { 0.18f, 0.54f, 0.34f },
2070 2468
2071 { 0.56F, 0.73F, 0.56F }, 2469 { 0.56f, 0.73f, 0.56f },
2072 { 0.80F, 0.80F, 0.80F }, 2470 { 0.80f, 0.80f, 0.80f },
2073 { 0.55F, 0.41F, 0.13F }, 2471 { 0.55f, 0.41f, 0.13f },
2074 { 0.99F, 0.77F, 0.26F }, 2472 { 0.99f, 0.77f, 0.26f },
2075 2473
2076 { 0.74F, 0.65F, 0.41F }, 2474 { 0.74f, 0.65f, 0.41f },
2077 2475
2078 { 0.00F, 1.00F, 1.00F }, 2476 { 0.00f, 1.00f, 1.00f },
2079 { 1.00F, 0.00F, 1.00F }, 2477 { 1.00f, 0.00f, 1.00f },
2080 { 1.00F, 1.00F, 0.00F }, 2478 { 1.00f, 1.00f, 0.00f },
2081 }; 2479 };
2082 2480
2083 int x, y; 2481 int x, y;
2084 2482
2085 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 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2490 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2491 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2492 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2493 glBegin (GL_QUADS);
2090 2494
2091 for (y = 0; y < h; y++) 2495 for (y = 0; y < h; y++)
… …
2095 2499
2096 if (m) 2500 if (m)
2097 { 2501 {
2098 float *c = color [m & 15]; 2502 float *c = color [m & 15];
2099 2503
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2504 float tx1 = m & 0x40 ? 0.5f : 0.f;
2101 float tx2 = tx1 + 0.5; 2505 float tx2 = tx1 + 0.5f;
2102 2506
2103 glColor4f (c[0], c[1], c[2], 0.75); 2507 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2508 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2509 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2510 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2511 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2512 }
… …
2112 glDisable (GL_BLEND); 2516 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2517 glDisable (GL_TEXTURE_2D);
2114} 2518}
2115 2519
2116void 2520void
2117fow_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)
2118 PPCODE: 2522 PPCODE:
2119{ 2523{
2120 int x, y; 2524 int x, y;
2121 int sw1 = sw + 2; 2525 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2526 int sh1 = sh + 2;
2123 int sh3 = sh * 3; 2527 int sh3 = sh * 3;
2124 int sw34 = (sw * 3 + 3) & ~3; 2528 int sw3 = sw * 3;
2125 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2126 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2127 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2128 2532
2129 SvPOK_only (darkness3_sv); 2533 SvPOK_only (darkness3_sv);
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2534 SvCUR_set (darkness3_sv, sw3 * sh3);
2131 2535
2132 mx += self->x - 1; 2536 mx += self->x - 1;
2133 my += self->y - 1; 2537 my += self->y - 1;
2134
2135 memset (darkness1, 255, sw1 * sh1);
2136 2538
2137 for (y = 0; y < sh1; y++) 2539 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2540 if (0 <= y + my && y + my < self->rows)
2139 { 2541 {
2140 maprow *row = self->row + (y + my); 2542 maprow *row = self->row + (y + my);
… …
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2545 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2546 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2547 mapcell *cell = row->col + (x + mx - row->c0);
2146 2548
2147 darkness1 [y * sw1 + x] = cell->darkness 2549 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2550 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2551 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2552 }
2151 } 2553 }
2152 2554
2153 for (y = 0; y < sh; ++y) 2555 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2556 for (x = 0; x < sw; ++x)
… …
2173 2575
2174 uint8_t r13 = (d13 + d23 + d12) / 3; 2576 uint8_t r13 = (d13 + d23 + d12) / 3;
2175 uint8_t r23 = d23; 2577 uint8_t r23 = d23;
2176 uint8_t r33 = (d23 + d33 + d32) / 3; 2578 uint8_t r33 = (d23 + d33 + d32) / 3;
2177 2579
2178 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2580 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2179 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2180 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2181 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2583 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2182 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 */
2183 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2184 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2586 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2185 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2186 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2187 } 2589 }
2188 2590
2189 free (darkness1); 2591 free (darkness1);
2190 2592
2191 EXTEND (SP, 3); 2593 EXTEND (SP, 3);
2192 PUSHs (sv_2mortal (newSViv (sw34))); 2594 PUSHs (sv_2mortal (newSViv (sw3)));
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2595 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2596 PUSHs (darkness3_sv);
2195} 2597}
2196 2598
2197SV * 2599SV *
2198get_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)
2199 CODE: 2601 CODE:
2200{ 2602{
2201 int x, y, x1, y1; 2603 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2604 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2260 else 2662 else
2261 *data++ = 0; 2663 *data++ = 0;
2262 } 2664 }
2263 } 2665 }
2264 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 {
2265 SvPOK_only (data_sv); 2670 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2671 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672 }
2673
2267 RETVAL = data_sv; 2674 RETVAL = data_sv;
2268} 2675}
2269 OUTPUT: 2676 OUTPUT:
2270 RETVAL 2677 RETVAL
2271 2678
2272void 2679void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2680set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2681 PPCODE:
2275{ 2682{
2276 int x, y, z; 2683 int x, y, z;
2277 int w, h; 2684 int w, h;
2278 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;
2279 2696
2280 if (*data++ != 0) 2697 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2698 XSRETURN_EMPTY; /* version mismatch */
2282 2699
2283 w = *data++ << 8; w |= *data++; 2700 w = *data++ << 8; w |= *data++;
… …
2298 { 2715 {
2299 maprow *row = map_get_row (self, y); 2716 maprow *row = map_get_row (self, y);
2300 2717
2301 for (x = x0; x < x1; x++) 2718 for (x = x0; x < x1; x++)
2302 { 2719 {
2720 uint8_t flags;
2721
2722 if (data + 7 >= end)
2723 XSRETURN_EMPTY;
2724
2303 uint8_t flags = *data++; 2725 flags = *data++;
2304 2726
2305 if (flags) 2727 if (flags)
2306 { 2728 {
2307 mapcell *cell = row_get_cell (row, x); 2729 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2730 tileid tile[3] = { 0, 0, 0 };
… …
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2733 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2734 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2735
2314 if (cell->darkness == 0) 2736 if (cell->darkness == 0)
2315 { 2737 {
2316 cell->darkness = 0; 2738 /*cell->darkness = 0;*/
2739 EXTEND (SP, 3);
2317 2740
2318 for (z = 0; z <= 2; z++) 2741 for (z = 0; z <= 2; z++)
2319 { 2742 {
2320 tileid t = tile [z]; 2743 tileid t = tile [z];
2321 2744
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2745 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2746 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2747 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2748 need_texid (self, t);
2326 } 2749 }
2327 2750
2328 cell->tile [z] = t; 2751 cell->tile [z] = t;
2329 } 2752 }
… …
2331 } 2754 }
2332 } 2755 }
2333 } 2756 }
2334} 2757}
2335 2758
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2759MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2760
2338CFPlus::RW 2761DC::RW
2339new (SV *class, SV *data_sv) 2762new (SV *class, SV *data_sv)
2340 CODE: 2763 CODE:
2341{ 2764{
2342 STRLEN datalen; 2765 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2766 char *data = SvPVbyte (data_sv, datalen);
… …
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2768 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2769}
2347 OUTPUT: 2770 OUTPUT:
2348 RETVAL 2771 RETVAL
2349 2772
2350CFPlus::RW 2773DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2774new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2775 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2776 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2777 OUTPUT:
2355 RETVAL 2778 RETVAL
2356 2779
2357# fails on win32: 2780# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2781# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2782#void
2360#close (CFPlus::RW self) 2783#close (DC::RW self)
2361# CODE: 2784# CODE:
2362# (self->(close)) (self); 2785# (self->(close)) (self);
2363 2786
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2787MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2788
2366PROTOTYPES: DISABLE 2789PROTOTYPES: DISABLE
2367 2790
2368CFPlus::Channel 2791DC::Channel
2369find () 2792find ()
2370 CODE: 2793 CODE:
2371{ 2794{
2372 RETVAL = Mix_GroupAvailable (-1); 2795 RETVAL = Mix_GroupAvailable (-1);
2373 2796
… …
2386} 2809}
2387 OUTPUT: 2810 OUTPUT:
2388 RETVAL 2811 RETVAL
2389 2812
2390void 2813void
2391halt (CFPlus::Channel self) 2814halt (DC::Channel self)
2392 CODE: 2815 CODE:
2393 Mix_HaltChannel (self); 2816 Mix_HaltChannel (self);
2394 2817
2395void 2818void
2396expire (CFPlus::Channel self, int ticks = -1) 2819expire (DC::Channel self, int ticks = -1)
2397 CODE: 2820 CODE:
2398 Mix_ExpireChannel (self, ticks); 2821 Mix_ExpireChannel (self, ticks);
2399 2822
2400void 2823void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2824fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2825 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2826 Mix_FadeOutChannel (self, ticks);
2404 2827
2405int 2828int
2406volume (CFPlus::Channel self, int volume) 2829volume (DC::Channel self, int volume)
2407 CODE: 2830 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2831 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2832 OUTPUT:
2410 RETVAL 2833 RETVAL
2411 2834
2412void 2835void
2413unregister_all_effects (CFPlus::Channel self) 2836unregister_all_effects (DC::Channel self)
2414 CODE: 2837 CODE:
2415 Mix_UnregisterAllEffects (self); 2838 Mix_UnregisterAllEffects (self);
2416 2839
2417void 2840void
2418set_panning (CFPlus::Channel self, int left, int right) 2841set_panning (DC::Channel self, int left, int right)
2419 CODE: 2842 CODE:
2420 left = CLAMP (left , 0, 255); 2843 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2844 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2845 Mix_SetPanning (self, left, right);
2423 2846
2424void 2847void
2425set_distance (CFPlus::Channel self, int distance) 2848set_distance (DC::Channel self, int distance)
2426 CODE: 2849 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2850 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2851
2429void 2852void
2430set_position (CFPlus::Channel self, int angle, int distance) 2853set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2854 CODE:
2432 2855
2433void 2856void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2857set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2858 CODE:
2436{ 2859{
2437 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));
2438 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;
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2862 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2863}
2441 2864
2442void 2865void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2866set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2867 CODE:
2445 Mix_SetReverseStereo (self, flip); 2868 Mix_SetReverseStereo (self, flip);
2446 2869
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2871
2449PROTOTYPES: DISABLE 2872PROTOTYPES: DISABLE
2450 2873
2451CFPlus::MixChunk 2874DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2875new (SV *class, DC::RW rwops)
2453 CODE: 2876 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2877 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2878 OUTPUT:
2456 RETVAL 2879 RETVAL
2457 2880
2458void 2881void
2459DESTROY (CFPlus::MixChunk self) 2882DESTROY (DC::MixChunk self)
2460 CODE: 2883 CODE:
2461 Mix_FreeChunk (self); 2884 Mix_FreeChunk (self);
2462 2885
2463int 2886int
2464volume (CFPlus::MixChunk self, int volume = -1) 2887volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2888 CODE:
2466 if (items > 1) 2889 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2890 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2891 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2892 OUTPUT:
2470 RETVAL 2893 RETVAL
2471 2894
2472CFPlus::Channel 2895DC::Channel
2473play (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)
2474 CODE: 2897 CODE:
2475{ 2898{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2900
2478 if (RETVAL < 0) 2901 if (RETVAL < 0)
… …
2485 } 2908 }
2486} 2909}
2487 OUTPUT: 2910 OUTPUT:
2488 RETVAL 2911 RETVAL
2489 2912
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2914
2492int 2915int
2493volume (int volume = -1) 2916volume (int volume = -1)
2494 PROTOTYPE: ;$ 2917 PROTOTYPE: ;$
2495 CODE: 2918 CODE:
… …
2507void 2930void
2508halt () 2931halt ()
2509 CODE: 2932 CODE:
2510 Mix_HaltMusic (); 2933 Mix_HaltMusic ();
2511 2934
2512CFPlus::MixMusic 2935DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2936new (SV *class, DC::RW rwops)
2514 CODE: 2937 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2938 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2939 OUTPUT:
2517 RETVAL 2940 RETVAL
2518 2941
2519void 2942void
2520DESTROY (CFPlus::MixMusic self) 2943DESTROY (DC::MixMusic self)
2521 CODE: 2944 CODE:
2522 Mix_FreeMusic (self); 2945 Mix_FreeMusic (self);
2523 2946
2524int 2947int
2525play (CFPlus::MixMusic self, int loops = -1) 2948play (DC::MixMusic self, int loops = -1)
2526 CODE: 2949 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2950 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2951 OUTPUT:
2529 RETVAL 2952 RETVAL
2530 2953
2531void 2954void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2955fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2956 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2957 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2958
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2959MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2960
2538PROTOTYPES: ENABLE 2961PROTOTYPES: ENABLE
2539 2962
2540BOOT: 2963BOOT:
2541{ 2964{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2965 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2966 static const struct {
2544 const char *name; 2967 const char *name;
2545 IV iv; 2968 IV iv;
2546 } *civ, const_iv[] = { 2969 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2970# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 2971 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 2972 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 2973 const_iv (GL_EXTENSIONS),
2974 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 2975 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 2976 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 2977 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 2978 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 2979 const_iv (GL_BLEND),
… …
2567 const_iv (GL_ZERO), 2991 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 2992 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 2993 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2994 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 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),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 3000 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 3001 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 3002 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 3003 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 3004 const_iv (GL_RGBA8),
… …
2644 const_iv (GL_NICEST), 3072 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3073 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3074 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3075 const_iv (GL_T2F_V3F),
2648 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),
2649# undef const_iv 3080# undef const_iv
2650 }; 3081 };
2651 3082
2652 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; )
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2660disable_GL_EXT_blend_func_separate () 3091disable_GL_EXT_blend_func_separate ()
2661 CODE: 3092 CODE:
2662 gl.BlendFuncSeparate = 0; 3093 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3094 gl.BlendFuncSeparateEXT = 0;
2664 3095
3096void
3097apple_nvidia_bug (int enable)
3098
2665char * 3099char *
2666gl_vendor () 3100gl_vendor ()
2667 CODE: 3101 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3102 RETVAL = (char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3103 OUTPUT:
… …
2718 3152
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3153void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3154 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3155 gl_BlendFuncSeparate (sa, da, saa, daa);
2722 3156
3157# void glBlendEquation (int se)
3158
2723void glDepthMask (int flag) 3159void glDepthMask (int flag)
2724 3160
2725void glLogicOp (int opcode) 3161void glLogicOp (int opcode)
2726 3162
2727void glColorMask (int red, int green, int blue, int alpha) 3163void glColorMask (int red, int green, int blue, int alpha)
… …
2761void glRotate (float angle, float x, float y, float z) 3197void glRotate (float angle, float x, float y, float z)
2762 CODE: 3198 CODE:
2763 glRotatef (angle, x, y, z); 3199 glRotatef (angle, x, y, z);
2764 3200
2765void 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: @
2766 ALIAS: 3203 ALIAS:
2767 glColor_premultiply = 1 3204 glColor_premultiply = 1
2768 CODE: 3205 CODE:
2769 if (ix) 3206 if (ix)
2770 { 3207 {
… …
2840void 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)
2841 CODE: 3278 CODE:
2842 if (gl.SeparableFilter2D) 3279 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3280 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3281
2845void 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)
2846 3283
2847void 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)
2848 3285
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3286void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3287
… …
2876 3313
2877void glEndList () 3314void glEndList ()
2878 3315
2879void glCallList (int list) 3316void glCallList (int list)
2880 3317
2881MODULE = 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
2882 3324
2883PROTOTYPES: DISABLE 3325PROTOTYPES: DISABLE
2884 3326
2885void 3327void
2886find_widget (SV *self, NV x, NV y) 3328find_widget (SV *self, NV x, NV y)
… …
2890 XPUSHs (self); 3332 XPUSHs (self);
2891} 3333}
2892 3334
2893BOOT: 3335BOOT:
2894{ 3336{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3337 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3338
2897 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);
2898 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);
2899 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);
2900 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);
2901} 3343}
2902 3344
2903void 3345void
2904draw (SV *self) 3346draw (SV *self)
2905 CODE: 3347 CODE:
… …
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3354 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3355 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3356 double draw_x, draw_y;
2915 3357
2916 if (!SvROK (self)) 3358 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3359 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3360
2919 hv = (HV *)SvRV (self); 3361 hv = (HV *)SvRV (self);
2920 3362
2921 if (SvTYPE (hv) != SVt_PVHV) 3363 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3364 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3365
2924 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.;
2925 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.;
2926 3368
2927 if (!h || !w) 3369 if (!h || !w)

Diff Legend

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