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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines