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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 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
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
120 148
121#include "pango-font.c" 149#include "pango-font.c"
122#include "pango-fontmap.c" 150#include "pango-fontmap.c"
123#include "pango-render.c" 151#include "pango-render.c"
124 152
125typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
129 157
130typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
131 159
132static int 160static int
133shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
134{ 162{
135 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
149 177
150typedef struct cf_layout { 178typedef struct cf_layout {
151 PangoLayout *pl; 179 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
153 int base_height; 181 int base_height;
154 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
155} *CFPlus__Layout; 184} *DC__Layout;
156 185
157static CFPlus__Font default_font; 186static DC__Font default_font;
158static PangoContext *opengl_context; 187static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
160 189
161static void 190static void
162substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
167#endif 196#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 198}
170 199
171static void 200static void
172layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
173{ 202{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
176 */ 205 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
178 207
179 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 210
182 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
183} 212}
184 213
185static void 214static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 216{
188 PangoRectangle rect; 217 PangoRectangle rect;
189 218
190 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
202 231
203typedef uint16_t tileid; 232typedef uint16_t tileid;
204typedef uint16_t faceid; 233typedef uint16_t faceid;
205 234
206typedef struct { 235typedef struct {
207 int name; 236 GLuint name;
208 int w, h; 237 int w, h;
209 float s, t; 238 float s, t;
210 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
211 tileid smoothtile; 240 tileid smoothtile;
212 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
213} maptex; 243} maptex;
214 244
215typedef struct { 245typedef struct {
216 uint32_t player; 246 uint32_t player;
217 tileid tile[3]; 247 tileid tile[3];
230 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
232 262
233 int32_t rows; 263 int32_t rows;
234 maprow *row; 264 maprow *row;
235} *CFPlus__Map; 265} *DC__Map;
236 266
237static char * 267static char *
238prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
239{ 269{
240 char *p; 270 char *p;
278 self->texs *= 2; 308 self->texs *= 2;
279 } 309 }
280} 310}
281 311
282static maprow * 312static maprow *
283map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
284{ 314{
285 if (0 > y) 315 if (0 > y)
286 { 316 {
287 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
326 356
327 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
328} 358}
329 359
330static mapcell * 360static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
332{ 362{
333 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
334} 364}
335 365
336static void 366static void
337map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
338{ 368{
339 int r; 369 int r;
340 370
341 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
349 self->oy = 0; 379 self->oy = 0;
350 self->row = 0; 380 self->row = 0;
351 self->rows = 0; 381 self->rows = 0;
352} 382}
353 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
354static void 394static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 396{
357 int x, y; 397 int x, y;
358 maprow *row; 398 maprow *row;
359 mapcell *cell; 399 mapcell *cell;
360 400
372 if (x >= row->c1) 412 if (x >= row->c1)
373 break; 413 break;
374 414
375 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
376 416
377 cell->darkness = 0; 417 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 418 }
382 } 419 }
383} 420}
384 421
385typedef struct { 422typedef struct {
439 n |= n >> 16; 476 n |= n >> 16;
440 477
441 return n + 1; 478 return n + 1;
442} 479}
443 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
444/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
447 495
448/******************************************************************************/ 496/******************************************************************************/
486 return 0; 534 return 0;
487 535
488 return 1; 536 return 1;
489} 537}
490 538
491MODULE = CFPlus PACKAGE = CFPlus 539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
492 592
493PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
494 594
495BOOT: 595BOOT:
496{ 596{
497 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 598 static const struct {
499 const char *name; 599 const char *name;
500 IV iv; 600 IV iv;
501 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
524 624
525 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
528 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
610# undef const_iv 795# undef const_iv
611 }; 796 };
612 797
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 817
633NV floor (NV x) 818NV floor (NV x)
634 819
635NV ceil (NV x) 820NV ceil (NV x)
636 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
637void 826void
638pango_init () 827pango_init ()
639 CODE: 828 CODE:
640{ 829{
641 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
644} 838}
645 839
646char *
647SDL_GetError () 840char *SDL_GetError ()
648 841
649int 842void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 843
652void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
653SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
654 860
655void 861void
656SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
657 PPCODE: 863 PPCODE:
658{ 864{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 879
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 882
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 884
682 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
683 while (*m) 886 while (*m)
684 { 887 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 889 {
687 AV *av = newAV (); 890 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
714 917
715 if (RETVAL) 918 if (RETVAL)
716 { 919 {
717 av_clear (texture_av); 920 av_clear (texture_av);
718 921
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 924#include "glfunc.h"
722#undef GL_FUNC 925#undef GL_FUNC
723 } 926 }
724} 927}
731char * 934char *
732SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
733 936
734int 937int
735SDL_GetAppState () 938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
736 942
737void 943void
738poll_events () 944poll_events ()
739 PPCODE: 945 PPCODE:
740{ 946{
750 { 956 {
751 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
752 case SDL_KEYUP: 958 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 962 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 964 break;
759 965
760 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 985 x = ev.motion.x;
780 y = ev.motion.y; 986 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 988 }
783 989
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 996 }
791 break; 997 break;
792 998
793 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1002
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1013 break;
808 } 1014 }
809 1015
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 1017 }
812} 1018}
813 1019
814int 1020int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1022 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
1025
1026void
1027Mix_QuerySpec ()
1028 PPCODE:
1029{
1030 int freq, channels;
1031 Uint16 format;
1032
1033 if (Mix_QuerySpec (&freq, &format, &channels))
1034 {
1035 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (freq)));
1037 PUSHs (sv_2mortal (newSViv (format)));
1038 PUSHs (sv_2mortal (newSViv (channels)));
1039 }
1040}
819 1041
820void 1042void
821Mix_CloseAudio () 1043Mix_CloseAudio ()
822 1044
823int 1045int
858 } 1080 }
859 } 1081 }
860#endif 1082#endif
861} 1083}
862 1084
863void 1085int
864add_font (char *file) 1086add_font (char *file)
865 CODE: 1087 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
867 1091
868void 1092void
869load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
870 ALIAS: 1094 ALIAS:
871 load_image_file = 1 1095 load_image_file = 1
957void 1181void
958error (char *message) 1182error (char *message)
959 CODE: 1183 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1185#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1187#endif
964 1188
965void 1189void
966fatal (char *message) 1190fatal (char *message)
967 CODE: 1191 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1193#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1195#endif
972 _exit (1); 1196 _exit (1);
973 1197
974void 1198void
975_exit (int retval = 0) 1199_exit (int retval = 0)
987#if DEBUG 1211#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
989#endif 1213#endif
990} 1214}
991 1215
992MODULE = CFPlus PACKAGE = CFPlus::Font 1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1223MODULE = Deliantra::Client PACKAGE = DC::Font
993 1224
994PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
995 1226
996CFPlus::Font 1227DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1229 CODE:
999{ 1230{
1000 int count; 1231 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1235}
1005 OUTPUT: 1236 OUTPUT:
1006 RETVAL 1237 RETVAL
1007 1238
1008void 1239void
1009DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
1010 CODE: 1241 CODE:
1011 pango_font_description_free (self); 1242 pango_font_description_free (self);
1012 1243
1013void 1244void
1014make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1015 PROTOTYPE: $ 1246 PROTOTYPE: $
1016 CODE: 1247 CODE:
1017 default_font = self; 1248 default_font = self;
1018 1249
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1251
1021PROTOTYPES: DISABLE 1252PROTOTYPES: DISABLE
1022 1253
1023void 1254void
1024reset_glyph_cache () 1255glyph_cache_backup ()
1025 PROTOTYPE: 1256 PROTOTYPE:
1026 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
1027 tc_clear (); 1264 tc_restore ();
1028 1265
1029CFPlus::Layout 1266DC::Layout
1030new (SV *class) 1267new (SV *class)
1031 CODE: 1268 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
1033 1270
1034 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
1041 1279
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
1044 OUTPUT: 1282 OUTPUT:
1045 RETVAL 1283 RETVAL
1046 1284
1047void 1285void
1048DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
1049 CODE: 1287 CODE:
1050 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
1051 Safefree (self); 1290 Safefree (self);
1052 1291
1053void 1292void
1054set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
1055 CODE: 1294 CODE:
1056{ 1295{
1057 STRLEN textlen; 1296 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
1059 1298
1060 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
1061} 1300}
1062 1301
1063void 1302void
1064set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1065 CODE: 1304 CODE:
1066{ 1305{
1067 STRLEN textlen; 1306 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1069 1308
1070 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1071} 1310}
1072 1311
1073void 1312void
1074set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1075 CODE: 1314 CODE:
1076{ 1315{
1077 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1318 const char *pos = text;
1114 if (attrs) 1353 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1116} 1355}
1117 1356
1118void 1357void
1119get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1120 PPCODE: 1359 PPCODE:
1121{ 1360{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1362
1124 do 1363 do
1125 { 1364 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1366
1128 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1129 { 1368 {
1130 PangoRectangle extents; 1369 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1378
1140 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1141} 1380}
1142 1381
1143int 1382int
1144has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1145 CODE: 1384 CODE:
1146{ 1385{
1147 int lines = 1; 1386 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1149 1388
1154} 1393}
1155 OUTPUT: 1394 OUTPUT:
1156 RETVAL 1395 RETVAL
1157 1396
1158SV * 1397SV *
1159get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1160 CODE: 1399 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1402 OUTPUT:
1164 RETVAL 1403 RETVAL
1165 1404
1166void 1405void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1406set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1407 CODE:
1169 self->r = r; 1408 self->r = r;
1170 self->g = g; 1409 self->g = g;
1171 self->b = b; 1410 self->b = b;
1172 self->a = a; 1411 self->a = a;
1173 1412
1174void 1413void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1415 CODE:
1177 if (self->font != font) 1416 if (self->font != font)
1178 { 1417 {
1179 self->font = font; 1418 self->font = font;
1180 layout_update_font (self); 1419 layout_update_font (self);
1181 } 1420 }
1182 1421
1183void 1422void
1184set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1185 CODE: 1424 CODE:
1186 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1187 { 1426 {
1188 self->base_height = base_height; 1427 self->base_height = base_height;
1189 layout_update_font (self); 1428 layout_update_font (self);
1190 } 1429 }
1191 1430
1192void 1431void
1193set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1433 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1434 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1435
1197void 1436void
1198set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1199 CODE: 1438 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1440
1202void 1441void
1203set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1204 CODE: 1443 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1445
1207void 1446void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1448 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1215 ); 1454 );
1216 1455
1217void 1456void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1458 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1460
1222void 1461void
1223size (CFPlus::Layout self) 1462size (DC::Layout self)
1224 PPCODE: 1463 PPCODE:
1225{ 1464{
1226 int w, h; 1465 int w, h;
1227 1466
1228 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1233} 1472}
1234 1473
1235int 1474int
1236descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1237 CODE: 1476 CODE:
1238{ 1477{
1239 PangoRectangle rect; 1478 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1243} 1482}
1244 OUTPUT: 1483 OUTPUT:
1245 RETVAL 1484 RETVAL
1246 1485
1247int 1486int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1488 CODE:
1250{ 1489{
1251 int index, trailing; 1490 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1491 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1254} 1493}
1255 OUTPUT: 1494 OUTPUT:
1256 RETVAL 1495 RETVAL
1257 1496
1258void 1497void
1259cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1499 PPCODE:
1261{ 1500{
1262 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1503
1265 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1508}
1270 1509
1271void 1510void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1512 PPCODE:
1274{ 1513{
1275 int line, x; 1514 int line, x;
1276 1515
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1519 --line;
1520#endif
1280 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1524}
1284 1525
1285void 1526void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1528 PPCODE:
1288{ 1529{
1289 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1290 int index, trailing; 1531 int index, trailing;
1291 1532
1292 if (line < 0) 1533 if (line < 0)
1293 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1294 1535
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1297 1538
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1540
1300 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1548 }
1308} 1549}
1309 1550
1310void 1551void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1314 self->pl, 1556 self->pl,
1557 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1317 flags 1560 flags
1318 ); 1561 );
1562 // we assume that context_change actually clears/frees stuff
1563 // and does not do any recomputation...
1564 pango_layout_context_changed (self->pl);
1319 1565
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1566void
1567draw (DC::Layout self)
1568 CODE:
1569{
1570 glEnable (GL_TEXTURE_2D);
1571 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1572 glEnable (GL_BLEND);
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1577
1578 rc_draw (self->rc);
1579
1580 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D);
1583}
1584
1585MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1586
1322PROTOTYPES: ENABLE 1587PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1588
1326void 1589void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1590pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1591 CODE:
1329{ 1592{
1395 glDisable (GL_ALPHA_TEST); 1658 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1659 glDisable (GL_BLEND);
1397 } 1660 }
1398} 1661}
1399 1662
1663void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
1665 PROTOTYPE: @
1666 CODE:
1667{
1668 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672
1673 glColor4f (intensity, intensity, intensity, 0.9);
1674 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.);
1676
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1684 glEnd ();
1685
1686 glPopMatrix ();
1687
1688 glDisable (GL_TEXTURE_2D);
1689 glDisable (GL_BLEND);
1690}
1691
1400IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1692IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1401 CODE: 1693 CODE:
1402{ 1694{
1403 GLint width; 1695 GLint width;
1404 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1696 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1406 RETVAL = width > 0; 1698 RETVAL = width > 0;
1407} 1699}
1408 OUTPUT: 1700 OUTPUT:
1409 RETVAL 1701 RETVAL
1410 1702
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1703MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1704
1413PROTOTYPES: DISABLE 1705PROTOTYPES: DISABLE
1414 1706
1415CFPlus::Map 1707DC::Map
1416new (SV *class) 1708new (SV *class)
1417 CODE: 1709 CODE:
1418 New (0, RETVAL, 1, struct map); 1710 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1711 RETVAL->x = 0;
1420 RETVAL->y = 0; 1712 RETVAL->y = 0;
1428 RETVAL->row = 0; 1720 RETVAL->row = 0;
1429 OUTPUT: 1721 OUTPUT:
1430 RETVAL 1722 RETVAL
1431 1723
1432void 1724void
1433DESTROY (CFPlus::Map self) 1725DESTROY (DC::Map self)
1434 CODE: 1726 CODE:
1435{ 1727{
1436 map_clear (self); 1728 map_clear (self);
1437 Safefree (self->face2tile); 1729 Safefree (self->face2tile);
1438 Safefree (self->tex); 1730 Safefree (self->tex);
1439 Safefree (self); 1731 Safefree (self);
1440} 1732}
1441 1733
1442void 1734void
1443resize (CFPlus::Map self, int map_width, int map_height) 1735resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1736 CODE:
1445 self->w = map_width; 1737 self->w = map_width;
1446 self->h = map_height; 1738 self->h = map_height;
1447 1739
1448void 1740void
1449clear (CFPlus::Map self) 1741clear (DC::Map self)
1450 CODE: 1742 CODE:
1451 map_clear (self); 1743 map_clear (self);
1452 1744
1453void 1745void
1454set_tileid (CFPlus::Map self, int face, int tile) 1746set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1747 CODE:
1456{ 1748{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1749 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1750 need_texid (self, tile);
1459} 1751}
1460 1752
1461void 1753void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1754set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1755 CODE:
1464{ 1756{
1465 tileid texid; 1757 tileid texid;
1466 maptex *tex; 1758 maptex *tex;
1467 1759
1480 tex->smoothtile = self->face2tile [smooth]; 1772 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1773 tex->smoothlevel = level;
1482} 1774}
1483 1775
1484void 1776void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1777set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1778 CODE:
1487{ 1779{
1488 need_texid (self, texid); 1780 need_texid (self, texid);
1489 1781
1490 { 1782 {
1509 // use uglier nearest interpolation because linear suffers 1801 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1802 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1804}
1513 1805
1806void
1807expire_textures (DC::Map self, int texid, int count)
1808 PPCODE:
1809 for (; texid < self->texs && count; ++texid, --count)
1810 {
1811 maptex *tex = self->tex + texid;
1812
1813 if (tex->name)
1814 {
1815 if (tex->unused)
1816 {
1817 tex->name = 0;
1818 tex->unused = 0;
1819 XPUSHs (sv_2mortal (newSViv (texid)));
1820 }
1821 else
1822 tex->unused = 1;
1823 }
1824 }
1825
1514int 1826int
1515ox (CFPlus::Map self) 1827ox (DC::Map self)
1516 ALIAS: 1828 ALIAS:
1517 oy = 1 1829 oy = 1
1518 x = 2 1830 x = 2
1519 y = 3 1831 y = 3
1520 w = 4 1832 w = 4
1531 } 1843 }
1532 OUTPUT: 1844 OUTPUT:
1533 RETVAL 1845 RETVAL
1534 1846
1535void 1847void
1536scroll (CFPlus::Map self, int dx, int dy) 1848scroll (DC::Map self, int dx, int dy)
1537 CODE: 1849 CODE:
1538{ 1850{
1539 if (dx > 0) 1851 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1852 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1853 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1869 self->y += MAP_EXTEND_Y;
1558 } 1870 }
1559} 1871}
1560 1872
1561SV * 1873SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1874map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1875 CODE:
1564{ 1876{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1877 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1878 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1879 mapcell *cell;
1595 uint8_t ext, cmd; 1907 uint8_t ext, cmd;
1596 1908
1597 do 1909 do
1598 { 1910 {
1599 ext = *data++; 1911 ext = *data++;
1600 cmd = ext & 0x3f; 1912 cmd = ext & 0x7f;
1601 1913
1602 if (cmd < 4) 1914 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1915 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1916 else if (cmd == 5) // health
1605 { 1917 {
1608 } 1920 }
1609 else if (cmd == 6) // monster width 1921 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1922 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1923 else if (cmd == 0x47)
1612 { 1924 {
1613 if (*data == 4) 1925 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 1926 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 1929
1616 data += *data + 1; 1930 data += *data + 1;
1617 } 1931 }
1618 else if (cmd == 8) // cell flags 1932 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1933 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 1950 cell->tile [z] = self->face2tile [face];
1637 1951
1638 if (cell->tile [z]) 1952 if (cell->tile [z])
1639 { 1953 {
1640 maptex *tex = self->tex + cell->tile [z]; 1954 maptex *tex = self->tex + cell->tile [z];
1955 tex->unused = 0;
1641 if (!tex->name) 1956 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 1957 av_push (missing, newSViv (cell->tile [z]));
1643 1958
1644 if (tex->smoothtile) 1959 if (tex->smoothtile)
1645 { 1960 {
1646 maptex *smooth = self->tex + tex->smoothtile; 1961 maptex *smooth = self->tex + tex->smoothtile;
1962 smooth->unused = 0;
1647 if (!smooth->name) 1963 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 1964 av_push (missing, newSViv (tex->smoothtile));
1649 } 1965 }
1650 } 1966 }
1651 } 1967 }
1652 } 1968 }
1653 else 1969 else
1654 cell->darkness = 0; 1970 CELL_CLEAR (cell);
1655 } 1971 }
1656} 1972}
1657 OUTPUT: 1973 OUTPUT:
1658 RETVAL 1974 RETVAL
1659 1975
1660SV * 1976SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1977mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1978 CODE:
1663{ 1979{
1664 int x1, x; 1980 int x1, x;
1665 int y1, y; 1981 int y1, y;
1666 int z; 1982 int z;
1711} 2027}
1712 OUTPUT: 2028 OUTPUT:
1713 RETVAL 2029 RETVAL
1714 2030
1715void 2031void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2032draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 2033 CODE:
1718{ 2034{
1719 int x, y, z; 2035 int x, y, z;
1720 2036
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2038 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2039 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2040 smooth_key skey;
1725 2041 int pl_x, pl_y;
2042 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2043 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2045 rc_key_t key;
1728 rc_array_t *arr; 2046 rc_array_t *arr, *arr_hidden;
1729 2047
2048 pl_tex.name = 0;
2049
1730 // thats current max. sorry. 2050 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2051 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2052 if (sh > 255) sh = 255;
1733 2053
1734 // clear key, in case of extra padding 2054 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2055 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2059 key.g = 255;
1740 key.b = 255; 2060 key.b = 255;
1741 key.a = 255; 2061 key.a = 255;
1742 key.mode = GL_QUADS; 2062 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2063 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2064
1746 mx += self->x; 2065 mx += self->x;
1747 my += self->y; 2066 my += self->y;
1748 2067
1749 // first pass: determine smooth_max 2068 // first pass: determine smooth_max
1770 2089
1771 glEnable (GL_BLEND); 2090 glEnable (GL_BLEND);
1772 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096
1775 for (z = 0; z <= 2; z++) 2097 for (z = 0; z <= 2; z++)
1776 { 2098 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2099 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1;
1778 2101
1779 for (y = 0; y < sh; y++) 2102 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2103 if (0 <= y + my && y + my < self->rows)
1781 { 2104 {
1782 maprow *row = self->row + (y + my); 2105 maprow *row = self->row + (y + my);
1790 if (tile) 2113 if (tile)
1791 { 2114 {
1792 maptex tex = self->tex [tile]; 2115 maptex tex = self->tex [tile];
1793 int px, py; 2116 int px, py;
1794 2117
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2118 if (key.texname != tex.name)
1798 { 2119 {
2120 self->tex [tile].unused = 0;
2121
1799 if (!tex.name) 2122 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2123 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2124
1802 key.texname = tex.name; 2125 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2126 arr = rc_array (rc, &key);
1804 } 2127 }
1805 2128
1806 px = (x + 1) * T - tex.w; 2129 px = (x + 1) * T - tex.w;
1807 py = (y + 1) * T - tex.h; 2130 py = (y + 1) * T - tex.h;
2131
2132 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 {
2134 pl_x = px;
2135 pl_y = py;
2136 pl_tex = tex;
2137 continue;
2138 }
1808 2139
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2140 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2141 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2142 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2143 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813
1814 if (cell->flags && z == 2)
1815 {
1816 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1)
1818 {
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 }
1838 2144
1839 // update smooth hash 2145 // update smooth hash
1840 if (tex.smoothtile) 2146 if (tex.smoothtile)
1841 { 2147 {
1842 skey.tile = tex.smoothtile; 2148 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2179 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1874 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2180 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1875 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2181 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2182 }
1877 } 2183 }
2184
2185 if (expect_false (z == 2))
2186 {
2187 /* draw question marks on top of hidden spaces */
2188 if (!cell->darkness)
2189 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32;
2209 int py = y * T - T * 6 / 32;
2210
2211 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218 }
2219 }
2220 }
1878 } 2221 }
1879 } 2222 }
1880 2223
1881 rc_draw (rc); 2224 rc_draw (rc);
1882 rc_clear (rc); 2225 rc_clear (rc);
1884 // go through all smoothlevels, lowest to highest, then draw. 2227 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 2228 // this is basically counting sort
1886 { 2229 {
1887 int w, b; 2230 int w, b;
1888 2231
2232 glEnable (GL_TEXTURE_2D);
2233 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 2234 for (w = 0; w < 256 / 32; ++w)
1890 { 2235 {
1891 uint32_t smask = smooth_level [w]; 2236 uint32_t smask = smooth_level [w];
1892 if (smask) 2237 if (smask)
1893 for (b = 0; b < 32; ++b) 2238 for (b = 0; b < 32; ++b)
1918 { 2263 {
1919 // this time avoiding texture state changes 2264 // this time avoiding texture state changes
1920 // save gobs of state changes. 2265 // save gobs of state changes.
1921 if (key.texname != tex.name) 2266 if (key.texname != tex.name)
1922 { 2267 {
2268 self->tex [skey->tile].unused = 0;
2269
2270 glEnd ();
1923 key.texname = tex.name; 2271 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 2272 glBegin (GL_QUADS);
1925 } 2273 }
1926 2274
1927 if (border) 2275 if (border)
1928 { 2276 {
1929 float ox = border * dx; 2277 float ox = border * dx;
1930 2278
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2283 }
1936 2284
1937 if (corner) 2285 if (corner)
1938 { 2286 {
1939 float ox = corner * dx; 2287 float ox = corner * dx;
1940 2288
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2289 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2293 }
1946 } 2294 }
1947 } 2295 }
1948 } 2296 }
1949 } 2297 }
1950 } 2298 }
2299
2300 glEnd ();
2301 glDisable (GL_TEXTURE_2D);
2302 key.texname = -1;
1951 } 2303 }
1952 2304
1953 hv_clear (smooth); 2305 hv_clear (smooth);
2306 }
2307
2308 if (pl_tex.name)
2309 {
2310 maptex tex = pl_tex;
2311 int px = pl_x + sdx;
2312 int py = pl_y + sdy;
2313
2314 key.texname = tex.name;
2315 arr = rc_array (rc, &key);
2316
2317 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2318 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2319 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2320 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2321
1954 rc_draw (rc); 2322 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2323 }
2324
2325 rc_draw (rc_ov);
2326 rc_clear (rc_ov);
1957 2327
1958 glDisable (GL_BLEND); 2328 glDisable (GL_BLEND);
1959 rc_free (rc); 2329 rc_free (rc);
2330 rc_free (rc_ov);
1960 2331
1961 // top layer: overlays such as the health bar 2332 // top layer: overlays such as the health bar
1962 for (y = 0; y < sh; y++) 2333 for (y = 0; y < sh; y++)
1963 if (0 <= y + my && y + my < self->rows) 2334 if (0 <= y + my && y + my < self->rows)
1964 { 2335 {
1969 { 2340 {
1970 mapcell *cell = row->col + (x + mx - row->c0); 2341 mapcell *cell = row->col + (x + mx - row->c0);
1971 2342
1972 int px = x * T; 2343 int px = x * T;
1973 int py = y * T; 2344 int py = y * T;
2345
2346 if (expect_false (cell->player == player))
2347 {
2348 px += sdx;
2349 py += sdy;
2350 }
1974 2351
1975 if (cell->stat_hp) 2352 if (cell->stat_hp)
1976 { 2353 {
1977 int width = cell->stat_width * T; 2354 int width = cell->stat_width * T;
1978 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1989 } 2366 }
1990 } 2367 }
1991} 2368}
1992 2369
1993void 2370void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2371draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2372 CODE:
1996{ 2373{
1997 static float color[16][3] = { 2374 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2375 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2376 { 1.00F, 1.00F, 1.00F },
2018 }; 2395 };
2019 2396
2020 int x, y; 2397 int x, y;
2021 2398
2022 glEnable (GL_TEXTURE_2D); 2399 glEnable (GL_TEXTURE_2D);
2400 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia.
2405 */
2023 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2024 glEnable (GL_BLEND); 2407 glEnable (GL_BLEND);
2025 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2408 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2026 glBegin (GL_QUADS); 2409 glBegin (GL_QUADS);
2027 2410
2028 for (y = 0; y < h; y++) 2411 for (y = 0; y < h; y++)
2035 float *c = color [m & 15]; 2418 float *c = color [m & 15];
2036 2419
2037 float tx1 = m & 0x40 ? 0.5 : 0.; 2420 float tx1 = m & 0x40 ? 0.5 : 0.;
2038 float tx2 = tx1 + 0.5; 2421 float tx2 = tx1 + 0.5;
2039 2422
2040 glColor4f (c[0], c[1], c[2], 0.75); 2423 glColor4f (c[0], c[1], c[2], 1);
2041 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2042 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2043 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2044 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2427 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2045 } 2428 }
2049 glDisable (GL_BLEND); 2432 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2433 glDisable (GL_TEXTURE_2D);
2051} 2434}
2052 2435
2053void 2436void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2437fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2438 PPCODE:
2056{ 2439{
2057 int x, y; 2440 int x, y;
2058 int sw1 = sw + 2; 2441 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2442 int sh1 = sh + 2;
2067 SvCUR_set (darkness3_sv, sw34 * sh3); 2450 SvCUR_set (darkness3_sv, sw34 * sh3);
2068 2451
2069 mx += self->x - 1; 2452 mx += self->x - 1;
2070 my += self->y - 1; 2453 my += self->y - 1;
2071 2454
2072 memset (darkness1, 255, sw1 * sh1); 2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2073 2456
2074 for (y = 0; y < sh1; y++) 2457 for (y = 0; y < sh1; y++)
2075 if (0 <= y + my && y + my < self->rows) 2458 if (0 <= y + my && y + my < self->rows)
2076 { 2459 {
2077 maprow *row = self->row + (y + my); 2460 maprow *row = self->row + (y + my);
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2513 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2514 PUSHs (darkness3_sv);
2132} 2515}
2133 2516
2134SV * 2517SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2518get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2519 CODE:
2137{ 2520{
2138 int x, y, x1, y1; 2521 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2522 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2523 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2197 else 2580 else
2198 *data++ = 0; 2581 *data++ = 0;
2199 } 2582 }
2200 } 2583 }
2201 2584
2585 /* if size is w*h + 5 then no data has been found */
2586 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2587 {
2202 SvPOK_only (data_sv); 2588 SvPOK_only (data_sv);
2203 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2589 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590 }
2591
2204 RETVAL = data_sv; 2592 RETVAL = data_sv;
2205} 2593}
2206 OUTPUT: 2594 OUTPUT:
2207 RETVAL 2595 RETVAL
2208 2596
2209void 2597void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2598set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2211 PPCODE: 2599 PPCODE:
2212{ 2600{
2213 int x, y, z; 2601 int x, y, z;
2214 int w, h; 2602 int w, h;
2215 int x1, y1; 2603 int x1, y1;
2604 STRLEN len;
2605 uint8_t *data, *end;
2606
2607 len = SvLEN (data_sv);
2608 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609 data = SvPVbyte_nolen (data_sv);
2610 end = data + len + 8;
2611
2612 if (len < 5)
2613 XSRETURN_EMPTY;
2216 2614
2217 if (*data++ != 0) 2615 if (*data++ != 0)
2218 return; /* version mismatch */ 2616 XSRETURN_EMPTY; /* version mismatch */
2219 2617
2220 w = *data++ << 8; w |= *data++; 2618 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2619 h = *data++ << 8; h |= *data++;
2222 2620
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2621 // we need to do this 'cause we don't keep an absolute coord system for rows
2235 { 2633 {
2236 maprow *row = map_get_row (self, y); 2634 maprow *row = map_get_row (self, y);
2237 2635
2238 for (x = x0; x < x1; x++) 2636 for (x = x0; x < x1; x++)
2239 { 2637 {
2638 uint8_t flags;
2639
2640 if (data + 7 >= end)
2641 XSRETURN_EMPTY;
2642
2240 uint8_t flags = *data++; 2643 flags = *data++;
2241 2644
2242 if (flags) 2645 if (flags)
2243 { 2646 {
2244 mapcell *cell = row_get_cell (row, x); 2647 mapcell *cell = row_get_cell (row, x);
2245 tileid tile[3] = { 0, 0, 0 }; 2648 tileid tile[3] = { 0, 0, 0 };
2248 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2651 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2249 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2652 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2250 2653
2251 if (cell->darkness == 0) 2654 if (cell->darkness == 0)
2252 { 2655 {
2253 cell->darkness = 0; 2656 /*cell->darkness = 0;*/
2657 EXTEND (SP, 3);
2254 2658
2255 for (z = 0; z <= 2; z++) 2659 for (z = 0; z <= 2; z++)
2256 { 2660 {
2257 tileid t = tile [z]; 2661 tileid t = tile [z];
2258 2662
2259 if (t >= self->texs || (t && !self->tex [t].name)) 2663 if (t >= self->texs || (t && !self->tex [t].name))
2260 { 2664 {
2261 XPUSHs (sv_2mortal (newSViv (t))); 2665 PUSHs (sv_2mortal (newSViv (t)));
2262 need_texid (self, t); 2666 need_texid (self, t);
2263 } 2667 }
2264 2668
2265 cell->tile [z] = t; 2669 cell->tile [z] = t;
2266 } 2670 }
2268 } 2672 }
2269 } 2673 }
2270 } 2674 }
2271} 2675}
2272 2676
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2677MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2678
2275CFPlus::RW 2679DC::RW
2276new (SV *class, SV *data_sv) 2680new (SV *class, SV *data_sv)
2277 CODE: 2681 CODE:
2278{ 2682{
2279 STRLEN datalen; 2683 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2684 char *data = SvPVbyte (data_sv, datalen);
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2686 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2687}
2284 OUTPUT: 2688 OUTPUT:
2285 RETVAL 2689 RETVAL
2286 2690
2287CFPlus::RW 2691DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2692new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2693 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2694 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2695 OUTPUT:
2292 RETVAL 2696 RETVAL
2293 2697
2294# fails on win32: 2698# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2699# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2700#void
2297#close (CFPlus::RW self) 2701#close (DC::RW self)
2298# CODE: 2702# CODE:
2299# (self->(close)) (self); 2703# (self->(close)) (self);
2300 2704
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2705MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2706
2303PROTOTYPES: DISABLE 2707PROTOTYPES: DISABLE
2304 2708
2305CFPlus::Channel 2709DC::Channel
2306find () 2710find ()
2307 CODE: 2711 CODE:
2308{ 2712{
2309 RETVAL = Mix_GroupAvailable (-1); 2713 RETVAL = Mix_GroupAvailable (-1);
2310 2714
2323} 2727}
2324 OUTPUT: 2728 OUTPUT:
2325 RETVAL 2729 RETVAL
2326 2730
2327void 2731void
2328halt (CFPlus::Channel self) 2732halt (DC::Channel self)
2329 CODE: 2733 CODE:
2330 Mix_HaltChannel (self); 2734 Mix_HaltChannel (self);
2331 2735
2332void 2736void
2333expire (CFPlus::Channel self, int ticks = -1) 2737expire (DC::Channel self, int ticks = -1)
2334 CODE: 2738 CODE:
2335 Mix_ExpireChannel (self, ticks); 2739 Mix_ExpireChannel (self, ticks);
2336 2740
2337void 2741void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2742fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2743 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2744 Mix_FadeOutChannel (self, ticks);
2341 2745
2342int 2746int
2343volume (CFPlus::Channel self, int volume) 2747volume (DC::Channel self, int volume)
2344 CODE: 2748 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2749 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2750 OUTPUT:
2347 RETVAL 2751 RETVAL
2348 2752
2349void 2753void
2350unregister_all_effects (CFPlus::Channel self) 2754unregister_all_effects (DC::Channel self)
2351 CODE: 2755 CODE:
2352 Mix_UnregisterAllEffects (self); 2756 Mix_UnregisterAllEffects (self);
2353 2757
2354void 2758void
2355set_panning (CFPlus::Channel self, int left, int right) 2759set_panning (DC::Channel self, int left, int right)
2356 CODE: 2760 CODE:
2357 left = CLAMP (left , 0, 255); 2761 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2762 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2763 Mix_SetPanning (self, left, right);
2360 2764
2361void 2765void
2362set_distance (CFPlus::Channel self, int distance) 2766set_distance (DC::Channel self, int distance)
2363 CODE: 2767 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2768 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2769
2366void 2770void
2367set_position (CFPlus::Channel self, int angle, int distance) 2771set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2772 CODE:
2369 2773
2370void 2774void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2776 CODE:
2373{ 2777{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2778 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2779 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2781}
2378 2782
2379void 2783void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2784set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2785 CODE:
2382 Mix_SetReverseStereo (self, flip); 2786 Mix_SetReverseStereo (self, flip);
2383 2787
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2789
2386PROTOTYPES: DISABLE 2790PROTOTYPES: DISABLE
2387 2791
2388CFPlus::MixChunk 2792DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2793new (SV *class, DC::RW rwops)
2390 CODE: 2794 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2795 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2796 OUTPUT:
2393 RETVAL 2797 RETVAL
2394 2798
2395void 2799void
2396DESTROY (CFPlus::MixChunk self) 2800DESTROY (DC::MixChunk self)
2397 CODE: 2801 CODE:
2398 Mix_FreeChunk (self); 2802 Mix_FreeChunk (self);
2399 2803
2400int 2804int
2401volume (CFPlus::MixChunk self, int volume = -1) 2805volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2806 CODE:
2403 if (items > 1) 2807 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2808 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2809 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2810 OUTPUT:
2407 RETVAL 2811 RETVAL
2408 2812
2409CFPlus::Channel 2813DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2814play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2815 CODE:
2412{ 2816{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2817 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2818
2415 if (RETVAL < 0) 2819 if (RETVAL < 0)
2422 } 2826 }
2423} 2827}
2424 OUTPUT: 2828 OUTPUT:
2425 RETVAL 2829 RETVAL
2426 2830
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2832
2429int 2833int
2430volume (int volume = -1) 2834volume (int volume = -1)
2431 PROTOTYPE: ;$ 2835 PROTOTYPE: ;$
2432 CODE: 2836 CODE:
2444void 2848void
2445halt () 2849halt ()
2446 CODE: 2850 CODE:
2447 Mix_HaltMusic (); 2851 Mix_HaltMusic ();
2448 2852
2449CFPlus::MixMusic 2853DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2854new (SV *class, DC::RW rwops)
2451 CODE: 2855 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2856 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2857 OUTPUT:
2454 RETVAL 2858 RETVAL
2455 2859
2456void 2860void
2457DESTROY (CFPlus::MixMusic self) 2861DESTROY (DC::MixMusic self)
2458 CODE: 2862 CODE:
2459 Mix_FreeMusic (self); 2863 Mix_FreeMusic (self);
2460 2864
2461int 2865int
2462play (CFPlus::MixMusic self, int loops = -1) 2866play (DC::MixMusic self, int loops = -1)
2463 CODE: 2867 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2868 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2869 OUTPUT:
2466 RETVAL 2870 RETVAL
2467 2871
2468void 2872void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2873fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2874 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2875 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2876
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2877MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2878
2475PROTOTYPES: ENABLE 2879PROTOTYPES: ENABLE
2476 2880
2477BOOT: 2881BOOT:
2478{ 2882{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2883 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2884 static const struct {
2481 const char *name; 2885 const char *name;
2482 IV iv; 2886 IV iv;
2483 } *civ, const_iv[] = { 2887 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2888# define const_iv(name) { # name, (IV)name }
2485 const_iv (GL_VENDOR), 2889 const_iv (GL_VENDOR),
2486 const_iv (GL_VERSION), 2890 const_iv (GL_VERSION),
2487 const_iv (GL_EXTENSIONS), 2891 const_iv (GL_EXTENSIONS),
2892 const_iv (GL_MAX_TEXTURE_UNITS),
2488 const_iv (GL_COLOR_MATERIAL), 2893 const_iv (GL_COLOR_MATERIAL),
2489 const_iv (GL_SMOOTH), 2894 const_iv (GL_SMOOTH),
2490 const_iv (GL_FLAT), 2895 const_iv (GL_FLAT),
2491 const_iv (GL_DITHER), 2896 const_iv (GL_DITHER),
2492 const_iv (GL_BLEND), 2897 const_iv (GL_BLEND),
2504 const_iv (GL_ZERO), 2909 const_iv (GL_ZERO),
2505 const_iv (GL_SRC_ALPHA), 2910 const_iv (GL_SRC_ALPHA),
2506 const_iv (GL_DST_ALPHA), 2911 const_iv (GL_DST_ALPHA),
2507 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2912 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2508 const_iv (GL_ONE_MINUS_DST_ALPHA), 2913 const_iv (GL_ONE_MINUS_DST_ALPHA),
2914 const_iv (GL_SRC_COLOR),
2915 const_iv (GL_DST_COLOR),
2916 const_iv (GL_ONE_MINUS_SRC_COLOR),
2917 const_iv (GL_ONE_MINUS_DST_COLOR),
2509 const_iv (GL_SRC_ALPHA_SATURATE), 2918 const_iv (GL_SRC_ALPHA_SATURATE),
2510 const_iv (GL_RGB), 2919 const_iv (GL_RGB),
2511 const_iv (GL_RGBA), 2920 const_iv (GL_RGBA),
2512 const_iv (GL_RGBA4), 2921 const_iv (GL_RGBA4),
2513 const_iv (GL_RGBA8), 2922 const_iv (GL_RGBA8),
2519 const_iv (GL_INTENSITY), 2928 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2929 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2930 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2931 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2932 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2933 const_iv (GL_COMPRESSED_ALPHA_ARB),
2934 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2935 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2936 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2937 const_iv (GL_COMPRESSED_RGB_ARB),
2938 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2939 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2940 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2941 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2942 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2943 const_iv (GL_TEXTURE_2D),
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2982 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2983 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2984 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2985 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2986 const_iv (GL_GENERATE_MIPMAP_HINT),
2987 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2988 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2989 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2990 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2991 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2992 const_iv (GL_V3F),
2577 const_iv (GL_T2F_V3F), 2993 const_iv (GL_T2F_V3F),
2578 const_iv (GL_T2F_N3F_V3F), 2994 const_iv (GL_T2F_N3F_V3F),
2995 const_iv (GL_FUNC_ADD),
2996 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2579# undef const_iv 2998# undef const_iv
2580 }; 2999 };
2581 3000
2582 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2583 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2584 3003
2585 texture_av = newAV (); 3004 texture_av = newAV ();
2586 AvREAL_off (texture_av); 3005 AvREAL_off (texture_av);
2587} 3006}
2588 3007
3008void
3009disable_GL_EXT_blend_func_separate ()
3010 CODE:
3011 gl.BlendFuncSeparate = 0;
3012 gl.BlendFuncSeparateEXT = 0;
3013
3014void
3015apple_nvidia_bug (int enable)
3016
2589char * 3017char *
2590gl_vendor () 3018gl_vendor ()
2591 CODE: 3019 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 3020 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 3021 OUTPUT:
2642 3070
2643void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3071void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2644 CODE: 3072 CODE:
2645 gl_BlendFuncSeparate (sa, da, saa, daa); 3073 gl_BlendFuncSeparate (sa, da, saa, daa);
2646 3074
3075# void glBlendEquation (int se)
3076
2647void glDepthMask (int flag) 3077void glDepthMask (int flag)
2648 3078
2649void glLogicOp (int opcode) 3079void glLogicOp (int opcode)
2650 3080
2651void glColorMask (int red, int green, int blue, int alpha) 3081void glColorMask (int red, int green, int blue, int alpha)
2685void glRotate (float angle, float x, float y, float z) 3115void glRotate (float angle, float x, float y, float z)
2686 CODE: 3116 CODE:
2687 glRotatef (angle, x, y, z); 3117 glRotatef (angle, x, y, z);
2688 3118
2689void glColor (float r, float g, float b, float a = 1.0) 3119void glColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @
2690 ALIAS: 3121 ALIAS:
2691 glColor_premultiply = 1 3122 glColor_premultiply = 1
2692 CODE: 3123 CODE:
2693 if (ix) 3124 if (ix)
2694 { 3125 {
2714 3145
2715void glRect (float x1, float y1, float x2, float y2) 3146void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 3147 CODE:
2717 glRectf (x1, y1, x2, y2); 3148 glRectf (x1, y1, x2, y2);
2718 3149
3150void glRect_lineloop (float x1, float y1, float x2, float y2)
3151 CODE:
3152 glBegin (GL_LINE_LOOP);
3153 glVertex2f (x1, y1);
3154 glVertex2f (x2, y1);
3155 glVertex2f (x2, y2);
3156 glVertex2f (x1, y2);
3157 glEnd ();
3158
2719PROTOTYPES: ENABLE 3159PROTOTYPES: ENABLE
2720 3160
2721void glBegin (int mode) 3161void glBegin (int mode)
2722 3162
2723void glEnd () 3163void glEnd ()
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3195void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 3196 CODE:
2757 if (gl.SeparableFilter2D) 3197 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3198 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 3199
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3200void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 3201
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3202void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 3203
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 3204void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 3205
2791 3231
2792void glEndList () 3232void glEndList ()
2793 3233
2794void glCallList (int list) 3234void glCallList (int list)
2795 3235
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 3237
2798PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2799 3239
2800void 3240void
2801find_widget (SV *self, NV x, NV y) 3241find_widget (SV *self, NV x, NV y)
2805 XPUSHs (self); 3245 XPUSHs (self);
2806} 3246}
2807 3247
2808BOOT: 3248BOOT:
2809{ 3249{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3250 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 3251
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3252 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3253 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3254 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3255 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 3256}
2817 3257
2818void 3258void
2819draw (SV *self) 3259draw (SV *self)
2820 CODE: 3260 CODE:
2824 NV x, y, w, h; 3264 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 3265 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 3266 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 3267 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 3268 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 3269 double draw_x, draw_y;
2831 3270
2832 if (!SvROK (self)) 3271 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3272 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 3273
2835 hv = (HV *)SvRV (self); 3274 hv = (HV *)SvRV (self);
2836 3275
2837 if (SvTYPE (hv) != SVt_PVHV) 3276 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3277 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 3278
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3279 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3280 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 3281
2843 if (!h || !w) 3282 if (!h || !w)
2863 { 3302 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3303 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 3304
2866 if (svp && SvTRUE (*svp)) 3305 if (svp && SvTRUE (*svp))
2867 { 3306 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3307 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 3308 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3309 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 3310 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 3311 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 3312 glVertex2f (w, 0);
2876 glEnd (); 3315 glEnd ();
2877 glDisable (GL_BLEND); 3316 glDisable (GL_BLEND);
2878 } 3317 }
2879 } 3318 }
2880#if 0 3319#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 3320 // draw borders, for debugging
2882 glPushMatrix; 3321 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 3322 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 3323 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 3324 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 3325 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 3326 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 3327 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 3328 glVertex2f (0 , h - 1);
2890 glEnd; 3329 glEnd ();
2891 glPopMatrix; 3330 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 3331#endif
2895 PUSHMARK (SP); 3332 PUSHMARK (SP);
2896 XPUSHs (self); 3333 XPUSHs (self);
2897 PUTBACK; 3334 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 3335 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines