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.294 by root, Sat Dec 19 05:06:56 2009 UTC

39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
49#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
50 66
51#ifndef _WIN32 67#ifndef _WIN32
52# include <sys/types.h> 68# include <sys/types.h>
53# include <sys/socket.h> 69# include <sys/socket.h>
54# include <netinet/in.h> 70# include <netinet/in.h>
55# include <netinet/tcp.h> 71# include <netinet/tcp.h>
56# include <inttypes.h> 72# include <inttypes.h>
57#endif 73#endif
58 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 85
61#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
62 88
63#define MAP_EXTEND_X 32 89#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 90#define MAP_EXTEND_Y 512
65 91
66#define MIN_FONT_HEIGHT 10 92#define MIN_FONT_HEIGHT 10
67 93
68#if 0 94/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 95#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 96
71# define PARACHUTE 0 97#define KMOD_LRAM 0x10000 // our extension
72#endif 98
99#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3
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));
659 CODE: 829 CODE:
660{ 830{
661 opengl_fontmap = pango_opengl_font_map_new (); 831 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 832 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); 833 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
834 /*pango_context_set_font_description (opengl_context, default_font);*/
835#if PANGO_VERSION_CHECK (1, 15, 2)
836 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
837 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
838#endif
664} 839}
665 840
666char *
667SDL_GetError () 841char *SDL_GetError ()
668 842
669int 843void SDL_braino ()
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 844
672void 845int SDL_Init (U32 flags)
846
847int SDL_InitSubSystem (U32 flags)
848
849void SDL_QuitSubSystem (U32 flags)
850
673SDL_Quit () 851void SDL_Quit ()
852
853int SDL_GL_SetAttribute (int attr, int value)
854
855int SDL_GL_GetAttribute (int attr)
856 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL))
858 XSRETURN_UNDEF;
859 OUTPUT:
860 RETVAL
674 861
675void 862void
676SDL_ListModes (int rgb, int alpha) 863SDL_ListModes (int rgb, int alpha)
677 PPCODE: 864 PPCODE:
678{ 865{
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 879 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 880
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 881 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); 882 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 883
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 884 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 885
702 if (m && m != (SDL_Rect **)-1) 886 if (m && m != (SDL_Rect **)-1)
703 while (*m) 887 while (*m)
704 { 888 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 889 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 890 {
707 AV *av = newAV (); 891 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 892 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 893 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 894 av_push (av, newSViv (rgb));
752SDL_GetKeyName (int sym) 936SDL_GetKeyName (int sym)
753 937
754int 938int
755SDL_GetAppState () 939SDL_GetAppState ()
756 940
941int
942SDL_GetModState ()
943
757void 944void
758poll_events () 945poll_events ()
759 PPCODE: 946 PPCODE:
760{ 947{
761 SDL_Event ev; 948 SDL_Event ev;
770 { 957 {
771 case SDL_KEYDOWN: 958 case SDL_KEYDOWN:
772 case SDL_KEYUP: 959 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 960 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 961 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 962 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 */ 963 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); 964 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 965 break;
779 966
780 case SDL_ACTIVEEVENT: 967 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 968 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
799 x = ev.motion.x; 986 x = ev.motion.x;
800 y = ev.motion.y; 987 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 988 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 989 }
803 990
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 991 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 992 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 993 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 994 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 995 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 996 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 997 }
811 break; 998 break;
812 999
813 case SDL_MOUSEBUTTONDOWN: 1000 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 1001 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 1003
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1004 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1005 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1006 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1007 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1012 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1013 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827 break; 1014 break;
828 } 1015 }
829 1016
830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831 } 1018 }
832} 1019}
833 1020
834int 1021int
835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
894 } 1081 }
895 } 1082 }
896#endif 1083#endif
897} 1084}
898 1085
899void 1086int
900add_font (char *file) 1087add_font (char *file)
901 CODE: 1088 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT:
1091 RETVAL
903 1092
904void 1093void
905load_image_inline (SV *image_) 1094load_image_inline (SV *image_)
906 ALIAS: 1095 ALIAS:
907 load_image_file = 1 1096 load_image_file = 1
993void 1182void
994error (char *message) 1183error (char *message)
995 CODE: 1184 CODE:
996 fprintf (stderr, "ERROR: %s\n", message); 1185 fprintf (stderr, "ERROR: %s\n", message);
997#ifdef _WIN32 1186#ifdef _WIN32
998 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1187 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
999#endif 1188#endif
1000 1189
1001void 1190void
1002fatal (char *message) 1191fatal (char *message)
1003 CODE: 1192 CODE:
1004 fprintf (stderr, "FATAL: %s\n", message); 1193 fprintf (stderr, "FATAL: %s\n", message);
1005#ifdef _WIN32 1194#ifdef _WIN32
1006 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1195 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
1007#endif 1196#endif
1008 _exit (1); 1197 _exit (1);
1009 1198
1010void 1199void
1011_exit (int retval = 0) 1200_exit (int retval = 0)
1023#if DEBUG 1212#if DEBUG
1024 VALGRIND_DO_LEAK_CHECK; 1213 VALGRIND_DO_LEAK_CHECK;
1025#endif 1214#endif
1026} 1215}
1027 1216
1028MODULE = CFPlus PACKAGE = CFPlus::Font 1217int
1218SvREFCNT (SV *sv)
1219 CODE:
1220 RETVAL = SvREFCNT (sv);
1221 OUTPUT:
1222 RETVAL
1223
1224MODULE = Deliantra::Client PACKAGE = DC::Font
1029 1225
1030PROTOTYPES: DISABLE 1226PROTOTYPES: DISABLE
1031 1227
1032CFPlus::Font 1228DC::Font
1033new_from_file (SV *class, char *path, int id = 0) 1229new_from_file (SV *class, char *path, int id = 0)
1034 CODE: 1230 CODE:
1035{ 1231{
1036 int count; 1232 int count;
1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1040} 1236}
1041 OUTPUT: 1237 OUTPUT:
1042 RETVAL 1238 RETVAL
1043 1239
1044void 1240void
1045DESTROY (CFPlus::Font self) 1241DESTROY (DC::Font self)
1046 CODE: 1242 CODE:
1047 pango_font_description_free (self); 1243 pango_font_description_free (self);
1048 1244
1049void 1245void
1050make_default (CFPlus::Font self) 1246make_default (DC::Font self)
1051 PROTOTYPE: $ 1247 PROTOTYPE: $
1052 CODE: 1248 CODE:
1053 default_font = self; 1249 default_font = self;
1054 1250
1055MODULE = CFPlus PACKAGE = CFPlus::Layout 1251MODULE = Deliantra::Client PACKAGE = DC::Layout
1056 1252
1057PROTOTYPES: DISABLE 1253PROTOTYPES: DISABLE
1058 1254
1059void 1255void
1060reset_glyph_cache () 1256glyph_cache_backup ()
1061 PROTOTYPE: 1257 PROTOTYPE:
1062 CODE: 1258 CODE:
1259 tc_backup ();
1260
1261void
1262glyph_cache_restore ()
1263 PROTOTYPE:
1264 CODE:
1063 tc_clear (); 1265 tc_restore ();
1064 1266
1065CFPlus::Layout 1267DC::Layout
1066new (SV *class) 1268new (SV *class)
1067 CODE: 1269 CODE:
1068 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
1069 1271
1070 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
1080 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
1081 OUTPUT: 1283 OUTPUT:
1082 RETVAL 1284 RETVAL
1083 1285
1084void 1286void
1085DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
1086 CODE: 1288 CODE:
1087 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1088 rc_free (self->rc); 1290 rc_free (self->rc);
1089 Safefree (self); 1291 Safefree (self);
1090 1292
1091void 1293void
1092set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
1093 CODE: 1295 CODE:
1094{ 1296{
1095 STRLEN textlen; 1297 STRLEN textlen;
1096 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
1097 1299
1098 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
1099} 1301}
1100 1302
1101void 1303void
1102set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
1103 CODE: 1305 CODE:
1104{ 1306{
1105 STRLEN textlen; 1307 STRLEN textlen;
1106 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
1107 1309
1108 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
1109} 1311}
1110 1312
1111void 1313void
1112set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1113 CODE: 1315 CODE:
1114{ 1316{
1115 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1116 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1117 const char *pos = text; 1319 const char *pos = text;
1152 if (attrs) 1354 if (attrs)
1153 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1154} 1356}
1155 1357
1156void 1358void
1157get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1158 PPCODE: 1360 PPCODE:
1159{ 1361{
1160 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1161 1363
1162 do 1364 do
1163 { 1365 {
1164 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1165 1367
1166 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1167 { 1369 {
1168 PangoRectangle extents; 1370 PangoRectangle extents;
1169 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
1177 1379
1178 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1179} 1381}
1180 1382
1181int 1383int
1182has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1183 CODE: 1385 CODE:
1184{ 1386{
1185 int lines = 1; 1387 int lines = 1;
1186 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1187 1389
1192} 1394}
1193 OUTPUT: 1395 OUTPUT:
1194 RETVAL 1396 RETVAL
1195 1397
1196SV * 1398SV *
1197get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1198 CODE: 1400 CODE:
1199 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1200 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1201 OUTPUT: 1403 OUTPUT:
1202 RETVAL 1404 RETVAL
1203 1405
1204void 1406void
1205set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1407set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1206 CODE: 1408 CODE:
1207 self->r = r; 1409 self->r = r;
1208 self->g = g; 1410 self->g = g;
1209 self->b = b; 1411 self->b = b;
1210 self->a = a; 1412 self->a = a;
1211 1413
1212void 1414void
1213set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1214 CODE: 1416 CODE:
1215 if (self->font != font) 1417 if (self->font != font)
1216 { 1418 {
1217 self->font = font; 1419 self->font = font;
1218 layout_update_font (self); 1420 layout_update_font (self);
1219 } 1421 }
1220 1422
1221void 1423void
1222set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1223 CODE: 1425 CODE:
1224 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1225 { 1427 {
1226 self->base_height = base_height; 1428 self->base_height = base_height;
1227 layout_update_font (self); 1429 layout_update_font (self);
1228 } 1430 }
1229 1431
1230void 1432void
1231set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1232 CODE: 1434 CODE:
1233 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1435 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1234 1436
1235void 1437void
1236set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1237 CODE: 1439 CODE:
1238 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1239 1441
1240void 1442void
1241set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1242 CODE: 1444 CODE:
1243 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1244 1446
1245void 1447void
1246set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1247 CODE: 1449 CODE:
1248 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1249 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1250 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1251 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1252 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1253 ); 1455 );
1254 1456
1255void 1457void
1256set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1257 CODE: 1459 CODE:
1258 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1259 1461
1260void 1462void
1261size (CFPlus::Layout self) 1463size (DC::Layout self)
1262 PPCODE: 1464 PPCODE:
1263{ 1465{
1264 int w, h; 1466 int w, h;
1265 1467
1266 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
1269 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1270 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1271} 1473}
1272 1474
1273int 1475int
1274descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1275 CODE: 1477 CODE:
1276{ 1478{
1277 PangoRectangle rect; 1479 PangoRectangle rect;
1278 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1279 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1280 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1281} 1483}
1282 OUTPUT: 1484 OUTPUT:
1283 RETVAL 1485 RETVAL
1284 1486
1285int 1487int
1286xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1287 CODE: 1489 CODE:
1288{ 1490{
1289 int index, trailing; 1491 int index, trailing;
1290 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1492 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1291 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1292} 1494}
1293 OUTPUT: 1495 OUTPUT:
1294 RETVAL 1496 RETVAL
1295 1497
1296void 1498void
1297cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1298 PPCODE: 1500 PPCODE:
1299{ 1501{
1300 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1301 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1302 1504
1303 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1304 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1305 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1306 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1307} 1509}
1308 1510
1309void 1511void
1310index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1311 PPCODE: 1513 PPCODE:
1312{ 1514{
1313 int line, x; 1515 int line, x;
1314 1516
1315 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1517 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1518#if !PANGO_VERSION_CHECK (1, 17, 3)
1316 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1317 1520 --line;
1521#endif
1318 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1319 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1320 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1321} 1525}
1322 1526
1323void 1527void
1324line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1325 PPCODE: 1529 PPCODE:
1326{ 1530{
1327 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1328 int index, trailing; 1532 int index, trailing;
1329 1533
1330 if (line < 0) 1534 if (line < 0)
1331 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1332 1536
1333 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1334 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1335 1539
1336 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1540 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1337 1541
1338 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
1344 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1345 } 1549 }
1346} 1550}
1347 1551
1348void 1552void
1349render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1350 CODE: 1554 CODE:
1351 rc_clear (self->rc); 1555 rc_clear (self->rc);
1352 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1353 self->pl, 1557 self->pl,
1354 self->rc, 1558 self->rc,
1359 // we assume that context_change actually clears/frees stuff 1563 // we assume that context_change actually clears/frees stuff
1360 // and does not do any recomputation... 1564 // and does not do any recomputation...
1361 pango_layout_context_changed (self->pl); 1565 pango_layout_context_changed (self->pl);
1362 1566
1363void 1567void
1364draw (CFPlus::Layout self) 1568draw (DC::Layout self)
1365 CODE: 1569 CODE:
1366{ 1570{
1367 glEnable (GL_TEXTURE_2D); 1571 glEnable (GL_TEXTURE_2D);
1368 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1572 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1369 glEnable (GL_BLEND); 1573 glEnable (GL_BLEND);
1377 glDisable (GL_ALPHA_TEST); 1581 glDisable (GL_ALPHA_TEST);
1378 glDisable (GL_BLEND); 1582 glDisable (GL_BLEND);
1379 glDisable (GL_TEXTURE_2D); 1583 glDisable (GL_TEXTURE_2D);
1380} 1584}
1381 1585
1382MODULE = CFPlus PACKAGE = CFPlus::Texture 1586MODULE = Deliantra::Client PACKAGE = DC::Texture
1383 1587
1384PROTOTYPES: ENABLE 1588PROTOTYPES: ENABLE
1385 1589
1386void 1590void
1387pad (SV *data_, int ow, int oh, int nw, int nh) 1591pad (SV *data_, int ow, int oh, int nw, int nh)
1455 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1457 } 1661 }
1458} 1662}
1459 1663
1664void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1666 PROTOTYPE: @
1667 CODE:
1668{
1669 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1);
1673
1674 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.);
1677
1678 if (blend > 0.f)
1679 {
1680 float S2, T2; /* 0. 0. for texture 2 */
1681 float w = w1 > w2 ? w1 : w2;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend };
1684
1685 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1688
1689 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1690 gl.ActiveTexture (GL_TEXTURE1);
1691 glEnable (GL_TEXTURE_2D);
1692 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694
1695 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699
1700 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1706
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1729 glEnd ();
1730
1731 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0);
1733 }
1734 else
1735 {
1736 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738
1739 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1744 glEnd ();
1745 }
1746
1747 glPopMatrix ();
1748
1749 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND);
1751}
1752
1460IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1753IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1461 CODE: 1754 CODE:
1462{ 1755{
1463 GLint width; 1756 GLint width;
1464 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1757 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1466 RETVAL = width > 0; 1759 RETVAL = width > 0;
1467} 1760}
1468 OUTPUT: 1761 OUTPUT:
1469 RETVAL 1762 RETVAL
1470 1763
1471MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1472 1765
1473PROTOTYPES: DISABLE 1766PROTOTYPES: DISABLE
1474 1767
1475CFPlus::Map 1768DC::Map
1476new (SV *class) 1769new (SV *class)
1477 CODE: 1770 CODE:
1478 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1479 RETVAL->x = 0; 1772 RETVAL->x = 0;
1480 RETVAL->y = 0; 1773 RETVAL->y = 0;
1488 RETVAL->row = 0; 1781 RETVAL->row = 0;
1489 OUTPUT: 1782 OUTPUT:
1490 RETVAL 1783 RETVAL
1491 1784
1492void 1785void
1493DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1494 CODE: 1787 CODE:
1495{ 1788{
1496 map_clear (self); 1789 map_clear (self);
1497 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1498 Safefree (self->tex); 1791 Safefree (self->tex);
1499 Safefree (self); 1792 Safefree (self);
1500} 1793}
1501 1794
1502void 1795void
1503resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1504 CODE: 1797 CODE:
1505 self->w = map_width; 1798 self->w = map_width;
1506 self->h = map_height; 1799 self->h = map_height;
1507 1800
1508void 1801void
1509clear (CFPlus::Map self) 1802clear (DC::Map self)
1510 CODE: 1803 CODE:
1511 map_clear (self); 1804 map_clear (self);
1512 1805
1513void 1806void
1514set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1515 CODE: 1808 CODE:
1516{ 1809{
1517 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1518 need_texid (self, tile); 1811 need_texid (self, tile);
1519} 1812}
1520 1813
1521void 1814void
1522set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1523 CODE: 1816 CODE:
1524{ 1817{
1525 tileid texid; 1818 tileid texid;
1526 maptex *tex; 1819 maptex *tex;
1527 1820
1540 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1541 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1542} 1835}
1543 1836
1544void 1837void
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) 1838set_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: 1839 CODE:
1547{ 1840{
1548 need_texid (self, texid); 1841 need_texid (self, texid);
1549 1842
1550 { 1843 {
1569 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1570 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1571 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1572} 1865}
1573 1866
1867void
1868expire_textures (DC::Map self, int texid, int count)
1869 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count)
1871 {
1872 maptex *tex = self->tex + texid;
1873
1874 if (tex->name)
1875 {
1876 if (tex->unused)
1877 {
1878 tex->name = 0;
1879 tex->unused = 0;
1880 XPUSHs (sv_2mortal (newSViv (texid)));
1881 }
1882 else
1883 tex->unused = 1;
1884 }
1885 }
1886
1574int 1887int
1575ox (CFPlus::Map self) 1888ox (DC::Map self)
1576 ALIAS: 1889 ALIAS:
1577 oy = 1 1890 oy = 1
1578 x = 2 1891 x = 2
1579 y = 3 1892 y = 3
1580 w = 4 1893 w = 4
1591 } 1904 }
1592 OUTPUT: 1905 OUTPUT:
1593 RETVAL 1906 RETVAL
1594 1907
1595void 1908void
1596scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1597 CODE: 1910 CODE:
1598{ 1911{
1599 if (dx > 0) 1912 if (dx > 0)
1600 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1601 else if (dx < 0) 1914 else if (dx < 0)
1617 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1618 } 1931 }
1619} 1932}
1620 1933
1621SV * 1934SV *
1622map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1623 CODE: 1936 CODE:
1624{ 1937{
1625 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1626 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1627 mapcell *cell; 1940 mapcell *cell;
1655 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1656 1969
1657 do 1970 do
1658 { 1971 {
1659 ext = *data++; 1972 ext = *data++;
1660 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1661 1974
1662 if (cmd < 4) 1975 if (cmd < 4)
1663 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1664 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1665 { 1978 {
1668 } 1981 }
1669 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1670 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1671 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1672 { 1985 {
1673 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1674 ; // decode player count 1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1675 1990
1676 data += *data + 1; 1991 data += *data + 1;
1677 } 1992 }
1678 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1679 cell->flags = *data++; 1994 cell->flags = *data++;
1696 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1697 2012
1698 if (cell->tile [z]) 2013 if (cell->tile [z])
1699 { 2014 {
1700 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1701 if (!tex->name) 2017 if (!tex->name)
1702 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1703 2019
1704 if (tex->smoothtile) 2020 if (tex->smoothtile)
1705 { 2021 {
1706 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1707 if (!smooth->name) 2024 if (!smooth->name)
1708 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1709 } 2026 }
1710 } 2027 }
1711 } 2028 }
1712 } 2029 }
1713 else 2030 else
1714 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1715 } 2032 }
1716} 2033}
1717 OUTPUT: 2034 OUTPUT:
1718 RETVAL 2035 RETVAL
1719 2036
1720SV * 2037SV *
1721mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2039 CODE:
1723{ 2040{
1724 int x1, x; 2041 int x1, x;
1725 int y1, y; 2042 int y1, y;
1726 int z; 2043 int z;
1771} 2088}
1772 OUTPUT: 2089 OUTPUT:
1773 RETVAL 2090 RETVAL
1774 2091
1775void 2092void
1776draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1777 CODE: 2094 CODE:
1778{ 2095{
1779 int x, y, z; 2096 int x, y, z;
1780 2097
1781 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1782 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2099 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) 2100 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1784 smooth_key skey; 2101 smooth_key skey;
1785 2102 int pl_x, pl_y;
2103 maptex pl_tex;
1786 rc_t *rc = rc_alloc (); 2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
1787 rc_key_t key; 2106 rc_key_t key;
1788 rc_array_t *arr; 2107 rc_array_t *arr, *arr_hidden;
1789 2108
2109 pl_tex.name = 0;
2110
1790 // thats current max. sorry. 2111 // that's current max. sorry.
1791 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1792 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1793 2114
1794 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1795 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1799 key.g = 255; 2120 key.g = 255;
1800 key.b = 255; 2121 key.b = 255;
1801 key.a = 255; 2122 key.a = 255;
1802 key.mode = GL_QUADS; 2123 key.mode = GL_QUADS;
1803 key.format = GL_T2F_V3F; 2124 key.format = GL_T2F_V3F;
1804 key.texname = -1;
1805 2125
1806 mx += self->x; 2126 mx += self->x;
1807 my += self->y; 2127 my += self->y;
1808 2128
1809 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
1830 2150
1831 glEnable (GL_BLEND); 2151 glEnable (GL_BLEND);
1832 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1833 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1834 2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1835 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1836 { 2159 {
1837 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1838 2162
1839 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1840 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1841 { 2165 {
1842 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
1852 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1853 int px, py; 2177 int px, py;
1854 2178
1855 if (key.texname != tex.name) 2179 if (key.texname != tex.name)
1856 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1857 if (!tex.name) 2183 if (!tex.name)
1858 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1859 2185
1860 key.texname = tex.name; 2186 key.texname = tex.name;
1861 arr = rc_array (rc, &key); 2187 arr = rc_array (rc, &key);
1862 } 2188 }
1863 2189
1864 px = (x + 1) * T - tex.w; 2190 px = (x + 1) * T - tex.w;
1865 py = (y + 1) * T - tex.h; 2191 py = (y + 1) * T - tex.h;
2192
2193 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 {
2195 pl_x = px;
2196 pl_y = py;
2197 pl_tex = tex;
2198 continue;
2199 }
1866 2200
1867 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1868 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2202 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); 2203 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); 2204 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 2205
1897 // update smooth hash 2206 // update smooth hash
1898 if (tex.smoothtile) 2207 if (tex.smoothtile)
1899 { 2208 {
1900 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
1929 // corners 2238 // corners
1930 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2239 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); 2240 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); 2241 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); 2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243 }
2244 }
2245
2246 if (expect_false (z == 2))
2247 {
2248 /* draw question marks on top of hidden spaces */
2249 if (!cell->darkness)
2250 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32;
2270 int py = y * T - T * 6 / 32;
2271
2272 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov);
2274
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279 }
1934 } 2280 }
1935 } 2281 }
1936 } 2282 }
1937 } 2283 }
1938 2284
1978 { 2324 {
1979 // this time avoiding texture state changes 2325 // this time avoiding texture state changes
1980 // save gobs of state changes. 2326 // save gobs of state changes.
1981 if (key.texname != tex.name) 2327 if (key.texname != tex.name)
1982 { 2328 {
2329 self->tex [skey->tile].unused = 0;
2330
1983 glEnd (); 2331 glEnd ();
1984 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1985 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1986 } 2334 }
1987 2335
2016 } 2364 }
2017 2365
2018 hv_clear (smooth); 2366 hv_clear (smooth);
2019 } 2367 }
2020 2368
2369 if (pl_tex.name)
2370 {
2371 maptex tex = pl_tex;
2372 int px = pl_x + sdx;
2373 int py = pl_y + sdy;
2374
2375 key.texname = tex.name;
2376 arr = rc_array (rc, &key);
2377
2378 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2379 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2380 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2381 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2382
2383 rc_draw (rc);
2384 }
2385
2386 rc_draw (rc_ov);
2387 rc_clear (rc_ov);
2388
2021 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2022 rc_free (rc); 2390 rc_free (rc);
2391 rc_free (rc_ov);
2023 2392
2024 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
2025 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
2026 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
2027 { 2396 {
2032 { 2401 {
2033 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
2034 2403
2035 int px = x * T; 2404 int px = x * T;
2036 int py = y * T; 2405 int py = y * T;
2406
2407 if (expect_false (cell->player == player))
2408 {
2409 px += sdx;
2410 py += sdy;
2411 }
2037 2412
2038 if (cell->stat_hp) 2413 if (cell->stat_hp)
2039 { 2414 {
2040 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
2041 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2052 } 2427 }
2053 } 2428 }
2054} 2429}
2055 2430
2056void 2431void
2057draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
2058 CODE: 2433 CODE:
2059{ 2434{
2060 static float color[16][3] = { 2435 static float color[16][3] = {
2061 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
2062 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
2081 }; 2456 };
2082 2457
2083 int x, y; 2458 int x, y;
2084 2459
2085 glEnable (GL_TEXTURE_2D); 2460 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia.
2466 */
2086 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2087 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2088 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2089 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2090 2471
2091 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
2098 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2099 2480
2100 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2101 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2102 2483
2103 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2104 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2105 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2106 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2107 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2108 } 2489 }
2112 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
2113 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
2114} 2495}
2115 2496
2116void 2497void
2117fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2498fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2118 PPCODE: 2499 PPCODE:
2119{ 2500{
2120 int x, y; 2501 int x, y;
2121 int sw1 = sw + 2; 2502 int sw1 = sw + 2;
2122 int sh1 = sh + 2; 2503 int sh1 = sh + 2;
2130 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2131 2512
2132 mx += self->x - 1; 2513 mx += self->x - 1;
2133 my += self->y - 1; 2514 my += self->y - 1;
2134 2515
2135 memset (darkness1, 255, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2136 2517
2137 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2138 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2139 { 2520 {
2140 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2525 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2146 2527
2147 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2148 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2149 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2150 } 2531 }
2151 } 2532 }
2152 2533
2153 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2154 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
2193 PUSHs (sv_2mortal (newSViv (sh3))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2194 PUSHs (darkness3_sv); 2575 PUSHs (darkness3_sv);
2195} 2576}
2196 2577
2197SV * 2578SV *
2198get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2579get_rect (DC::Map self, int x0, int y0, int w, int h)
2199 CODE: 2580 CODE:
2200{ 2581{
2201 int x, y, x1, y1; 2582 int x, y, x1, y1;
2202 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2203 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2260 else 2641 else
2261 *data++ = 0; 2642 *data++ = 0;
2262 } 2643 }
2263 } 2644 }
2264 2645
2646 /* if size is w*h + 5 then no data has been found */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 {
2265 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2266 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2267 RETVAL = data_sv; 2653 RETVAL = data_sv;
2268} 2654}
2269 OUTPUT: 2655 OUTPUT:
2270 RETVAL 2656 RETVAL
2271 2657
2272void 2658void
2273set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2274 PPCODE: 2660 PPCODE:
2275{ 2661{
2276 int x, y, z; 2662 int x, y, z;
2277 int w, h; 2663 int w, h;
2278 int x1, y1; 2664 int x1, y1;
2665 STRLEN len;
2666 uint8_t *data, *end;
2667
2668 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv);
2671 end = data + len + 8;
2672
2673 if (len < 5)
2674 XSRETURN_EMPTY;
2279 2675
2280 if (*data++ != 0) 2676 if (*data++ != 0)
2281 XSRETURN_EMPTY; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2282 2678
2283 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2298 { 2694 {
2299 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2300 2696
2301 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2302 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2303 uint8_t flags = *data++; 2704 flags = *data++;
2304 2705
2305 if (flags) 2706 if (flags)
2306 { 2707 {
2307 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2308 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
2311 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2312 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2313 2714
2314 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2315 { 2716 {
2316 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2317 2719
2318 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2319 { 2721 {
2320 tileid t = tile [z]; 2722 tileid t = tile [z];
2321 2723
2322 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2323 { 2725 {
2324 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2325 need_texid (self, t); 2727 need_texid (self, t);
2326 } 2728 }
2327 2729
2328 cell->tile [z] = t; 2730 cell->tile [z] = t;
2329 } 2731 }
2331 } 2733 }
2332 } 2734 }
2333 } 2735 }
2334} 2736}
2335 2737
2336MODULE = CFPlus PACKAGE = CFPlus::RW 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2337 2739
2338CFPlus::RW 2740DC::RW
2339new (SV *class, SV *data_sv) 2741new (SV *class, SV *data_sv)
2340 CODE: 2742 CODE:
2341{ 2743{
2342 STRLEN datalen; 2744 STRLEN datalen;
2343 char *data = SvPVbyte (data_sv, datalen); 2745 char *data = SvPVbyte (data_sv, datalen);
2345 RETVAL = SDL_RWFromConstMem (data, datalen); 2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2346} 2748}
2347 OUTPUT: 2749 OUTPUT:
2348 RETVAL 2750 RETVAL
2349 2751
2350CFPlus::RW 2752DC::RW
2351new_from_file (SV *class, const char *path, const char *mode = "rb") 2753new_from_file (SV *class, const char *path, const char *mode = "rb")
2352 CODE: 2754 CODE:
2353 RETVAL = SDL_RWFromFile (path, mode); 2755 RETVAL = SDL_RWFromFile (path, mode);
2354 OUTPUT: 2756 OUTPUT:
2355 RETVAL 2757 RETVAL
2356 2758
2357# fails on win32: 2759# fails on win32:
2358# CFPlus.xs(2268) : error C2059: syntax error : '(' 2760# dc.xs(2268) : error C2059: syntax error : '('
2359#void 2761#void
2360#close (CFPlus::RW self) 2762#close (DC::RW self)
2361# CODE: 2763# CODE:
2362# (self->(close)) (self); 2764# (self->(close)) (self);
2363 2765
2364MODULE = CFPlus PACKAGE = CFPlus::Channel 2766MODULE = Deliantra::Client PACKAGE = DC::Channel
2365 2767
2366PROTOTYPES: DISABLE 2768PROTOTYPES: DISABLE
2367 2769
2368CFPlus::Channel 2770DC::Channel
2369find () 2771find ()
2370 CODE: 2772 CODE:
2371{ 2773{
2372 RETVAL = Mix_GroupAvailable (-1); 2774 RETVAL = Mix_GroupAvailable (-1);
2373 2775
2386} 2788}
2387 OUTPUT: 2789 OUTPUT:
2388 RETVAL 2790 RETVAL
2389 2791
2390void 2792void
2391halt (CFPlus::Channel self) 2793halt (DC::Channel self)
2392 CODE: 2794 CODE:
2393 Mix_HaltChannel (self); 2795 Mix_HaltChannel (self);
2394 2796
2395void 2797void
2396expire (CFPlus::Channel self, int ticks = -1) 2798expire (DC::Channel self, int ticks = -1)
2397 CODE: 2799 CODE:
2398 Mix_ExpireChannel (self, ticks); 2800 Mix_ExpireChannel (self, ticks);
2399 2801
2400void 2802void
2401fade_out (CFPlus::Channel self, int ticks = -1) 2803fade_out (DC::Channel self, int ticks = -1)
2402 CODE: 2804 CODE:
2403 Mix_FadeOutChannel (self, ticks); 2805 Mix_FadeOutChannel (self, ticks);
2404 2806
2405int 2807int
2406volume (CFPlus::Channel self, int volume) 2808volume (DC::Channel self, int volume)
2407 CODE: 2809 CODE:
2408 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2810 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2409 OUTPUT: 2811 OUTPUT:
2410 RETVAL 2812 RETVAL
2411 2813
2412void 2814void
2413unregister_all_effects (CFPlus::Channel self) 2815unregister_all_effects (DC::Channel self)
2414 CODE: 2816 CODE:
2415 Mix_UnregisterAllEffects (self); 2817 Mix_UnregisterAllEffects (self);
2416 2818
2417void 2819void
2418set_panning (CFPlus::Channel self, int left, int right) 2820set_panning (DC::Channel self, int left, int right)
2419 CODE: 2821 CODE:
2420 left = CLAMP (left , 0, 255); 2822 left = CLAMP (left , 0, 255);
2421 right = CLAMP (right, 0, 255); 2823 right = CLAMP (right, 0, 255);
2422 Mix_SetPanning (self, left, right); 2824 Mix_SetPanning (self, left, right);
2423 2825
2424void 2826void
2425set_distance (CFPlus::Channel self, int distance) 2827set_distance (DC::Channel self, int distance)
2426 CODE: 2828 CODE:
2427 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2829 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2428 2830
2429void 2831void
2430set_position (CFPlus::Channel self, int angle, int distance) 2832set_position (DC::Channel self, int angle, int distance)
2431 CODE: 2833 CODE:
2432 2834
2433void 2835void
2434set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2435 CODE: 2837 CODE:
2436{ 2838{
2437 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2839 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); 2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2439 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2440} 2842}
2441 2843
2442void 2844void
2443set_reverse_stereo (CFPlus::Channel self, int flip) 2845set_reverse_stereo (DC::Channel self, int flip)
2444 CODE: 2846 CODE:
2445 Mix_SetReverseStereo (self, flip); 2847 Mix_SetReverseStereo (self, flip);
2446 2848
2447MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2448 2850
2449PROTOTYPES: DISABLE 2851PROTOTYPES: DISABLE
2450 2852
2451CFPlus::MixChunk 2853DC::MixChunk
2452new (SV *class, CFPlus::RW rwops) 2854new (SV *class, DC::RW rwops)
2453 CODE: 2855 CODE:
2454 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2856 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2455 OUTPUT: 2857 OUTPUT:
2456 RETVAL 2858 RETVAL
2457 2859
2458void 2860void
2459DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2460 CODE: 2862 CODE:
2461 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2462 2864
2463int 2865int
2464volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2465 CODE: 2867 CODE:
2466 if (items > 1) 2868 if (items > 1)
2467 volume = CLAMP (volume, 0, 128); 2869 volume = CLAMP (volume, 0, 128);
2468 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2469 OUTPUT: 2871 OUTPUT:
2470 RETVAL 2872 RETVAL
2471 2873
2472CFPlus::Channel 2874DC::Channel
2473play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2875play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2474 CODE: 2876 CODE:
2475{ 2877{
2476 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2878 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2477 2879
2478 if (RETVAL < 0) 2880 if (RETVAL < 0)
2485 } 2887 }
2486} 2888}
2487 OUTPUT: 2889 OUTPUT:
2488 RETVAL 2890 RETVAL
2489 2891
2490MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2491 2893
2492int 2894int
2493volume (int volume = -1) 2895volume (int volume = -1)
2494 PROTOTYPE: ;$ 2896 PROTOTYPE: ;$
2495 CODE: 2897 CODE:
2507void 2909void
2508halt () 2910halt ()
2509 CODE: 2911 CODE:
2510 Mix_HaltMusic (); 2912 Mix_HaltMusic ();
2511 2913
2512CFPlus::MixMusic 2914DC::MixMusic
2513new (SV *class, CFPlus::RW rwops) 2915new (SV *class, DC::RW rwops)
2514 CODE: 2916 CODE:
2515 RETVAL = Mix_LoadMUS_RW (rwops); 2917 RETVAL = Mix_LoadMUS_RW (rwops);
2516 OUTPUT: 2918 OUTPUT:
2517 RETVAL 2919 RETVAL
2518 2920
2519void 2921void
2520DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2521 CODE: 2923 CODE:
2522 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2523 2925
2524int 2926int
2525play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2526 CODE: 2928 CODE:
2527 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2528 OUTPUT: 2930 OUTPUT:
2529 RETVAL 2931 RETVAL
2530 2932
2531void 2933void
2532fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2533 CODE: 2935 CODE:
2534 Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2535 2937
2536MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2537 2939
2538PROTOTYPES: ENABLE 2940PROTOTYPES: ENABLE
2539 2941
2540BOOT: 2942BOOT:
2541{ 2943{
2542 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2543 static const struct { 2945 static const struct {
2544 const char *name; 2946 const char *name;
2545 IV iv; 2947 IV iv;
2546 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2547# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2548 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2549 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2550 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2551 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2552 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2553 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2554 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2555 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
2567 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2568 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2569 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2570 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2571 const_iv (GL_ONE_MINUS_DST_ALPHA), 2974 const_iv (GL_ONE_MINUS_DST_ALPHA),
2975 const_iv (GL_SRC_COLOR),
2976 const_iv (GL_DST_COLOR),
2977 const_iv (GL_ONE_MINUS_SRC_COLOR),
2978 const_iv (GL_ONE_MINUS_DST_COLOR),
2572 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2573 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2574 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2575 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2576 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
2644 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2645 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2646 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2647 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2648 const_iv (GL_T2F_N3F_V3F), 3055 const_iv (GL_T2F_N3F_V3F),
3056 const_iv (GL_FUNC_ADD),
3057 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2649# undef const_iv 3059# undef const_iv
2650 }; 3060 };
2651 3061
2652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2660disable_GL_EXT_blend_func_separate () 3070disable_GL_EXT_blend_func_separate ()
2661 CODE: 3071 CODE:
2662 gl.BlendFuncSeparate = 0; 3072 gl.BlendFuncSeparate = 0;
2663 gl.BlendFuncSeparateEXT = 0; 3073 gl.BlendFuncSeparateEXT = 0;
2664 3074
3075void
3076apple_nvidia_bug (int enable)
3077
2665char * 3078char *
2666gl_vendor () 3079gl_vendor ()
2667 CODE: 3080 CODE:
2668 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2669 OUTPUT: 3082 OUTPUT:
2718 3131
2719void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2720 CODE: 3133 CODE:
2721 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2722 3135
3136# void glBlendEquation (int se)
3137
2723void glDepthMask (int flag) 3138void glDepthMask (int flag)
2724 3139
2725void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2726 3141
2727void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
2761void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2762 CODE: 3177 CODE:
2763 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2764 3179
2765void glColor (float r, float g, float b, float a = 1.0) 3180void glColor (float r, float g, float b, float a = 1.0)
3181 PROTOTYPE: @
2766 ALIAS: 3182 ALIAS:
2767 glColor_premultiply = 1 3183 glColor_premultiply = 1
2768 CODE: 3184 CODE:
2769 if (ix) 3185 if (ix)
2770 { 3186 {
2840void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3256void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2841 CODE: 3257 CODE:
2842 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2843 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2844 3260
2845void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3261void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2846 3262
2847void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3263void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2848 3264
2849void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2850 3266
2876 3292
2877void glEndList () 3293void glEndList ()
2878 3294
2879void glCallList (int list) 3295void glCallList (int list)
2880 3296
2881MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2882 3298
2883PROTOTYPES: DISABLE 3299PROTOTYPES: DISABLE
2884 3300
2885void 3301void
2886find_widget (SV *self, NV x, NV y) 3302find_widget (SV *self, NV x, NV y)
2890 XPUSHs (self); 3306 XPUSHs (self);
2891} 3307}
2892 3308
2893BOOT: 3309BOOT:
2894{ 3310{
2895 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3311 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2896 3312
2897 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3313 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); 3314 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); 3315 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); 3316 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2901} 3317}
2902 3318
2903void 3319void
2904draw (SV *self) 3320draw (SV *self)
2905 CODE: 3321 CODE:
2912 SV *draw_w_sv = GvSV (draw_w_gv); 3328 SV *draw_w_sv = GvSV (draw_w_gv);
2913 SV *draw_h_sv = GvSV (draw_h_gv); 3329 SV *draw_h_sv = GvSV (draw_h_gv);
2914 double draw_x, draw_y; 3330 double draw_x, draw_y;
2915 3331
2916 if (!SvROK (self)) 3332 if (!SvROK (self))
2917 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3333 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2918 3334
2919 hv = (HV *)SvRV (self); 3335 hv = (HV *)SvRV (self);
2920 3336
2921 if (SvTYPE (hv) != SVt_PVHV) 3337 if (SvTYPE (hv) != SVt_PVHV)
2922 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2923 3339
2924 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3340 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.; 3341 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2926 3342
2927 if (!h || !w) 3343 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines