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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines