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.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.282 by root, Fri Dec 5 14:50:01 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
34#include <SDL_endian.h> 39#include <SDL_endian.h>
35#include <SDL_image.h> 40#include <SDL_image.h>
36#include <SDL_mixer.h> 41#include <SDL_mixer.h>
37#include <SDL_opengl.h> 42#include <SDL_opengl.h>
38 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
39#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
40#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
41 51
42#include <glib/gmacros.h> 52#include <glib/gmacros.h>
43 53
44#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
45 66
46#ifndef _WIN32 67#ifndef _WIN32
47# include <sys/types.h> 68# include <sys/types.h>
48# include <sys/socket.h> 69# include <sys/socket.h>
49# include <netinet/in.h> 70# include <netinet/in.h>
50# include <netinet/tcp.h> 71# include <netinet/tcp.h>
51# include <inttypes.h> 72# include <inttypes.h>
52#endif 73#endif
53 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
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 85
56#define FOW_DARKNESS 32 86#define FOW_DARKNESS 16
57 87
58#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
60 90
61#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
62 92
63#if 0 93/* mask out modifiers we are not interested in */
64# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
65#else 95
66# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
67#endif
68 97
69static AV *texture_av; 98static AV *texture_av;
70 99
71static struct 100static struct
72{ 101{
109 av_push (texture_av, (SV *)(size_t)name); 138 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 139 glDeleteTextures (1, &name);
111} 140}
112 141
113#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
114 144
115#include "pango-font.c" 145#include "pango-font.c"
116#include "pango-fontmap.c" 146#include "pango-fontmap.c"
117#include "pango-render.c" 147#include "pango-render.c"
118 148
119typedef IV CFPlus__Channel; 149typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 150typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
123 153
124typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
125 155
126static int 156static int
127shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
128{ 158{
129 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
143 173
144typedef struct cf_layout { 174typedef struct cf_layout {
145 PangoLayout *pl; 175 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
147 int base_height; 177 int base_height;
148 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
149} *CFPlus__Layout; 180} *DC__Layout;
150 181
151static CFPlus__Font default_font; 182static DC__Font default_font;
152static PangoContext *opengl_context; 183static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
154 185
155static void 186static void
156substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
161#endif 192#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 194}
164 195
165static void 196static void
166layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
167{ 198{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
170 */ 201 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
172 203
173 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 206
176 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
177} 208}
178 209
179static void 210static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 212{
182 PangoRectangle rect; 213 PangoRectangle rect;
183 214
184 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
196 227
197typedef uint16_t tileid; 228typedef uint16_t tileid;
198typedef uint16_t faceid; 229typedef uint16_t faceid;
199 230
200typedef struct { 231typedef struct {
201 int name; 232 GLuint name;
202 int w, h; 233 int w, h;
203 float s, t; 234 float s, t;
204 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
205 tileid smoothtile; 236 tileid smoothtile;
206 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
207} maptex; 239} maptex;
208 240
209typedef struct { 241typedef struct {
210 uint32_t player; 242 uint32_t player;
211 tileid tile[3]; 243 tileid tile[3];
224 int faces; tileid *face2tile; // [faceid] 256 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 257 int texs; maptex *tex; // [tileid]
226 258
227 int32_t rows; 259 int32_t rows;
228 maprow *row; 260 maprow *row;
229} *CFPlus__Map; 261} *DC__Map;
230 262
231static char * 263static char *
232prepend (char *ptr, int sze, int inc) 264prepend (char *ptr, int sze, int inc)
233{ 265{
234 char *p; 266 char *p;
272 self->texs *= 2; 304 self->texs *= 2;
273 } 305 }
274} 306}
275 307
276static maprow * 308static maprow *
277map_get_row (CFPlus__Map self, int y) 309map_get_row (DC__Map self, int y)
278{ 310{
279 if (0 > y) 311 if (0 > y)
280 { 312 {
281 int extend = - y + MAP_EXTEND_Y; 313 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 314 Prepend (maprow, self->row, self->rows, extend);
320 352
321 return row->col + (x - row->c0); 353 return row->col + (x - row->c0);
322} 354}
323 355
324static mapcell * 356static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 357map_get_cell (DC__Map self, int x, int y)
326{ 358{
327 return row_get_cell (map_get_row (self, y), x); 359 return row_get_cell (map_get_row (self, y), x);
328} 360}
329 361
330static void 362static void
331map_clear (CFPlus__Map self) 363map_clear (DC__Map self)
332{ 364{
333 int r; 365 int r;
334 366
335 for (r = 0; r < self->rows; r++) 367 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 368 Safefree (self->row[r].col);
343 self->oy = 0; 375 self->oy = 0;
344 self->row = 0; 376 self->row = 0;
345 self->rows = 0; 377 self->rows = 0;
346} 378}
347 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
348static void 390static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 392{
351 int x, y; 393 int x, y;
352 maprow *row; 394 maprow *row;
353 mapcell *cell; 395 mapcell *cell;
354 396
366 if (x >= row->c1) 408 if (x >= row->c1)
367 break; 409 break;
368 410
369 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
370 412
371 cell->darkness = 0; 413 CELL_CLEAR (cell);
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
375 } 414 }
376 } 415 }
377} 416}
378 417
379typedef struct { 418typedef struct {
433 n |= n >> 16; 472 n |= n >> 16;
434 473
435 return n + 1; 474 return n + 1;
436} 475}
437 476
477static unsigned int
478popcount (unsigned int n)
479{
480 n -= (n >> 1) & 0x55555555U;
481 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
482 n = ((n >> 4) + n) & 0x0f0f0f0fU;
483 n *= 0x01010101U;
484
485 return n >> 24;
486}
487
438/* SDL should provide this, really. */ 488/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 489#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 490#define SDLK_MODIFIER_MAX 314
441 491
442/******************************************************************************/ 492/******************************************************************************/
480 return 0; 530 return 0;
481 531
482 return 1; 532 return 1;
483} 533}
484 534
485MODULE = CFPlus PACKAGE = CFPlus 535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
586
587MODULE = Deliantra::Client PACKAGE = DC
486 588
487PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
488 590
489BOOT: 591BOOT:
490{ 592{
491 HV *stash = gv_stashpv ("CFPlus", 1); 593 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 594 static const struct {
493 const char *name; 595 const char *name;
494 IV iv; 596 IV iv;
495 } *civ, const_iv[] = { 597 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 598# define const_iv(name) { # name, (IV)name }
518 620
519 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
522 624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
674
675 const_iv (SDLK_FIRST),
676 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 679 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 680 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 681 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 753 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
758
759 const_iv (KMOD_LRAM),
760
761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
604# undef const_iv 791# undef const_iv
605 }; 792 };
606 793
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 813
627NV floor (NV x) 814NV floor (NV x)
628 815
629NV ceil (NV x) 816NV ceil (NV x)
630 817
818IV minpot (UV n)
819
820IV popcount (UV n)
821
631void 822void
632pango_init () 823pango_init ()
633 CODE: 824 CODE:
634{ 825{
635 opengl_fontmap = pango_opengl_font_map_new (); 826 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 827 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 828 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
829 /*pango_context_set_font_description (opengl_context, default_font);*/
830#if PANGO_VERSION_CHECK (1, 15, 2)
831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
833#endif
638} 834}
639 835
640char *
641SDL_GetError () 836char *SDL_GetError ()
642 837
643int 838void SDL_braino ()
644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
645 839
646void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
647SDL_Quit () 846void SDL_Quit ()
847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
648 856
649void 857void
650SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
651 PPCODE: 859 PPCODE:
652{ 860{
664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667 875
668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669#if SDL_VERSION_ATLEAST(1,2,10)
670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
673 878
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 880
676 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
677 while (*m) 882 while (*m)
678 { 883 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
680 { 885 {
681 AV *av = newAV (); 886 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
708 913
709 if (RETVAL) 914 if (RETVAL)
710 { 915 {
711 av_clear (texture_av); 916 av_clear (texture_av);
712 917
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 920#include "glfunc.h"
716#undef GL_FUNC 921#undef GL_FUNC
717 } 922 }
718} 923}
725char * 930char *
726SDL_GetKeyName (int sym) 931SDL_GetKeyName (int sym)
727 932
728int 933int
729SDL_GetAppState () 934SDL_GetAppState ()
935
936int
937SDL_GetModState ()
730 938
731void 939void
732poll_events () 940poll_events ()
733 PPCODE: 941 PPCODE:
734{ 942{
744 { 952 {
745 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
746 case SDL_KEYUP: 954 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 957 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 958 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 960 break;
753 961
754 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 981 x = ev.motion.x;
774 y = ev.motion.y; 982 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 984 }
777 985
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 992 }
785 break; 993 break;
786 994
787 case SDL_MOUSEBUTTONDOWN: 995 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 996 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 997 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 998
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 999 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1000 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1001 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1002 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1007 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1008 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 1009 break;
802 } 1010 }
803 1011
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 1013 }
806} 1014}
807 1015
808int 1016int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 1018 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 1019 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 1020 Mix_ChannelFinished (channel_finished);
813 1021
814void 1022void
1023Mix_QuerySpec ()
1024 PPCODE:
1025{
1026 int freq, channels;
1027 Uint16 format;
1028
1029 if (Mix_QuerySpec (&freq, &format, &channels))
1030 {
1031 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (freq)));
1033 PUSHs (sv_2mortal (newSViv (format)));
1034 PUSHs (sv_2mortal (newSViv (channels)));
1035 }
1036}
1037
1038void
815Mix_CloseAudio () 1039Mix_CloseAudio ()
816 1040
817int 1041int
818Mix_AllocateChannels (int numchans = -1) 1042Mix_AllocateChannels (int numchans = -1)
1043
1044const char *
1045Mix_GetError ()
819 1046
820void 1047void
821lowdelay (int fd, int val = 1) 1048lowdelay (int fd, int val = 1)
822 CODE: 1049 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1050 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 1076 }
850 } 1077 }
851#endif 1078#endif
852} 1079}
853 1080
854void 1081int
855add_font (char *file) 1082add_font (char *file)
856 CODE: 1083 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
858 1087
859void 1088void
860load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
861 ALIAS: 1090 ALIAS:
862 load_image_file = 1 1091 load_image_file = 1
948void 1177void
949error (char *message) 1178error (char *message)
950 CODE: 1179 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1181#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1183#endif
955 1184
956void 1185void
957fatal (char *message) 1186fatal (char *message)
958 CODE: 1187 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1189#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1191#endif
963 _exit (1); 1192 _exit (1);
964 1193
965void 1194void
966_exit (int retval = 0) 1195_exit (int retval = 0)
978#if DEBUG 1207#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
980#endif 1209#endif
981} 1210}
982 1211
983MODULE = CFPlus PACKAGE = CFPlus::Font 1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1219MODULE = Deliantra::Client PACKAGE = DC::Font
984 1220
985PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
986 1222
987CFPlus::Font 1223DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1225 CODE:
990{ 1226{
991 int count; 1227 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1231}
996 OUTPUT: 1232 OUTPUT:
997 RETVAL 1233 RETVAL
998 1234
999void 1235void
1000DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
1001 CODE: 1237 CODE:
1002 pango_font_description_free (self); 1238 pango_font_description_free (self);
1003 1239
1004void 1240void
1005make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1006 PROTOTYPE: $ 1242 PROTOTYPE: $
1007 CODE: 1243 CODE:
1008 default_font = self; 1244 default_font = self;
1009 1245
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1247
1012PROTOTYPES: DISABLE 1248PROTOTYPES: DISABLE
1013 1249
1014void 1250void
1015reset_glyph_cache () 1251glyph_cache_backup ()
1016 PROTOTYPE: 1252 PROTOTYPE:
1017 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
1018 tc_clear (); 1260 tc_restore ();
1019 1261
1020CFPlus::Layout 1262DC::Layout
1021new (SV *class) 1263new (SV *class)
1022 CODE: 1264 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
1024 1266
1025 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1269 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1270 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1271 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1272 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1273 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1032 1275
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
1035 OUTPUT: 1278 OUTPUT:
1036 RETVAL 1279 RETVAL
1037 1280
1038void 1281void
1039DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
1040 CODE: 1283 CODE:
1041 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1285 rc_free (self->rc);
1042 Safefree (self); 1286 Safefree (self);
1043 1287
1044void 1288void
1045set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
1046 CODE: 1290 CODE:
1047{ 1291{
1048 STRLEN textlen; 1292 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1050 1294
1051 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
1052} 1296}
1053 1297
1054void 1298void
1055set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
1056 CODE: 1300 CODE:
1057{ 1301{
1058 STRLEN textlen; 1302 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1060 1304
1061 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
1062} 1306}
1063 1307
1064void 1308void
1065set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
1066 CODE: 1310 CODE:
1067{ 1311{
1068 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1314 const char *pos = text;
1105 if (attrs) 1349 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
1107} 1351}
1108 1352
1109void 1353void
1110get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
1111 PPCODE: 1355 PPCODE:
1112{ 1356{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1358
1115 do 1359 do
1116 { 1360 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1362
1119 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1120 { 1364 {
1121 PangoRectangle extents; 1365 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1374
1131 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1132} 1376}
1133 1377
1134int 1378int
1135has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1136 CODE: 1380 CODE:
1137{ 1381{
1138 int lines = 1; 1382 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1140 1384
1145} 1389}
1146 OUTPUT: 1390 OUTPUT:
1147 RETVAL 1391 RETVAL
1148 1392
1149SV * 1393SV *
1150get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1151 CODE: 1395 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1398 OUTPUT:
1155 RETVAL 1399 RETVAL
1156 1400
1157void 1401void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1402set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1403 CODE:
1160 self->r = r; 1404 self->r = r;
1161 self->g = g; 1405 self->g = g;
1162 self->b = b; 1406 self->b = b;
1163 self->a = a; 1407 self->a = a;
1164 1408
1165void 1409void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1411 CODE:
1168 if (self->font != font) 1412 if (self->font != font)
1169 { 1413 {
1170 self->font = font; 1414 self->font = font;
1171 layout_update_font (self); 1415 layout_update_font (self);
1172 } 1416 }
1173 1417
1174void 1418void
1175set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1176 CODE: 1420 CODE:
1177 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1178 { 1422 {
1179 self->base_height = base_height; 1423 self->base_height = base_height;
1180 layout_update_font (self); 1424 layout_update_font (self);
1181 } 1425 }
1182 1426
1183void 1427void
1184set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1429 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1430 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1431
1188void 1432void
1189set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1190 CODE: 1434 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1436
1193void 1437void
1194set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1195 CODE: 1439 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1441
1198void 1442void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1444 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1206 ); 1450 );
1207 1451
1208void 1452void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1454 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1456
1213void 1457void
1214size (CFPlus::Layout self) 1458size (DC::Layout self)
1215 PPCODE: 1459 PPCODE:
1216{ 1460{
1217 int w, h; 1461 int w, h;
1218 1462
1219 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1224} 1468}
1225 1469
1226int 1470int
1227descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1228 CODE: 1472 CODE:
1229{ 1473{
1230 PangoRectangle rect; 1474 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1234} 1478}
1235 OUTPUT: 1479 OUTPUT:
1236 RETVAL 1480 RETVAL
1237 1481
1238int 1482int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1484 CODE:
1241{ 1485{
1242 int index, trailing; 1486 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1487 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1245} 1489}
1246 OUTPUT: 1490 OUTPUT:
1247 RETVAL 1491 RETVAL
1248 1492
1249void 1493void
1250cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1495 PPCODE:
1252{ 1496{
1253 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1499
1256 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1504}
1261 1505
1262void 1506void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1508 PPCODE:
1265{ 1509{
1266 int line, x; 1510 int line, x;
1267 1511
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1512 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1513#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1515 --line;
1516#endif
1271 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1520}
1275 1521
1276void 1522void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1524 PPCODE:
1279{ 1525{
1280 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1281 int index, trailing; 1527 int index, trailing;
1282 1528
1283 if (line < 0) 1529 if (line < 0)
1284 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1285 1531
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1288 1534
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1535 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1536
1291 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1544 }
1299} 1545}
1300 1546
1301void 1547void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1549 CODE:
1550 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1305 self->pl, 1552 self->pl,
1553 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1554 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1555 self->r, self->g, self->b, self->a,
1308 flags 1556 flags
1309 ); 1557 );
1558 // we assume that context_change actually clears/frees stuff
1559 // and does not do any recomputation...
1560 pango_layout_context_changed (self->pl);
1310 1561
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1562void
1563draw (DC::Layout self)
1564 CODE:
1565{
1566 glEnable (GL_TEXTURE_2D);
1567 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1568 glEnable (GL_BLEND);
1569 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1570 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1571 glEnable (GL_ALPHA_TEST);
1572 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1573
1574 rc_draw (self->rc);
1575
1576 glDisable (GL_ALPHA_TEST);
1577 glDisable (GL_BLEND);
1578 glDisable (GL_TEXTURE_2D);
1579}
1580
1581MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1582
1313PROTOTYPES: ENABLE 1583PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1584
1317void 1585void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1586pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1587 CODE:
1320{ 1588{
1347 HV *hv = (HV *)SvRV (self); 1615 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1616 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1617 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1618 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1619
1620 if (name <= 0)
1621 XSRETURN_EMPTY;
1622
1352 if (items < 5) 1623 if (items < 5)
1353 { 1624 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1625 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1626 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1627 }
1394 RETVAL = width > 0; 1665 RETVAL = width > 0;
1395} 1666}
1396 OUTPUT: 1667 OUTPUT:
1397 RETVAL 1668 RETVAL
1398 1669
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1671
1401PROTOTYPES: DISABLE 1672PROTOTYPES: DISABLE
1402 1673
1403CFPlus::Map 1674DC::Map
1404new (SV *class) 1675new (SV *class)
1405 CODE: 1676 CODE:
1406 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1678 RETVAL->x = 0;
1408 RETVAL->y = 0; 1679 RETVAL->y = 0;
1416 RETVAL->row = 0; 1687 RETVAL->row = 0;
1417 OUTPUT: 1688 OUTPUT:
1418 RETVAL 1689 RETVAL
1419 1690
1420void 1691void
1421DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1422 CODE: 1693 CODE:
1423{ 1694{
1424 map_clear (self); 1695 map_clear (self);
1425 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1426 Safefree (self->tex); 1697 Safefree (self->tex);
1427 Safefree (self); 1698 Safefree (self);
1428} 1699}
1429 1700
1430void 1701void
1431resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1703 CODE:
1433 self->w = map_width; 1704 self->w = map_width;
1434 self->h = map_height; 1705 self->h = map_height;
1435 1706
1436void 1707void
1437clear (CFPlus::Map self) 1708clear (DC::Map self)
1438 CODE: 1709 CODE:
1439 map_clear (self); 1710 map_clear (self);
1440 1711
1441void 1712void
1442set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1714 CODE:
1444{ 1715{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1717 need_texid (self, tile);
1447} 1718}
1448 1719
1449void 1720void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1722 CODE:
1452{ 1723{
1453 tileid texid; 1724 tileid texid;
1454 maptex *tex; 1725 maptex *tex;
1455 1726
1468 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1470} 1741}
1471 1742
1472void 1743void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1744set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1745 CODE:
1475{ 1746{
1476 need_texid (self, texid); 1747 need_texid (self, texid);
1477 1748
1478 { 1749 {
1497 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1498 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1771}
1501 1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0;
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1792
1502int 1793int
1503ox (CFPlus::Map self) 1794ox (DC::Map self)
1504 ALIAS: 1795 ALIAS:
1505 oy = 1 1796 oy = 1
1506 x = 2 1797 x = 2
1507 y = 3 1798 y = 3
1508 w = 4 1799 w = 4
1519 } 1810 }
1520 OUTPUT: 1811 OUTPUT:
1521 RETVAL 1812 RETVAL
1522 1813
1523void 1814void
1524scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1525 CODE: 1816 CODE:
1526{ 1817{
1527 if (dx > 0) 1818 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1820 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1835 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1546 } 1837 }
1547} 1838}
1548 1839
1549void 1840SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1842 CODE:
1552{ 1843{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1846 mapcell *cell;
1556 int x, y, flags; 1847 int x, y, z, flags;
1848 AV *missing = newAV ();
1849 RETVAL = newRV_noinc ((SV *)missing);
1557 1850
1558 while (data < data_end - 1) 1851 while (data < data_end - 1)
1559 { 1852 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1853 flags = (data [0] << 8) + data [1]; data += 2;
1561 1854
1581 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1582 1875
1583 do 1876 do
1584 { 1877 {
1585 ext = *data++; 1878 ext = *data++;
1586 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1587 1880
1588 if (cmd < 4) 1881 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1591 { 1884 {
1594 } 1887 }
1595 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1598 { 1891 {
1599 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1896
1602 data += *data + 1; 1897 data += *data + 1;
1603 } 1898 }
1604 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1900 cell->flags = *data++;
1612 } 1907 }
1613 else 1908 else
1614 cell->darkness = *data++ + 1; 1909 cell->darkness = *data++ + 1;
1615 } 1910 }
1616 1911
1912 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1913 if (flags & (4 >> z))
1618 { 1914 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1915 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1916 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1918
1919 if (cell->tile [z])
1920 {
1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1923 if (!tex->name)
1924 av_push (missing, newSViv (cell->tile [z]));
1925
1926 if (tex->smoothtile)
1927 {
1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1930 if (!smooth->name)
1931 av_push (missing, newSViv (tex->smoothtile));
1932 }
1933 }
1622 } 1934 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1935 }
1638 else 1936 else
1639 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1640 } 1938 }
1641} 1939}
1940 OUTPUT:
1941 RETVAL
1642 1942
1643SV * 1943SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1945 CODE:
1646{ 1946{
1647 int x1, x; 1947 int x1, x;
1648 int y1, y; 1948 int y1, y;
1649 int z; 1949 int z;
1694} 1994}
1695 OUTPUT: 1995 OUTPUT:
1696 RETVAL 1996 RETVAL
1697 1997
1698void 1998void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1700 CODE: 2000 CODE:
1701{ 2001{
2002 int x, y, z;
2003
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 2007 smooth_key skey;
1706 int x, y, z; 2008 int pl_x, pl_y;
1707 int last_name; 2009 maptex pl_tex;
2010 rc_t *rc = rc_alloc ();
2011 rc_key_t key;
2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1708 2015
1709 // thats current max. sorry. 2016 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1712 2019
1713 // clear key, in case of extra padding 2020 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 2021 memset (&skey, 0, sizeof (skey));
1715 2022
1716 glColor4ub (255, 255, 255, 255); 2023 memset (&key, 0, sizeof (key));
1717 2024 key.r = 255;
1718 glEnable (GL_BLEND); 2025 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 2027 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2028 key.mode = GL_QUADS;
1722 2029 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 2030 key.texname = -1;
1724
1725 last_name = 0;
1726 2031
1727 mx += self->x; 2032 mx += self->x;
1728 my += self->y; 2033 my += self->y;
1729 2034
1730 // first pass: determine smooth_max 2035 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 2051 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 2052 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 2053 self->tex [cell->tile [2]].smoothlevel));
1749 } 2054 }
1750 } 2055 }
2056
2057 glEnable (GL_BLEND);
2058 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2059 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 2060
1752 for (z = 0; z <= 2; z++) 2061 for (z = 0; z <= 2; z++)
1753 { 2062 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 2063 memset (smooth_level, 0, sizeof (smooth_level));
1755 2064
1768 { 2077 {
1769 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1772 2081
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 2082 if (key.texname != tex.name)
1776 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1777 if (!tex.name) 2086 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1779 2088
1780 glEnd (); 2089 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2090 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 2091 }
1784 2092
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
2100
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 2109 if (cell->flags & 1)
1793 { 2110 {
1794 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 2112 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 2113 int py = y * T - T * 6 / 32;
1797 2114
2115 if (tex.name)
1798 glEnd (); 2116 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 2127 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 2128 }
1807 } 2129 }
1808 2130
1809 // update smooth hash 2131 // update smooth hash
1810 if (tex.smoothtile) 2132 if (tex.smoothtile)
1846 } 2168 }
1847 } 2169 }
1848 } 2170 }
1849 } 2171 }
1850 2172
2173 rc_draw (rc);
2174 rc_clear (rc);
2175
1851 // go through all smoothlevels, lowest to highest, then draw. 2176 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 2177 // this is basically counting sort
1853 { 2178 {
1854 int w, b; 2179 int w, b;
1855 2180
2181 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2183 for (w = 0; w < 256 / 32; ++w)
1857 { 2184 {
1858 uint32_t smask = smooth_level [w]; 2185 uint32_t smask = smooth_level [w];
1859 if (smask) 2186 if (smask)
1860 for (b = 0; b < 32; ++b) 2187 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2206 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2207 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2208 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2209 float dy = tex.t * .5f ; // 2 images/column
1883 2210
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2211 if (tex.name)
1887 { 2212 {
2213 // this time avoiding texture state changes
2214 // save gobs of state changes.
1888 if (!tex.name) 2215 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2216 {
2217 self->tex [skey->tile].unused = 0;
1890 2218
1891 glEnd (); 2219 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
1894 } 2222 }
1895 2223
1896 if (border) 2224 if (border)
1897 { 2225 {
1898 float ox = border * dx; 2226 float ox = border * dx;
1899 2227
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2232 }
1905 2233
1906 if (corner) 2234 if (corner)
1907 { 2235 {
1908 float ox = corner * dx; 2236 float ox = corner * dx;
1909 2237
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2238 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2242 }
1914 } 2243 }
1915 } 2244 }
1916 } 2245 }
1917 } 2246 }
1918 } 2247 }
2248
2249 glEnd ();
2250 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1;
1919 } 2252 }
1920 2253
1921 hv_clear (smooth); 2254 hv_clear (smooth);
1922 } 2255 }
1923 2256
1924 glEnd (); 2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
1925 2262
1926 glDisable (GL_TEXTURE_2D); 2263 key.texname = tex.name;
2264 arr = rc_array (rc, &key);
2265
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270
2271 rc_draw (rc);
2272 }
2273
1927 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2275 rc_free (rc);
1928 2276
1929 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2279 if (0 <= y + my && y + my < self->rows)
1932 { 2280 {
1937 { 2285 {
1938 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
1939 2287
1940 int px = x * T; 2288 int px = x * T;
1941 int py = y * T; 2289 int py = y * T;
2290
2291 if (expect_false (cell->player == player))
2292 {
2293 px += sdx;
2294 py += sdy;
2295 }
1942 2296
1943 if (cell->stat_hp) 2297 if (cell->stat_hp)
1944 { 2298 {
1945 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1957 } 2311 }
1958 } 2312 }
1959} 2313}
1960 2314
1961void 2315void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2317 CODE:
1964{ 2318{
1965 static float color[16][3] = { 2319 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2320 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2321 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2371 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2372 glDisable (GL_TEXTURE_2D);
2019} 2373}
2020 2374
2021void 2375void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2376fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2377 PPCODE:
2024{ 2378{
2025 int x, y; 2379 int x, y;
2026 int sw1 = sw + 2; 2380 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2381 int sh1 = sh + 2;
2035 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2036 2390
2037 mx += self->x - 1; 2391 mx += self->x - 1;
2038 my += self->y - 1; 2392 my += self->y - 1;
2039 2393
2040 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2041 2395
2042 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2043 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2044 { 2398 {
2045 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2452 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2453 PUSHs (darkness3_sv);
2100} 2454}
2101 2455
2102SV * 2456SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2457get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2458 CODE:
2105{ 2459{
2106 int x, y, x1, y1; 2460 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2461 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2462 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2519 else
2166 *data++ = 0; 2520 *data++ = 0;
2167 } 2521 }
2168 } 2522 }
2169 2523
2524 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 {
2170 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2172 RETVAL = data_sv; 2531 RETVAL = data_sv;
2173} 2532}
2174 OUTPUT: 2533 OUTPUT:
2175 RETVAL 2534 RETVAL
2176 2535
2177void 2536void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2538 PPCODE:
2180{ 2539{
2181 int x, y, z; 2540 int x, y, z;
2182 int w, h; 2541 int w, h;
2183 int x1, y1; 2542 int x1, y1;
2543 STRLEN len;
2544 uint8_t *data, *end;
2545
2546 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv);
2549 end = data + len + 8;
2550
2551 if (len < 5)
2552 XSRETURN_EMPTY;
2184 2553
2185 if (*data++ != 0) 2554 if (*data++ != 0)
2186 return; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2187 2556
2188 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2558 h = *data++ << 8; h |= *data++;
2190 2559
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2560 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2572 {
2204 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2205 2574
2206 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2207 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2208 uint8_t flags = *data++; 2582 flags = *data++;
2209 2583
2210 if (flags) 2584 if (flags)
2211 { 2585 {
2212 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2592
2219 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2220 { 2594 {
2221 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2222 2597
2223 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2224 { 2599 {
2225 tileid t = tile [z]; 2600 tileid t = tile [z];
2226 2601
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2603 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2605 need_texid (self, t);
2231 } 2606 }
2232 2607
2233 cell->tile [z] = t; 2608 cell->tile [z] = t;
2234 } 2609 }
2236 } 2611 }
2237 } 2612 }
2238 } 2613 }
2239} 2614}
2240 2615
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2616MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2617
2243CFPlus::RW 2618DC::RW
2244new (SV *class, SV *data_sv) 2619new (SV *class, SV *data_sv)
2245 CODE: 2620 CODE:
2246{ 2621{
2247 STRLEN datalen; 2622 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2623 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2625 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2626}
2252 OUTPUT: 2627 OUTPUT:
2253 RETVAL 2628 RETVAL
2254 2629
2255CFPlus::RW 2630DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2631new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2632 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2633 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2634 OUTPUT:
2260 RETVAL 2635 RETVAL
2261 2636
2637# fails on win32:
2638# dc.xs(2268) : error C2059: syntax error : '('
2262void 2639#void
2263close (CFPlus::RW self) 2640#close (DC::RW self)
2264 CODE: 2641# CODE:
2265 SDL_RWclose (self); 2642# (self->(close)) (self);
2266 2643
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2644MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2645
2269PROTOTYPES: DISABLE 2646PROTOTYPES: DISABLE
2270 2647
2271void 2648DC::Channel
2272halt (CFPlus::Channel self) 2649find ()
2273 CODE: 2650 CODE:
2651{
2652 RETVAL = Mix_GroupAvailable (-1);
2653
2654 if (RETVAL < 0)
2655 {
2656 RETVAL = Mix_GroupOldest (-1);
2657
2658 if (RETVAL < 0)
2659 XSRETURN_UNDEF;
2660
2274 Mix_HaltChannel (self); 2661 Mix_HaltChannel (RETVAL);
2662 }
2275 2663
2276void 2664 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2665 Mix_Volume (RETVAL, 128);
2278 CODE: 2666}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2667 OUTPUT:
2291 RETVAL 2668 RETVAL
2292 2669
2293void 2670void
2671halt (DC::Channel self)
2672 CODE:
2673 Mix_HaltChannel (self);
2674
2675void
2676expire (DC::Channel self, int ticks = -1)
2677 CODE:
2678 Mix_ExpireChannel (self, ticks);
2679
2680void
2681fade_out (DC::Channel self, int ticks = -1)
2682 CODE:
2683 Mix_FadeOutChannel (self, ticks);
2684
2685int
2686volume (DC::Channel self, int volume)
2687 CODE:
2688 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2689 OUTPUT:
2690 RETVAL
2691
2692void
2294unregister_all_effects (CFPlus::Channel self) 2693unregister_all_effects (DC::Channel self)
2295 CODE: 2694 CODE:
2296 Mix_UnregisterAllEffects (self); 2695 Mix_UnregisterAllEffects (self);
2297 2696
2298void 2697void
2299set_panning (CFPlus::Channel self, int left, int right) 2698set_panning (DC::Channel self, int left, int right)
2300 CODE: 2699 CODE:
2700 left = CLAMP (left , 0, 255);
2701 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2702 Mix_SetPanning (self, left, right);
2302 2703
2303void 2704void
2304set_distance (CFPlus::Channel self, int distance) 2705set_distance (DC::Channel self, int distance)
2305 CODE: 2706 CODE:
2306 Mix_SetDistance (self, distance); 2707 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2708
2308void 2709void
2309set_position (CFPlus::Channel self, int angle, int distance) 2710set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2711 CODE:
2712
2713void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE:
2716{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720}
2312 2721
2313void 2722void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2723set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2724 CODE:
2316 Mix_SetReverseStereo (self, flip); 2725 Mix_SetReverseStereo (self, flip);
2317 2726
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2728
2320PROTOTYPES: DISABLE 2729PROTOTYPES: DISABLE
2321 2730
2322CFPlus::MixChunk 2731DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2732new (SV *class, DC::RW rwops)
2324 CODE: 2733 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2734 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2735 OUTPUT:
2327 RETVAL 2736 RETVAL
2328 2737
2329void 2738void
2330DESTROY (CFPlus::MixChunk self) 2739DESTROY (DC::MixChunk self)
2331 CODE: 2740 CODE:
2332 Mix_FreeChunk (self); 2741 Mix_FreeChunk (self);
2333 2742
2334int 2743int
2335volume (CFPlus::MixChunk self, int volume = -1) 2744volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2745 CODE:
2746 if (items > 1)
2747 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2748 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2749 OUTPUT:
2339 RETVAL 2750 RETVAL
2340 2751
2341CFPlus::Channel 2752DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2753play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2754 CODE:
2755{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2756 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2757
2758 if (RETVAL < 0)
2759 XSRETURN_UNDEF;
2760
2761 if (channel < 0)
2762 {
2345 Mix_UnregisterAllEffects (RETVAL); 2763 Mix_UnregisterAllEffects (RETVAL);
2764 Mix_Volume (RETVAL, 128);
2765 }
2766}
2346 OUTPUT: 2767 OUTPUT:
2347 RETVAL 2768 RETVAL
2348 2769
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2771
2351int 2772int
2352volume (int volume = -1) 2773volume (int volume = -1)
2353 PROTOTYPE: ;$ 2774 PROTOTYPE: ;$
2354 CODE: 2775 CODE:
2776 if (items > 0)
2777 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2778 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2779 OUTPUT:
2357 RETVAL 2780 RETVAL
2358 2781
2359void 2782void
2364void 2787void
2365halt () 2788halt ()
2366 CODE: 2789 CODE:
2367 Mix_HaltMusic (); 2790 Mix_HaltMusic ();
2368 2791
2369CFPlus::MixMusic 2792DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2793new (SV *class, DC::RW rwops)
2371 CODE: 2794 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2795 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2796 OUTPUT:
2374 RETVAL 2797 RETVAL
2375 2798
2376void 2799void
2377DESTROY (CFPlus::MixMusic self) 2800DESTROY (DC::MixMusic self)
2378 CODE: 2801 CODE:
2379 Mix_FreeMusic (self); 2802 Mix_FreeMusic (self);
2380 2803
2381int 2804int
2382play (CFPlus::MixMusic self, int loops = -1) 2805play (DC::MixMusic self, int loops = -1)
2383 CODE: 2806 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2807 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2808 OUTPUT:
2386 RETVAL 2809 RETVAL
2387 2810
2388void 2811void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2812fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2813 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2814 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2815
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2816MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2817
2395PROTOTYPES: ENABLE 2818PROTOTYPES: ENABLE
2396 2819
2397BOOT: 2820BOOT:
2398{ 2821{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2822 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2823 static const struct {
2401 const char *name; 2824 const char *name;
2402 IV iv; 2825 IV iv;
2403 } *civ, const_iv[] = { 2826 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2827# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2862 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2863 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2864 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2865 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2866 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2867 const_iv (GL_COMPRESSED_ALPHA_ARB),
2868 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2869 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2870 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2871 const_iv (GL_COMPRESSED_RGB_ARB),
2872 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2873 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2874 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2875 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2876 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2877 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2916 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2917 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2918 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2919 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2920 const_iv (GL_GENERATE_MIPMAP_HINT),
2921 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2922 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2923 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2924 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2925 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2926 const_iv (GL_V3F),
2504 2934
2505 texture_av = newAV (); 2935 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2936 AvREAL_off (texture_av);
2507} 2937}
2508 2938
2939void
2940disable_GL_EXT_blend_func_separate ()
2941 CODE:
2942 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0;
2944
2509char * 2945char *
2510gl_vendor () 2946gl_vendor ()
2511 CODE: 2947 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2948 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2949 OUTPUT:
2605void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2606 CODE: 3042 CODE:
2607 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2608 3044
2609void glColor (float r, float g, float b, float a = 1.0) 3045void glColor (float r, float g, float b, float a = 1.0)
3046 PROTOTYPE: @
2610 ALIAS: 3047 ALIAS:
2611 glColor_premultiply = 1 3048 glColor_premultiply = 1
2612 CODE: 3049 CODE:
2613 if (ix) 3050 if (ix)
2614 { 3051 {
2634 3071
2635void glRect (float x1, float y1, float x2, float y2) 3072void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 3073 CODE:
2637 glRectf (x1, y1, x2, y2); 3074 glRectf (x1, y1, x2, y2);
2638 3075
3076void glRect_lineloop (float x1, float y1, float x2, float y2)
3077 CODE:
3078 glBegin (GL_LINE_LOOP);
3079 glVertex2f (x1, y1);
3080 glVertex2f (x2, y1);
3081 glVertex2f (x2, y2);
3082 glVertex2f (x1, y2);
3083 glEnd ();
3084
2639PROTOTYPES: ENABLE 3085PROTOTYPES: ENABLE
2640 3086
2641void glBegin (int mode) 3087void glBegin (int mode)
2642 3088
2643void glEnd () 3089void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3121void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 3122 CODE:
2677 if (gl.SeparableFilter2D) 3123 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3124 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 3125
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3126void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 3127
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3128void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 3129
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 3130void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 3131
2711 3157
2712void glEndList () 3158void glEndList ()
2713 3159
2714void glCallList (int list) 3160void glCallList (int list)
2715 3161
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 3163
2718PROTOTYPES: DISABLE 3164PROTOTYPES: DISABLE
2719 3165
2720void 3166void
2721find_widget (SV *self, NV x, NV y) 3167find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 3171 XPUSHs (self);
2726} 3172}
2727 3173
2728BOOT: 3174BOOT:
2729{ 3175{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3176 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 3177
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3178 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3179 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3180 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3181 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 3182}
2737 3183
2738void 3184void
2739draw (SV *self) 3185draw (SV *self)
2740 CODE: 3186 CODE:
2744 NV x, y, w, h; 3190 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 3191 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 3192 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 3193 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 3194 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 3195 double draw_x, draw_y;
2751 3196
2752 if (!SvROK (self)) 3197 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3198 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 3199
2755 hv = (HV *)SvRV (self); 3200 hv = (HV *)SvRV (self);
2756 3201
2757 if (SvTYPE (hv) != SVt_PVHV) 3202 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3203 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 3204
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3205 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3206 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 3207
2763 if (!h || !w) 3208 if (!h || !w)
2783 { 3228 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3229 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 3230
2786 if (svp && SvTRUE (*svp)) 3231 if (svp && SvTRUE (*svp))
2787 { 3232 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3233 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 3234 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3235 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 3236 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 3237 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 3238 glVertex2f (w, 0);
2796 glEnd (); 3241 glEnd ();
2797 glDisable (GL_BLEND); 3242 glDisable (GL_BLEND);
2798 } 3243 }
2799 } 3244 }
2800#if 0 3245#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 3246 // draw borders, for debugging
2802 glPushMatrix; 3247 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 3248 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 3249 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 3250 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 3251 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 3252 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 3253 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 3254 glVertex2f (0 , h - 1);
2810 glEnd; 3255 glEnd ();
2811 glPopMatrix; 3256 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 3257#endif
2815 PUSHMARK (SP); 3258 PUSHMARK (SP);
2816 XPUSHs (self); 3259 XPUSHs (self);
2817 PUTBACK; 3260 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 3261 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines