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.239 by root, Tue Dec 25 18:58:32 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
1060glyph_cache_backup () 1256glyph_cache_backup ()
1066glyph_cache_restore () 1262glyph_cache_restore ()
1067 PROTOTYPE: 1263 PROTOTYPE:
1068 CODE: 1264 CODE:
1069 tc_restore (); 1265 tc_restore ();
1070 1266
1071CFPlus::Layout 1267DC::Layout
1072new (SV *class) 1268new (SV *class)
1073 CODE: 1269 CODE:
1074 New (0, RETVAL, 1, struct cf_layout); 1270 New (0, RETVAL, 1, struct cf_layout);
1075 1271
1076 RETVAL->pl = pango_layout_new (opengl_context); 1272 RETVAL->pl = pango_layout_new (opengl_context);
1086 layout_update_font (RETVAL); 1282 layout_update_font (RETVAL);
1087 OUTPUT: 1283 OUTPUT:
1088 RETVAL 1284 RETVAL
1089 1285
1090void 1286void
1091DESTROY (CFPlus::Layout self) 1287DESTROY (DC::Layout self)
1092 CODE: 1288 CODE:
1093 g_object_unref (self->pl); 1289 g_object_unref (self->pl);
1094 rc_free (self->rc); 1290 rc_free (self->rc);
1095 Safefree (self); 1291 Safefree (self);
1096 1292
1097void 1293void
1098set_text (CFPlus::Layout self, SV *text_) 1294set_text (DC::Layout self, SV *text_)
1099 CODE: 1295 CODE:
1100{ 1296{
1101 STRLEN textlen; 1297 STRLEN textlen;
1102 char *text = SvPVutf8 (text_, textlen); 1298 char *text = SvPVutf8 (text_, textlen);
1103 1299
1104 pango_layout_set_text (self->pl, text, textlen); 1300 pango_layout_set_text (self->pl, text, textlen);
1105} 1301}
1106 1302
1107void 1303void
1108set_markup (CFPlus::Layout self, SV *text_) 1304set_markup (DC::Layout self, SV *text_)
1109 CODE: 1305 CODE:
1110{ 1306{
1111 STRLEN textlen; 1307 STRLEN textlen;
1112 char *text = SvPVutf8 (text_, textlen); 1308 char *text = SvPVutf8 (text_, textlen);
1113 1309
1114 pango_layout_set_markup (self->pl, text, textlen); 1310 pango_layout_set_markup (self->pl, text, textlen);
1115} 1311}
1116 1312
1117void 1313void
1118set_shapes (CFPlus::Layout self, ...) 1314set_shapes (DC::Layout self, ...)
1119 CODE: 1315 CODE:
1120{ 1316{
1121 PangoAttrList *attrs = 0; 1317 PangoAttrList *attrs = 0;
1122 const char *text = pango_layout_get_text (self->pl); 1318 const char *text = pango_layout_get_text (self->pl);
1123 const char *pos = text; 1319 const char *pos = text;
1158 if (attrs) 1354 if (attrs)
1159 pango_layout_set_attributes (self->pl, attrs); 1355 pango_layout_set_attributes (self->pl, attrs);
1160} 1356}
1161 1357
1162void 1358void
1163get_shapes (CFPlus::Layout self) 1359get_shapes (DC::Layout self)
1164 PPCODE: 1360 PPCODE:
1165{ 1361{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1362 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1363
1168 do 1364 do
1169 { 1365 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1366 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1367
1172 if (run && shape_attr_p (run)) 1368 if (run && shape_attr_p (run))
1173 { 1369 {
1174 PangoRectangle extents; 1370 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1371 pango_layout_iter_get_run_extents (iter, 0, &extents);
1183 1379
1184 pango_layout_iter_free (iter); 1380 pango_layout_iter_free (iter);
1185} 1381}
1186 1382
1187int 1383int
1188has_wrapped (CFPlus::Layout self) 1384has_wrapped (DC::Layout self)
1189 CODE: 1385 CODE:
1190{ 1386{
1191 int lines = 1; 1387 int lines = 1;
1192 const char *text = pango_layout_get_text (self->pl); 1388 const char *text = pango_layout_get_text (self->pl);
1193 1389
1198} 1394}
1199 OUTPUT: 1395 OUTPUT:
1200 RETVAL 1396 RETVAL
1201 1397
1202SV * 1398SV *
1203get_text (CFPlus::Layout self) 1399get_text (DC::Layout self)
1204 CODE: 1400 CODE:
1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1401 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206 sv_utf8_decode (RETVAL); 1402 sv_utf8_decode (RETVAL);
1207 OUTPUT: 1403 OUTPUT:
1208 RETVAL 1404 RETVAL
1209 1405
1210void 1406void
1211set_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.)
1212 CODE: 1408 CODE:
1213 self->r = r; 1409 self->r = r;
1214 self->g = g; 1410 self->g = g;
1215 self->b = b; 1411 self->b = b;
1216 self->a = a; 1412 self->a = a;
1217 1413
1218void 1414void
1219set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1415set_font (DC::Layout self, DC::Font font = 0)
1220 CODE: 1416 CODE:
1221 if (self->font != font) 1417 if (self->font != font)
1222 { 1418 {
1223 self->font = font; 1419 self->font = font;
1224 layout_update_font (self); 1420 layout_update_font (self);
1225 } 1421 }
1226 1422
1227void 1423void
1228set_height (CFPlus::Layout self, int base_height) 1424set_height (DC::Layout self, int base_height)
1229 CODE: 1425 CODE:
1230 if (self->base_height != base_height) 1426 if (self->base_height != base_height)
1231 { 1427 {
1232 self->base_height = base_height; 1428 self->base_height = base_height;
1233 layout_update_font (self); 1429 layout_update_font (self);
1234 } 1430 }
1235 1431
1236void 1432void
1237set_width (CFPlus::Layout self, int max_width = -1) 1433set_width (DC::Layout self, int max_width = -1)
1238 CODE: 1434 CODE:
1239 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);
1240 1436
1241void 1437void
1242set_indent (CFPlus::Layout self, int indent) 1438set_indent (DC::Layout self, int indent)
1243 CODE: 1439 CODE:
1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1440 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245 1441
1246void 1442void
1247set_spacing (CFPlus::Layout self, int spacing) 1443set_spacing (DC::Layout self, int spacing)
1248 CODE: 1444 CODE:
1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1445 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250 1446
1251void 1447void
1252set_ellipsise (CFPlus::Layout self, int ellipsise) 1448set_ellipsise (DC::Layout self, int ellipsise)
1253 CODE: 1449 CODE:
1254 pango_layout_set_ellipsize (self->pl, 1450 pango_layout_set_ellipsize (self->pl,
1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1451 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1452 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1453 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258 : PANGO_ELLIPSIZE_NONE 1454 : PANGO_ELLIPSIZE_NONE
1259 ); 1455 );
1260 1456
1261void 1457void
1262set_single_paragraph_mode (CFPlus::Layout self, int spm) 1458set_single_paragraph_mode (DC::Layout self, int spm)
1263 CODE: 1459 CODE:
1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1460 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265 1461
1266void 1462void
1267size (CFPlus::Layout self) 1463size (DC::Layout self)
1268 PPCODE: 1464 PPCODE:
1269{ 1465{
1270 int w, h; 1466 int w, h;
1271 1467
1272 layout_get_pixel_size (self, &w, &h); 1468 layout_get_pixel_size (self, &w, &h);
1275 PUSHs (sv_2mortal (newSViv (w))); 1471 PUSHs (sv_2mortal (newSViv (w)));
1276 PUSHs (sv_2mortal (newSViv (h))); 1472 PUSHs (sv_2mortal (newSViv (h)));
1277} 1473}
1278 1474
1279int 1475int
1280descent (CFPlus::Layout self) 1476descent (DC::Layout self)
1281 CODE: 1477 CODE:
1282{ 1478{
1283 PangoRectangle rect; 1479 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1480 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1481 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1482 RETVAL = PANGO_DESCENT (rect);
1287} 1483}
1288 OUTPUT: 1484 OUTPUT:
1289 RETVAL 1485 RETVAL
1290 1486
1291int 1487int
1292xy_to_index (CFPlus::Layout self, int x, int y) 1488xy_to_index (DC::Layout self, int x, int y)
1293 CODE: 1489 CODE:
1294{ 1490{
1295 int index, trailing; 1491 int index, trailing;
1296 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);
1297 RETVAL = index + trailing; 1493 RETVAL = index + trailing;
1298} 1494}
1299 OUTPUT: 1495 OUTPUT:
1300 RETVAL 1496 RETVAL
1301 1497
1302void 1498void
1303cursor_pos (CFPlus::Layout self, int index) 1499cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1500 PPCODE:
1305{ 1501{
1306 PangoRectangle strong_pos; 1502 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1503 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1504
1309 EXTEND (SP, 3); 1505 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1508 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1509}
1314 1510
1315void 1511void
1316index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1512index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1513 PPCODE:
1318{ 1514{
1319 int line, x; 1515 int line, x;
1320 1516
1321 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)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1519 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1520 --line;
1521#endif
1324 EXTEND (SP, 2); 1522 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1523 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1524 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1525}
1328 1526
1329void 1527void
1330line_x_to_index (CFPlus::Layout self, int line, int x) 1528line_x_to_index (DC::Layout self, int line, int x)
1331 PPCODE: 1529 PPCODE:
1332{ 1530{
1333 PangoLayoutLine *lp; 1531 PangoLayoutLine *lp;
1334 int index, trailing; 1532 int index, trailing;
1335 1533
1336 if (line < 0) 1534 if (line < 0)
1337 XSRETURN_EMPTY; 1535 XSRETURN_EMPTY;
1338 1536
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1537 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1538 XSRETURN_EMPTY; /* do better */
1341 1539
1342 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);
1343 1541
1344 EXTEND (SP, 2); 1542 EXTEND (SP, 2);
1350 PUSHs (sv_2mortal (newSViv (trailing))); 1548 PUSHs (sv_2mortal (newSViv (trailing)));
1351 } 1549 }
1352} 1550}
1353 1551
1354void 1552void
1355render (CFPlus::Layout self, float x, float y, int flags = 0) 1553render (DC::Layout self, float x, float y, int flags = 0)
1356 CODE: 1554 CODE:
1357 rc_clear (self->rc); 1555 rc_clear (self->rc);
1358 pango_opengl_render_layout_subpixel ( 1556 pango_opengl_render_layout_subpixel (
1359 self->pl, 1557 self->pl,
1360 self->rc, 1558 self->rc,
1365 // we assume that context_change actually clears/frees stuff 1563 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation... 1564 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl); 1565 pango_layout_context_changed (self->pl);
1368 1566
1369void 1567void
1370draw (CFPlus::Layout self) 1568draw (DC::Layout self)
1371 CODE: 1569 CODE:
1372{ 1570{
1373 glEnable (GL_TEXTURE_2D); 1571 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1572 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND); 1573 glEnable (GL_BLEND);
1383 glDisable (GL_ALPHA_TEST); 1581 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND); 1582 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D); 1583 glDisable (GL_TEXTURE_2D);
1386} 1584}
1387 1585
1388MODULE = CFPlus PACKAGE = CFPlus::Texture 1586MODULE = Deliantra::Client PACKAGE = DC::Texture
1389 1587
1390PROTOTYPES: ENABLE 1588PROTOTYPES: ENABLE
1391 1589
1392void 1590void
1393pad (SV *data_, int ow, int oh, int nw, int nh) 1591pad (SV *data_, int ow, int oh, int nw, int nh)
1461 glDisable (GL_ALPHA_TEST); 1659 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1660 glDisable (GL_BLEND);
1463 } 1661 }
1464} 1662}
1465 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
1466IV 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)
1467 CODE: 1754 CODE:
1468{ 1755{
1469 GLint width; 1756 GLint width;
1470 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);
1472 RETVAL = width > 0; 1759 RETVAL = width > 0;
1473} 1760}
1474 OUTPUT: 1761 OUTPUT:
1475 RETVAL 1762 RETVAL
1476 1763
1477MODULE = CFPlus PACKAGE = CFPlus::Map 1764MODULE = Deliantra::Client PACKAGE = DC::Map
1478 1765
1479PROTOTYPES: DISABLE 1766PROTOTYPES: DISABLE
1480 1767
1481CFPlus::Map 1768DC::Map
1482new (SV *class) 1769new (SV *class)
1483 CODE: 1770 CODE:
1484 New (0, RETVAL, 1, struct map); 1771 New (0, RETVAL, 1, struct map);
1485 RETVAL->x = 0; 1772 RETVAL->x = 0;
1486 RETVAL->y = 0; 1773 RETVAL->y = 0;
1494 RETVAL->row = 0; 1781 RETVAL->row = 0;
1495 OUTPUT: 1782 OUTPUT:
1496 RETVAL 1783 RETVAL
1497 1784
1498void 1785void
1499DESTROY (CFPlus::Map self) 1786DESTROY (DC::Map self)
1500 CODE: 1787 CODE:
1501{ 1788{
1502 map_clear (self); 1789 map_clear (self);
1503 Safefree (self->face2tile); 1790 Safefree (self->face2tile);
1504 Safefree (self->tex); 1791 Safefree (self->tex);
1505 Safefree (self); 1792 Safefree (self);
1506} 1793}
1507 1794
1508void 1795void
1509resize (CFPlus::Map self, int map_width, int map_height) 1796resize (DC::Map self, int map_width, int map_height)
1510 CODE: 1797 CODE:
1511 self->w = map_width; 1798 self->w = map_width;
1512 self->h = map_height; 1799 self->h = map_height;
1513 1800
1514void 1801void
1515clear (CFPlus::Map self) 1802clear (DC::Map self)
1516 CODE: 1803 CODE:
1517 map_clear (self); 1804 map_clear (self);
1518 1805
1519void 1806void
1520set_tileid (CFPlus::Map self, int face, int tile) 1807set_tileid (DC::Map self, int face, int tile)
1521 CODE: 1808 CODE:
1522{ 1809{
1523 need_facenum (self, face); self->face2tile [face] = tile; 1810 need_facenum (self, face); self->face2tile [face] = tile;
1524 need_texid (self, tile); 1811 need_texid (self, tile);
1525} 1812}
1526 1813
1527void 1814void
1528set_smooth (CFPlus::Map self, int face, int smooth, int level) 1815set_smooth (DC::Map self, int face, int smooth, int level)
1529 CODE: 1816 CODE:
1530{ 1817{
1531 tileid texid; 1818 tileid texid;
1532 maptex *tex; 1819 maptex *tex;
1533 1820
1546 tex->smoothtile = self->face2tile [smooth]; 1833 tex->smoothtile = self->face2tile [smooth];
1547 tex->smoothlevel = level; 1834 tex->smoothlevel = level;
1548} 1835}
1549 1836
1550void 1837void
1551set_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)
1552 CODE: 1839 CODE:
1553{ 1840{
1554 need_texid (self, texid); 1841 need_texid (self, texid);
1555 1842
1556 { 1843 {
1575 // use uglier nearest interpolation because linear suffers 1862 // use uglier nearest interpolation because linear suffers
1576 // from transparent color bleeding and ugly wrapping effects. 1863 // from transparent color bleeding and ugly wrapping effects.
1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1864 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578} 1865}
1579 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
1580int 1887int
1581ox (CFPlus::Map self) 1888ox (DC::Map self)
1582 ALIAS: 1889 ALIAS:
1583 oy = 1 1890 oy = 1
1584 x = 2 1891 x = 2
1585 y = 3 1892 y = 3
1586 w = 4 1893 w = 4
1597 } 1904 }
1598 OUTPUT: 1905 OUTPUT:
1599 RETVAL 1906 RETVAL
1600 1907
1601void 1908void
1602scroll (CFPlus::Map self, int dx, int dy) 1909scroll (DC::Map self, int dx, int dy)
1603 CODE: 1910 CODE:
1604{ 1911{
1605 if (dx > 0) 1912 if (dx > 0)
1606 map_blank (self, self->x, self->y, dx, self->h); 1913 map_blank (self, self->x, self->y, dx, self->h);
1607 else if (dx < 0) 1914 else if (dx < 0)
1623 self->y += MAP_EXTEND_Y; 1930 self->y += MAP_EXTEND_Y;
1624 } 1931 }
1625} 1932}
1626 1933
1627SV * 1934SV *
1628map1a_update (CFPlus::Map self, SV *data_, int extmap) 1935map1a_update (DC::Map self, SV *data_, int extmap)
1629 CODE: 1936 CODE:
1630{ 1937{
1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632 uint8_t *data_end = (uint8_t *)SvEND (data_); 1939 uint8_t *data_end = (uint8_t *)SvEND (data_);
1633 mapcell *cell; 1940 mapcell *cell;
1661 uint8_t ext, cmd; 1968 uint8_t ext, cmd;
1662 1969
1663 do 1970 do
1664 { 1971 {
1665 ext = *data++; 1972 ext = *data++;
1666 cmd = ext & 0x3f; 1973 cmd = ext & 0x7f;
1667 1974
1668 if (cmd < 4) 1975 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1976 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1977 else if (cmd == 5) // health
1671 { 1978 {
1674 } 1981 }
1675 else if (cmd == 6) // monster width 1982 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1983 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1984 else if (cmd == 0x47)
1678 { 1985 {
1679 if (*data == 4) 1986 if (*data == 1) cell->player = data [1];
1680 ; // 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);
1681 1990
1682 data += *data + 1; 1991 data += *data + 1;
1683 } 1992 }
1684 else if (cmd == 8) // cell flags 1993 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1994 cell->flags = *data++;
1702 cell->tile [z] = self->face2tile [face]; 2011 cell->tile [z] = self->face2tile [face];
1703 2012
1704 if (cell->tile [z]) 2013 if (cell->tile [z])
1705 { 2014 {
1706 maptex *tex = self->tex + cell->tile [z]; 2015 maptex *tex = self->tex + cell->tile [z];
2016 tex->unused = 0;
1707 if (!tex->name) 2017 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z])); 2018 av_push (missing, newSViv (cell->tile [z]));
1709 2019
1710 if (tex->smoothtile) 2020 if (tex->smoothtile)
1711 { 2021 {
1712 maptex *smooth = self->tex + tex->smoothtile; 2022 maptex *smooth = self->tex + tex->smoothtile;
2023 smooth->unused = 0;
1713 if (!smooth->name) 2024 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile)); 2025 av_push (missing, newSViv (tex->smoothtile));
1715 } 2026 }
1716 } 2027 }
1717 } 2028 }
1718 } 2029 }
1719 else 2030 else
1720 cell->darkness = 0; 2031 CELL_CLEAR (cell);
1721 } 2032 }
1722} 2033}
1723 OUTPUT: 2034 OUTPUT:
1724 RETVAL 2035 RETVAL
1725 2036
1726SV * 2037SV *
1727mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2038mapmap (DC::Map self, int x0, int y0, int w, int h)
1728 CODE: 2039 CODE:
1729{ 2040{
1730 int x1, x; 2041 int x1, x;
1731 int y1, y; 2042 int y1, y;
1732 int z; 2043 int z;
1777} 2088}
1778 OUTPUT: 2089 OUTPUT:
1779 RETVAL 2090 RETVAL
1780 2091
1781void 2092void
1782draw (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)
1783 CODE: 2094 CODE:
1784{ 2095{
1785 int x, y, z; 2096 int x, y, z;
1786 2097
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 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
1789 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)
1790 smooth_key skey; 2101 smooth_key skey;
1791 2102 int pl_x, pl_y;
2103 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 2104 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc ();
1793 rc_key_t key; 2106 rc_key_t key;
1794 rc_array_t *arr; 2107 rc_array_t *arr, *arr_hidden;
1795 2108
2109 pl_tex.name = 0;
2110
1796 // thats current max. sorry. 2111 // that's current max. sorry.
1797 if (sw > 255) sw = 255; 2112 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 2113 if (sh > 255) sh = 255;
1799 2114
1800 // clear key, in case of extra padding 2115 // clear key, in case of extra padding
1801 memset (&skey, 0, sizeof (skey)); 2116 memset (&skey, 0, sizeof (skey));
1805 key.g = 255; 2120 key.g = 255;
1806 key.b = 255; 2121 key.b = 255;
1807 key.a = 255; 2122 key.a = 255;
1808 key.mode = GL_QUADS; 2123 key.mode = GL_QUADS;
1809 key.format = GL_T2F_V3F; 2124 key.format = GL_T2F_V3F;
1810 key.texname = -1;
1811 2125
1812 mx += self->x; 2126 mx += self->x;
1813 my += self->y; 2127 my += self->y;
1814 2128
1815 // first pass: determine smooth_max 2129 // first pass: determine smooth_max
1836 2150
1837 glEnable (GL_BLEND); 2151 glEnable (GL_BLEND);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840 2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
1841 for (z = 0; z <= 2; z++) 2158 for (z = 0; z <= 2; z++)
1842 { 2159 {
1843 memset (smooth_level, 0, sizeof (smooth_level)); 2160 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1;
1844 2162
1845 for (y = 0; y < sh; y++) 2163 for (y = 0; y < sh; y++)
1846 if (0 <= y + my && y + my < self->rows) 2164 if (0 <= y + my && y + my < self->rows)
1847 { 2165 {
1848 maprow *row = self->row + (y + my); 2166 maprow *row = self->row + (y + my);
1858 maptex tex = self->tex [tile]; 2176 maptex tex = self->tex [tile];
1859 int px, py; 2177 int px, py;
1860 2178
1861 if (key.texname != tex.name) 2179 if (key.texname != tex.name)
1862 { 2180 {
2181 self->tex [tile].unused = 0;
2182
1863 if (!tex.name) 2183 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 2184 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865 2185
1866 key.texname = tex.name; 2186 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 2187 arr = rc_array (rc, &key);
1868 } 2188 }
1869 2189
1870 px = (x + 1) * T - tex.w; 2190 px = (x + 1) * T - tex.w;
1871 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 }
1872 2200
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2201 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 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);
1875 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);
1876 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);
1877
1878 if (cell->flags && z == 2)
1879 {
1880 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1)
1882 {
1883 maptex tex = self->tex [1];
1884 int px = x * T + T * 2 / 32;
1885 int py = y * T - T * 6 / 32;
1886
1887 if (tex.name)
1888 {
1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899 }
1900 }
1901 }
1902 2205
1903 // update smooth hash 2206 // update smooth hash
1904 if (tex.smoothtile) 2207 if (tex.smoothtile)
1905 { 2208 {
1906 skey.tile = tex.smoothtile; 2209 skey.tile = tex.smoothtile;
1935 // corners 2238 // corners
1936 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);
1937 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);
1938 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);
1939 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 }
1940 } 2280 }
1941 } 2281 }
1942 } 2282 }
1943 } 2283 }
1944 2284
1984 { 2324 {
1985 // this time avoiding texture state changes 2325 // this time avoiding texture state changes
1986 // save gobs of state changes. 2326 // save gobs of state changes.
1987 if (key.texname != tex.name) 2327 if (key.texname != tex.name)
1988 { 2328 {
2329 self->tex [skey->tile].unused = 0;
2330
1989 glEnd (); 2331 glEnd ();
1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS); 2333 glBegin (GL_QUADS);
1992 } 2334 }
1993 2335
2022 } 2364 }
2023 2365
2024 hv_clear (smooth); 2366 hv_clear (smooth);
2025 } 2367 }
2026 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
2027 glDisable (GL_BLEND); 2389 glDisable (GL_BLEND);
2028 rc_free (rc); 2390 rc_free (rc);
2391 rc_free (rc_ov);
2029 2392
2030 // top layer: overlays such as the health bar 2393 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2394 for (y = 0; y < sh; y++)
2032 if (0 <= y + my && y + my < self->rows) 2395 if (0 <= y + my && y + my < self->rows)
2033 { 2396 {
2038 { 2401 {
2039 mapcell *cell = row->col + (x + mx - row->c0); 2402 mapcell *cell = row->col + (x + mx - row->c0);
2040 2403
2041 int px = x * T; 2404 int px = x * T;
2042 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 }
2043 2412
2044 if (cell->stat_hp) 2413 if (cell->stat_hp)
2045 { 2414 {
2046 int width = cell->stat_width * T; 2415 int width = cell->stat_width * T;
2047 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2058 } 2427 }
2059 } 2428 }
2060} 2429}
2061 2430
2062void 2431void
2063draw_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)
2064 CODE: 2433 CODE:
2065{ 2434{
2066 static float color[16][3] = { 2435 static float color[16][3] = {
2067 { 0.00F, 0.00F, 0.00F }, 2436 { 0.00F, 0.00F, 0.00F },
2068 { 1.00F, 1.00F, 1.00F }, 2437 { 1.00F, 1.00F, 1.00F },
2087 }; 2456 };
2088 2457
2089 int x, y; 2458 int x, y;
2090 2459
2091 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 */
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093 glEnable (GL_BLEND); 2468 glEnable (GL_BLEND);
2094 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2469 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095 glBegin (GL_QUADS); 2470 glBegin (GL_QUADS);
2096 2471
2097 for (y = 0; y < h; y++) 2472 for (y = 0; y < h; y++)
2104 float *c = color [m & 15]; 2479 float *c = color [m & 15];
2105 2480
2106 float tx1 = m & 0x40 ? 0.5 : 0.; 2481 float tx1 = m & 0x40 ? 0.5 : 0.;
2107 float tx2 = tx1 + 0.5; 2482 float tx2 = tx1 + 0.5;
2108 2483
2109 glColor4f (c[0], c[1], c[2], 0.75); 2484 glColor4f (c[0], c[1], c[2], 1);
2110 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2488 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114 } 2489 }
2118 glDisable (GL_BLEND); 2493 glDisable (GL_BLEND);
2119 glDisable (GL_TEXTURE_2D); 2494 glDisable (GL_TEXTURE_2D);
2120} 2495}
2121 2496
2122void 2497void
2123fow_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)
2124 PPCODE: 2499 PPCODE:
2125{ 2500{
2126 int x, y; 2501 int x, y;
2127 int sw1 = sw + 2; 2502 int sw1 = sw + 2;
2128 int sh1 = sh + 2; 2503 int sh1 = sh + 2;
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2511 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2512
2138 mx += self->x - 1; 2513 mx += self->x - 1;
2139 my += self->y - 1; 2514 my += self->y - 1;
2140 2515
2141 memset (darkness1, 255, sw1 * sh1); 2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2142 2517
2143 for (y = 0; y < sh1; y++) 2518 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2519 if (0 <= y + my && y + my < self->rows)
2145 { 2520 {
2146 maprow *row = self->row + (y + my); 2521 maprow *row = self->row + (y + my);
2149 if (row->c0 <= x + mx && x + mx < row->c1) 2524 if (row->c0 <= x + mx && x + mx < row->c1)
2150 { 2525 {
2151 mapcell *cell = row->col + (x + mx - row->c0); 2526 mapcell *cell = row->col + (x + mx - row->c0);
2152 2527
2153 darkness1 [y * sw1 + x] = cell->darkness 2528 darkness1 [y * sw1 + x] = cell->darkness
2154 ? 255 - (cell->darkness - 1) 2529 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155 : 255 - FOW_DARKNESS; 2530 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156 } 2531 }
2157 } 2532 }
2158 2533
2159 for (y = 0; y < sh; ++y) 2534 for (y = 0; y < sh; ++y)
2160 for (x = 0; x < sw; ++x) 2535 for (x = 0; x < sw; ++x)
2199 PUSHs (sv_2mortal (newSViv (sh3))); 2574 PUSHs (sv_2mortal (newSViv (sh3)));
2200 PUSHs (darkness3_sv); 2575 PUSHs (darkness3_sv);
2201} 2576}
2202 2577
2203SV * 2578SV *
2204get_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)
2205 CODE: 2580 CODE:
2206{ 2581{
2207 int x, y, x1, y1; 2582 int x, y, x1, y1;
2208 SV *data_sv = newSV (w * h * 7 + 5); 2583 SV *data_sv = newSV (w * h * 7 + 5);
2209 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2584 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2266 else 2641 else
2267 *data++ = 0; 2642 *data++ = 0;
2268 } 2643 }
2269 } 2644 }
2270 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 {
2271 SvPOK_only (data_sv); 2649 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 }
2652
2273 RETVAL = data_sv; 2653 RETVAL = data_sv;
2274} 2654}
2275 OUTPUT: 2655 OUTPUT:
2276 RETVAL 2656 RETVAL
2277 2657
2278void 2658void
2279set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2659set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2660 PPCODE:
2281{ 2661{
2282 int x, y, z; 2662 int x, y, z;
2283 int w, h; 2663 int w, h;
2284 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;
2285 2675
2286 if (*data++ != 0) 2676 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2677 XSRETURN_EMPTY; /* version mismatch */
2288 2678
2289 w = *data++ << 8; w |= *data++; 2679 w = *data++ << 8; w |= *data++;
2304 { 2694 {
2305 maprow *row = map_get_row (self, y); 2695 maprow *row = map_get_row (self, y);
2306 2696
2307 for (x = x0; x < x1; x++) 2697 for (x = x0; x < x1; x++)
2308 { 2698 {
2699 uint8_t flags;
2700
2701 if (data + 7 >= end)
2702 XSRETURN_EMPTY;
2703
2309 uint8_t flags = *data++; 2704 flags = *data++;
2310 2705
2311 if (flags) 2706 if (flags)
2312 { 2707 {
2313 mapcell *cell = row_get_cell (row, x); 2708 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2709 tileid tile[3] = { 0, 0, 0 };
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2712 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2713 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2714
2320 if (cell->darkness == 0) 2715 if (cell->darkness == 0)
2321 { 2716 {
2322 cell->darkness = 0; 2717 /*cell->darkness = 0;*/
2718 EXTEND (SP, 3);
2323 2719
2324 for (z = 0; z <= 2; z++) 2720 for (z = 0; z <= 2; z++)
2325 { 2721 {
2326 tileid t = tile [z]; 2722 tileid t = tile [z];
2327 2723
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2724 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2725 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2726 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2727 need_texid (self, t);
2332 } 2728 }
2333 2729
2334 cell->tile [z] = t; 2730 cell->tile [z] = t;
2335 } 2731 }
2337 } 2733 }
2338 } 2734 }
2339 } 2735 }
2340} 2736}
2341 2737
2342MODULE = CFPlus PACKAGE = CFPlus::RW 2738MODULE = Deliantra::Client PACKAGE = DC::RW
2343 2739
2344CFPlus::RW 2740DC::RW
2345new (SV *class, SV *data_sv) 2741new (SV *class, SV *data_sv)
2346 CODE: 2742 CODE:
2347{ 2743{
2348 STRLEN datalen; 2744 STRLEN datalen;
2349 char *data = SvPVbyte (data_sv, datalen); 2745 char *data = SvPVbyte (data_sv, datalen);
2351 RETVAL = SDL_RWFromConstMem (data, datalen); 2747 RETVAL = SDL_RWFromConstMem (data, datalen);
2352} 2748}
2353 OUTPUT: 2749 OUTPUT:
2354 RETVAL 2750 RETVAL
2355 2751
2356CFPlus::RW 2752DC::RW
2357new_from_file (SV *class, const char *path, const char *mode = "rb") 2753new_from_file (SV *class, const char *path, const char *mode = "rb")
2358 CODE: 2754 CODE:
2359 RETVAL = SDL_RWFromFile (path, mode); 2755 RETVAL = SDL_RWFromFile (path, mode);
2360 OUTPUT: 2756 OUTPUT:
2361 RETVAL 2757 RETVAL
2362 2758
2363# fails on win32: 2759# fails on win32:
2364# CFPlus.xs(2268) : error C2059: syntax error : '(' 2760# dc.xs(2268) : error C2059: syntax error : '('
2365#void 2761#void
2366#close (CFPlus::RW self) 2762#close (DC::RW self)
2367# CODE: 2763# CODE:
2368# (self->(close)) (self); 2764# (self->(close)) (self);
2369 2765
2370MODULE = CFPlus PACKAGE = CFPlus::Channel 2766MODULE = Deliantra::Client PACKAGE = DC::Channel
2371 2767
2372PROTOTYPES: DISABLE 2768PROTOTYPES: DISABLE
2373 2769
2374CFPlus::Channel 2770DC::Channel
2375find () 2771find ()
2376 CODE: 2772 CODE:
2377{ 2773{
2378 RETVAL = Mix_GroupAvailable (-1); 2774 RETVAL = Mix_GroupAvailable (-1);
2379 2775
2392} 2788}
2393 OUTPUT: 2789 OUTPUT:
2394 RETVAL 2790 RETVAL
2395 2791
2396void 2792void
2397halt (CFPlus::Channel self) 2793halt (DC::Channel self)
2398 CODE: 2794 CODE:
2399 Mix_HaltChannel (self); 2795 Mix_HaltChannel (self);
2400 2796
2401void 2797void
2402expire (CFPlus::Channel self, int ticks = -1) 2798expire (DC::Channel self, int ticks = -1)
2403 CODE: 2799 CODE:
2404 Mix_ExpireChannel (self, ticks); 2800 Mix_ExpireChannel (self, ticks);
2405 2801
2406void 2802void
2407fade_out (CFPlus::Channel self, int ticks = -1) 2803fade_out (DC::Channel self, int ticks = -1)
2408 CODE: 2804 CODE:
2409 Mix_FadeOutChannel (self, ticks); 2805 Mix_FadeOutChannel (self, ticks);
2410 2806
2411int 2807int
2412volume (CFPlus::Channel self, int volume) 2808volume (DC::Channel self, int volume)
2413 CODE: 2809 CODE:
2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2810 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415 OUTPUT: 2811 OUTPUT:
2416 RETVAL 2812 RETVAL
2417 2813
2418void 2814void
2419unregister_all_effects (CFPlus::Channel self) 2815unregister_all_effects (DC::Channel self)
2420 CODE: 2816 CODE:
2421 Mix_UnregisterAllEffects (self); 2817 Mix_UnregisterAllEffects (self);
2422 2818
2423void 2819void
2424set_panning (CFPlus::Channel self, int left, int right) 2820set_panning (DC::Channel self, int left, int right)
2425 CODE: 2821 CODE:
2426 left = CLAMP (left , 0, 255); 2822 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255); 2823 right = CLAMP (right, 0, 255);
2428 Mix_SetPanning (self, left, right); 2824 Mix_SetPanning (self, left, right);
2429 2825
2430void 2826void
2431set_distance (CFPlus::Channel self, int distance) 2827set_distance (DC::Channel self, int distance)
2432 CODE: 2828 CODE:
2433 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2829 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434 2830
2435void 2831void
2436set_position (CFPlus::Channel self, int angle, int distance) 2832set_position (DC::Channel self, int angle, int distance)
2437 CODE: 2833 CODE:
2438 2834
2439void 2835void
2440set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE: 2837 CODE:
2442{ 2838{
2443 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));
2444 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);
2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446} 2842}
2447 2843
2448void 2844void
2449set_reverse_stereo (CFPlus::Channel self, int flip) 2845set_reverse_stereo (DC::Channel self, int flip)
2450 CODE: 2846 CODE:
2451 Mix_SetReverseStereo (self, flip); 2847 Mix_SetReverseStereo (self, flip);
2452 2848
2453MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454 2850
2455PROTOTYPES: DISABLE 2851PROTOTYPES: DISABLE
2456 2852
2457CFPlus::MixChunk 2853DC::MixChunk
2458new (SV *class, CFPlus::RW rwops) 2854new (SV *class, DC::RW rwops)
2459 CODE: 2855 CODE:
2460 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2856 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461 OUTPUT: 2857 OUTPUT:
2462 RETVAL 2858 RETVAL
2463 2859
2464void 2860void
2465DESTROY (CFPlus::MixChunk self) 2861DESTROY (DC::MixChunk self)
2466 CODE: 2862 CODE:
2467 Mix_FreeChunk (self); 2863 Mix_FreeChunk (self);
2468 2864
2469int 2865int
2470volume (CFPlus::MixChunk self, int volume = -1) 2866volume (DC::MixChunk self, int volume = -1)
2471 CODE: 2867 CODE:
2472 if (items > 1) 2868 if (items > 1)
2473 volume = CLAMP (volume, 0, 128); 2869 volume = CLAMP (volume, 0, 128);
2474 RETVAL = Mix_VolumeChunk (self, volume); 2870 RETVAL = Mix_VolumeChunk (self, volume);
2475 OUTPUT: 2871 OUTPUT:
2476 RETVAL 2872 RETVAL
2477 2873
2478CFPlus::Channel 2874DC::Channel
2479play (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)
2480 CODE: 2876 CODE:
2481{ 2877{
2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2878 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483 2879
2484 if (RETVAL < 0) 2880 if (RETVAL < 0)
2491 } 2887 }
2492} 2888}
2493 OUTPUT: 2889 OUTPUT:
2494 RETVAL 2890 RETVAL
2495 2891
2496MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497 2893
2498int 2894int
2499volume (int volume = -1) 2895volume (int volume = -1)
2500 PROTOTYPE: ;$ 2896 PROTOTYPE: ;$
2501 CODE: 2897 CODE:
2513void 2909void
2514halt () 2910halt ()
2515 CODE: 2911 CODE:
2516 Mix_HaltMusic (); 2912 Mix_HaltMusic ();
2517 2913
2518CFPlus::MixMusic 2914DC::MixMusic
2519new (SV *class, CFPlus::RW rwops) 2915new (SV *class, DC::RW rwops)
2520 CODE: 2916 CODE:
2521 RETVAL = Mix_LoadMUS_RW (rwops); 2917 RETVAL = Mix_LoadMUS_RW (rwops);
2522 OUTPUT: 2918 OUTPUT:
2523 RETVAL 2919 RETVAL
2524 2920
2525void 2921void
2526DESTROY (CFPlus::MixMusic self) 2922DESTROY (DC::MixMusic self)
2527 CODE: 2923 CODE:
2528 Mix_FreeMusic (self); 2924 Mix_FreeMusic (self);
2529 2925
2530int 2926int
2531play (CFPlus::MixMusic self, int loops = -1) 2927play (DC::MixMusic self, int loops = -1)
2532 CODE: 2928 CODE:
2533 RETVAL = Mix_PlayMusic (self, loops); 2929 RETVAL = Mix_PlayMusic (self, loops);
2534 OUTPUT: 2930 OUTPUT:
2535 RETVAL 2931 RETVAL
2536 2932
2537void 2933void
2538fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2934fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539 CODE: 2935 CODE:
2540 Mix_FadeInMusicPos (self, loops, ms, position); 2936 Mix_FadeInMusicPos (self, loops, ms, position);
2541 2937
2542MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2938MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543 2939
2544PROTOTYPES: ENABLE 2940PROTOTYPES: ENABLE
2545 2941
2546BOOT: 2942BOOT:
2547{ 2943{
2548 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2944 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549 static const struct { 2945 static const struct {
2550 const char *name; 2946 const char *name;
2551 IV iv; 2947 IV iv;
2552 } *civ, const_iv[] = { 2948 } *civ, const_iv[] = {
2553# define const_iv(name) { # name, (IV)name } 2949# define const_iv(name) { # name, (IV)name }
2554 const_iv (GL_VENDOR), 2950 const_iv (GL_VENDOR),
2555 const_iv (GL_VERSION), 2951 const_iv (GL_VERSION),
2556 const_iv (GL_EXTENSIONS), 2952 const_iv (GL_EXTENSIONS),
2953 const_iv (GL_MAX_TEXTURE_UNITS),
2557 const_iv (GL_COLOR_MATERIAL), 2954 const_iv (GL_COLOR_MATERIAL),
2558 const_iv (GL_SMOOTH), 2955 const_iv (GL_SMOOTH),
2559 const_iv (GL_FLAT), 2956 const_iv (GL_FLAT),
2560 const_iv (GL_DITHER), 2957 const_iv (GL_DITHER),
2561 const_iv (GL_BLEND), 2958 const_iv (GL_BLEND),
2573 const_iv (GL_ZERO), 2970 const_iv (GL_ZERO),
2574 const_iv (GL_SRC_ALPHA), 2971 const_iv (GL_SRC_ALPHA),
2575 const_iv (GL_DST_ALPHA), 2972 const_iv (GL_DST_ALPHA),
2576 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2973 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577 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),
2578 const_iv (GL_SRC_ALPHA_SATURATE), 2979 const_iv (GL_SRC_ALPHA_SATURATE),
2579 const_iv (GL_RGB), 2980 const_iv (GL_RGB),
2580 const_iv (GL_RGBA), 2981 const_iv (GL_RGBA),
2581 const_iv (GL_RGBA4), 2982 const_iv (GL_RGBA4),
2582 const_iv (GL_RGBA8), 2983 const_iv (GL_RGBA8),
2650 const_iv (GL_NICEST), 3051 const_iv (GL_NICEST),
2651 const_iv (GL_V2F), 3052 const_iv (GL_V2F),
2652 const_iv (GL_V3F), 3053 const_iv (GL_V3F),
2653 const_iv (GL_T2F_V3F), 3054 const_iv (GL_T2F_V3F),
2654 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),
2655# undef const_iv 3059# undef const_iv
2656 }; 3060 };
2657 3061
2658 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; )
2659 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2666disable_GL_EXT_blend_func_separate () 3070disable_GL_EXT_blend_func_separate ()
2667 CODE: 3071 CODE:
2668 gl.BlendFuncSeparate = 0; 3072 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0; 3073 gl.BlendFuncSeparateEXT = 0;
2670 3074
3075void
3076apple_nvidia_bug (int enable)
3077
2671char * 3078char *
2672gl_vendor () 3079gl_vendor ()
2673 CODE: 3080 CODE:
2674 RETVAL = (char *)glGetString (GL_VENDOR); 3081 RETVAL = (char *)glGetString (GL_VENDOR);
2675 OUTPUT: 3082 OUTPUT:
2724 3131
2725void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3132void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726 CODE: 3133 CODE:
2727 gl_BlendFuncSeparate (sa, da, saa, daa); 3134 gl_BlendFuncSeparate (sa, da, saa, daa);
2728 3135
3136# void glBlendEquation (int se)
3137
2729void glDepthMask (int flag) 3138void glDepthMask (int flag)
2730 3139
2731void glLogicOp (int opcode) 3140void glLogicOp (int opcode)
2732 3141
2733void glColorMask (int red, int green, int blue, int alpha) 3142void glColorMask (int red, int green, int blue, int alpha)
2767void glRotate (float angle, float x, float y, float z) 3176void glRotate (float angle, float x, float y, float z)
2768 CODE: 3177 CODE:
2769 glRotatef (angle, x, y, z); 3178 glRotatef (angle, x, y, z);
2770 3179
2771void 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: @
2772 ALIAS: 3182 ALIAS:
2773 glColor_premultiply = 1 3183 glColor_premultiply = 1
2774 CODE: 3184 CODE:
2775 if (ix) 3185 if (ix)
2776 { 3186 {
2846void 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)
2847 CODE: 3257 CODE:
2848 if (gl.SeparableFilter2D) 3258 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3259 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 3260
2851void 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)
2852 3262
2853void 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)
2854 3264
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 3265void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 3266
2882 3292
2883void glEndList () 3293void glEndList ()
2884 3294
2885void glCallList (int list) 3295void glCallList (int list)
2886 3296
2887MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888 3298
2889PROTOTYPES: DISABLE 3299PROTOTYPES: DISABLE
2890 3300
2891void 3301void
2892find_widget (SV *self, NV x, NV y) 3302find_widget (SV *self, NV x, NV y)
2896 XPUSHs (self); 3306 XPUSHs (self);
2897} 3307}
2898 3308
2899BOOT: 3309BOOT:
2900{ 3310{
2901 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3311 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902 3312
2903 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);
2904 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);
2905 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);
2906 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);
2907} 3317}
2908 3318
2909void 3319void
2910draw (SV *self) 3320draw (SV *self)
2911 CODE: 3321 CODE:
2918 SV *draw_w_sv = GvSV (draw_w_gv); 3328 SV *draw_w_sv = GvSV (draw_w_gv);
2919 SV *draw_h_sv = GvSV (draw_h_gv); 3329 SV *draw_h_sv = GvSV (draw_h_gv);
2920 double draw_x, draw_y; 3330 double draw_x, draw_y;
2921 3331
2922 if (!SvROK (self)) 3332 if (!SvROK (self))
2923 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3333 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924 3334
2925 hv = (HV *)SvRV (self); 3335 hv = (HV *)SvRV (self);
2926 3336
2927 if (SvTYPE (hv) != SVt_PVHV) 3337 if (SvTYPE (hv) != SVt_PVHV)
2928 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929 3339
2930 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.;
2931 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.;
2932 3342
2933 if (!h || !w) 3343 if (!h || !w)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines