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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.281 by root, Thu Dec 4 23:58:20 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 = 1024) 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);
1021
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}
813 1037
814void 1038void
815Mix_CloseAudio () 1039Mix_CloseAudio ()
816 1040
817int 1041int
852 } 1076 }
853 } 1077 }
854#endif 1078#endif
855} 1079}
856 1080
857void 1081int
858add_font (char *file) 1082add_font (char *file)
859 CODE: 1083 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT:
1086 RETVAL
861 1087
862void 1088void
863load_image_inline (SV *image_) 1089load_image_inline (SV *image_)
864 ALIAS: 1090 ALIAS:
865 load_image_file = 1 1091 load_image_file = 1
951void 1177void
952error (char *message) 1178error (char *message)
953 CODE: 1179 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1180 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1181#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1182 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1183#endif
958 1184
959void 1185void
960fatal (char *message) 1186fatal (char *message)
961 CODE: 1187 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1188 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1189#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1190 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1191#endif
966 _exit (1); 1192 _exit (1);
967 1193
968void 1194void
969_exit (int retval = 0) 1195_exit (int retval = 0)
981#if DEBUG 1207#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
983#endif 1209#endif
984} 1210}
985 1211
986MODULE = 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
987 1220
988PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
989 1222
990CFPlus::Font 1223DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1224new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1225 CODE:
993{ 1226{
994 int count; 1227 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1231}
999 OUTPUT: 1232 OUTPUT:
1000 RETVAL 1233 RETVAL
1001 1234
1002void 1235void
1003DESTROY (CFPlus::Font self) 1236DESTROY (DC::Font self)
1004 CODE: 1237 CODE:
1005 pango_font_description_free (self); 1238 pango_font_description_free (self);
1006 1239
1007void 1240void
1008make_default (CFPlus::Font self) 1241make_default (DC::Font self)
1009 PROTOTYPE: $ 1242 PROTOTYPE: $
1010 CODE: 1243 CODE:
1011 default_font = self; 1244 default_font = self;
1012 1245
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1246MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1247
1015PROTOTYPES: DISABLE 1248PROTOTYPES: DISABLE
1016 1249
1017void 1250void
1018reset_glyph_cache () 1251glyph_cache_backup ()
1019 PROTOTYPE: 1252 PROTOTYPE:
1020 CODE: 1253 CODE:
1254 tc_backup ();
1255
1256void
1257glyph_cache_restore ()
1258 PROTOTYPE:
1259 CODE:
1021 tc_clear (); 1260 tc_restore ();
1022 1261
1023CFPlus::Layout 1262DC::Layout
1024new (SV *class) 1263new (SV *class)
1025 CODE: 1264 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1265 New (0, RETVAL, 1, struct cf_layout);
1027 1266
1028 RETVAL->pl = pango_layout_new (opengl_context); 1267 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1269 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1270 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1271 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1272 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1273 RETVAL->font = 0;
1274 RETVAL->rc = rc_alloc ();
1035 1275
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1276 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1277 layout_update_font (RETVAL);
1038 OUTPUT: 1278 OUTPUT:
1039 RETVAL 1279 RETVAL
1040 1280
1041void 1281void
1042DESTROY (CFPlus::Layout self) 1282DESTROY (DC::Layout self)
1043 CODE: 1283 CODE:
1044 g_object_unref (self->pl); 1284 g_object_unref (self->pl);
1285 rc_free (self->rc);
1045 Safefree (self); 1286 Safefree (self);
1046 1287
1047void 1288void
1048set_text (CFPlus::Layout self, SV *text_) 1289set_text (DC::Layout self, SV *text_)
1049 CODE: 1290 CODE:
1050{ 1291{
1051 STRLEN textlen; 1292 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1293 char *text = SvPVutf8 (text_, textlen);
1053 1294
1054 pango_layout_set_text (self->pl, text, textlen); 1295 pango_layout_set_text (self->pl, text, textlen);
1055} 1296}
1056 1297
1057void 1298void
1058set_markup (CFPlus::Layout self, SV *text_) 1299set_markup (DC::Layout self, SV *text_)
1059 CODE: 1300 CODE:
1060{ 1301{
1061 STRLEN textlen; 1302 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1063 1304
1064 pango_layout_set_markup (self->pl, text, textlen); 1305 pango_layout_set_markup (self->pl, text, textlen);
1065} 1306}
1066 1307
1067void 1308void
1068set_shapes (CFPlus::Layout self, ...) 1309set_shapes (DC::Layout self, ...)
1069 CODE: 1310 CODE:
1070{ 1311{
1071 PangoAttrList *attrs = 0; 1312 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1313 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1314 const char *pos = text;
1108 if (attrs) 1349 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1350 pango_layout_set_attributes (self->pl, attrs);
1110} 1351}
1111 1352
1112void 1353void
1113get_shapes (CFPlus::Layout self) 1354get_shapes (DC::Layout self)
1114 PPCODE: 1355 PPCODE:
1115{ 1356{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1357 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1358
1118 do 1359 do
1119 { 1360 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1361 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1362
1122 if (run && shape_attr_p (run)) 1363 if (run && shape_attr_p (run))
1123 { 1364 {
1124 PangoRectangle extents; 1365 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1366 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1374
1134 pango_layout_iter_free (iter); 1375 pango_layout_iter_free (iter);
1135} 1376}
1136 1377
1137int 1378int
1138has_wrapped (CFPlus::Layout self) 1379has_wrapped (DC::Layout self)
1139 CODE: 1380 CODE:
1140{ 1381{
1141 int lines = 1; 1382 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1383 const char *text = pango_layout_get_text (self->pl);
1143 1384
1148} 1389}
1149 OUTPUT: 1390 OUTPUT:
1150 RETVAL 1391 RETVAL
1151 1392
1152SV * 1393SV *
1153get_text (CFPlus::Layout self) 1394get_text (DC::Layout self)
1154 CODE: 1395 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1396 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1397 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1398 OUTPUT:
1158 RETVAL 1399 RETVAL
1159 1400
1160void 1401void
1161set_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.)
1162 CODE: 1403 CODE:
1163 self->r = r; 1404 self->r = r;
1164 self->g = g; 1405 self->g = g;
1165 self->b = b; 1406 self->b = b;
1166 self->a = a; 1407 self->a = a;
1167 1408
1168void 1409void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1410set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1411 CODE:
1171 if (self->font != font) 1412 if (self->font != font)
1172 { 1413 {
1173 self->font = font; 1414 self->font = font;
1174 layout_update_font (self); 1415 layout_update_font (self);
1175 } 1416 }
1176 1417
1177void 1418void
1178set_height (CFPlus::Layout self, int base_height) 1419set_height (DC::Layout self, int base_height)
1179 CODE: 1420 CODE:
1180 if (self->base_height != base_height) 1421 if (self->base_height != base_height)
1181 { 1422 {
1182 self->base_height = base_height; 1423 self->base_height = base_height;
1183 layout_update_font (self); 1424 layout_update_font (self);
1184 } 1425 }
1185 1426
1186void 1427void
1187set_width (CFPlus::Layout self, int max_width = -1) 1428set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1429 CODE:
1189 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);
1190 1431
1191void 1432void
1192set_indent (CFPlus::Layout self, int indent) 1433set_indent (DC::Layout self, int indent)
1193 CODE: 1434 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1435 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1436
1196void 1437void
1197set_spacing (CFPlus::Layout self, int spacing) 1438set_spacing (DC::Layout self, int spacing)
1198 CODE: 1439 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1440 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1441
1201void 1442void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1443set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1444 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1445 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1446 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1447 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1448 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1449 : PANGO_ELLIPSIZE_NONE
1209 ); 1450 );
1210 1451
1211void 1452void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1453set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1454 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1455 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1456
1216void 1457void
1217size (CFPlus::Layout self) 1458size (DC::Layout self)
1218 PPCODE: 1459 PPCODE:
1219{ 1460{
1220 int w, h; 1461 int w, h;
1221 1462
1222 layout_get_pixel_size (self, &w, &h); 1463 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1466 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1467 PUSHs (sv_2mortal (newSViv (h)));
1227} 1468}
1228 1469
1229int 1470int
1230descent (CFPlus::Layout self) 1471descent (DC::Layout self)
1231 CODE: 1472 CODE:
1232{ 1473{
1233 PangoRectangle rect; 1474 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1475 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1476 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1477 RETVAL = PANGO_DESCENT (rect);
1237} 1478}
1238 OUTPUT: 1479 OUTPUT:
1239 RETVAL 1480 RETVAL
1240 1481
1241int 1482int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1483xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1484 CODE:
1244{ 1485{
1245 int index, trailing; 1486 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1488 RETVAL = index + trailing;
1248} 1489}
1249 OUTPUT: 1490 OUTPUT:
1250 RETVAL 1491 RETVAL
1251 1492
1252void 1493void
1253cursor_pos (CFPlus::Layout self, int index) 1494cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1495 PPCODE:
1255{ 1496{
1256 PangoRectangle strong_pos; 1497 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1498 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1499
1259 EXTEND (SP, 3); 1500 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1501 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1502 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1503 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1504}
1264 1505
1265void 1506void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1507index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1508 PPCODE:
1268{ 1509{
1269 int line, x; 1510 int line, x;
1270 1511
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1514 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1515 --line;
1516#endif
1274 EXTEND (SP, 2); 1517 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1518 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1520}
1278 1521
1279void 1522void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1523line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1524 PPCODE:
1282{ 1525{
1283 PangoLayoutLine *lp; 1526 PangoLayoutLine *lp;
1284 int index, trailing; 1527 int index, trailing;
1285 1528
1286 if (line < 0) 1529 if (line < 0)
1287 XSRETURN_EMPTY; 1530 XSRETURN_EMPTY;
1288 1531
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1532 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1533 XSRETURN_EMPTY; /* do better */
1291 1534
1292 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);
1293 1536
1294 EXTEND (SP, 2); 1537 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1543 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1544 }
1302} 1545}
1303 1546
1304void 1547void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1548render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1549 CODE:
1550 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1551 pango_opengl_render_layout_subpixel (
1308 self->pl, 1552 self->pl,
1553 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1554 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1555 self->r, self->g, self->b, self->a,
1311 flags 1556 flags
1312 ); 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);
1313 1561
1314MODULE = 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
1315 1582
1316PROTOTYPES: ENABLE 1583PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1584
1320void 1585void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1586pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1587 CODE:
1323{ 1588{
1350 HV *hv = (HV *)SvRV (self); 1615 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1616 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1617 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1618 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1619
1620 if (name <= 0)
1621 XSRETURN_EMPTY;
1622
1355 if (items < 5) 1623 if (items < 5)
1356 { 1624 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1625 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1626 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1627 }
1397 RETVAL = width > 0; 1665 RETVAL = width > 0;
1398} 1666}
1399 OUTPUT: 1667 OUTPUT:
1400 RETVAL 1668 RETVAL
1401 1669
1402MODULE = CFPlus PACKAGE = CFPlus::Map 1670MODULE = Deliantra::Client PACKAGE = DC::Map
1403 1671
1404PROTOTYPES: DISABLE 1672PROTOTYPES: DISABLE
1405 1673
1406CFPlus::Map 1674DC::Map
1407new (SV *class) 1675new (SV *class)
1408 CODE: 1676 CODE:
1409 New (0, RETVAL, 1, struct map); 1677 New (0, RETVAL, 1, struct map);
1410 RETVAL->x = 0; 1678 RETVAL->x = 0;
1411 RETVAL->y = 0; 1679 RETVAL->y = 0;
1419 RETVAL->row = 0; 1687 RETVAL->row = 0;
1420 OUTPUT: 1688 OUTPUT:
1421 RETVAL 1689 RETVAL
1422 1690
1423void 1691void
1424DESTROY (CFPlus::Map self) 1692DESTROY (DC::Map self)
1425 CODE: 1693 CODE:
1426{ 1694{
1427 map_clear (self); 1695 map_clear (self);
1428 Safefree (self->face2tile); 1696 Safefree (self->face2tile);
1429 Safefree (self->tex); 1697 Safefree (self->tex);
1430 Safefree (self); 1698 Safefree (self);
1431} 1699}
1432 1700
1433void 1701void
1434resize (CFPlus::Map self, int map_width, int map_height) 1702resize (DC::Map self, int map_width, int map_height)
1435 CODE: 1703 CODE:
1436 self->w = map_width; 1704 self->w = map_width;
1437 self->h = map_height; 1705 self->h = map_height;
1438 1706
1439void 1707void
1440clear (CFPlus::Map self) 1708clear (DC::Map self)
1441 CODE: 1709 CODE:
1442 map_clear (self); 1710 map_clear (self);
1443 1711
1444void 1712void
1445set_tileid (CFPlus::Map self, int face, int tile) 1713set_tileid (DC::Map self, int face, int tile)
1446 CODE: 1714 CODE:
1447{ 1715{
1448 need_facenum (self, face); self->face2tile [face] = tile; 1716 need_facenum (self, face); self->face2tile [face] = tile;
1449 need_texid (self, tile); 1717 need_texid (self, tile);
1450} 1718}
1451 1719
1452void 1720void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level) 1721set_smooth (DC::Map self, int face, int smooth, int level)
1454 CODE: 1722 CODE:
1455{ 1723{
1456 tileid texid; 1724 tileid texid;
1457 maptex *tex; 1725 maptex *tex;
1458 1726
1471 tex->smoothtile = self->face2tile [smooth]; 1739 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level; 1740 tex->smoothlevel = level;
1473} 1741}
1474 1742
1475void 1743void
1476set_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)
1477 CODE: 1745 CODE:
1478{ 1746{
1479 need_texid (self, texid); 1747 need_texid (self, texid);
1480 1748
1481 { 1749 {
1500 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1501 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503} 1771}
1504 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
1505int 1793int
1506ox (CFPlus::Map self) 1794ox (DC::Map self)
1507 ALIAS: 1795 ALIAS:
1508 oy = 1 1796 oy = 1
1509 x = 2 1797 x = 2
1510 y = 3 1798 y = 3
1511 w = 4 1799 w = 4
1522 } 1810 }
1523 OUTPUT: 1811 OUTPUT:
1524 RETVAL 1812 RETVAL
1525 1813
1526void 1814void
1527scroll (CFPlus::Map self, int dx, int dy) 1815scroll (DC::Map self, int dx, int dy)
1528 CODE: 1816 CODE:
1529{ 1817{
1530 if (dx > 0) 1818 if (dx > 0)
1531 map_blank (self, self->x, self->y, dx, self->h); 1819 map_blank (self, self->x, self->y, dx, self->h);
1532 else if (dx < 0) 1820 else if (dx < 0)
1547 self->rows += MAP_EXTEND_Y; 1835 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1836 self->y += MAP_EXTEND_Y;
1549 } 1837 }
1550} 1838}
1551 1839
1552void 1840SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1841map1a_update (DC::Map self, SV *data_, int extmap)
1554 CODE: 1842 CODE:
1555{ 1843{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1845 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1846 mapcell *cell;
1559 int x, y, flags; 1847 int x, y, z, flags;
1848 AV *missing = newAV ();
1849 RETVAL = newRV_noinc ((SV *)missing);
1560 1850
1561 while (data < data_end - 1) 1851 while (data < data_end - 1)
1562 { 1852 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1853 flags = (data [0] << 8) + data [1]; data += 2;
1564 1854
1584 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1585 1875
1586 do 1876 do
1587 { 1877 {
1588 ext = *data++; 1878 ext = *data++;
1589 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1590 1880
1591 if (cmd < 4) 1881 if (cmd < 4)
1592 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1593 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1594 { 1884 {
1597 } 1887 }
1598 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1601 { 1891 {
1602 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1603 ; // 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);
1604 1896
1605 data += *data + 1; 1897 data += *data + 1;
1606 } 1898 }
1607 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1608 cell->flags = *data++; 1900 cell->flags = *data++;
1615 } 1907 }
1616 else 1908 else
1617 cell->darkness = *data++ + 1; 1909 cell->darkness = *data++ + 1;
1618 } 1910 }
1619 1911
1912 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1913 if (flags & (4 >> z))
1621 { 1914 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1915 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1916 need_facenum (self, face);
1624 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 }
1625 } 1934 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1935 }
1641 else 1936 else
1642 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1643 } 1938 }
1644} 1939}
1940 OUTPUT:
1941 RETVAL
1645 1942
1646SV * 1943SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1944mapmap (DC::Map self, int x0, int y0, int w, int h)
1648 CODE: 1945 CODE:
1649{ 1946{
1650 int x1, x; 1947 int x1, x;
1651 int y1, y; 1948 int y1, y;
1652 int z; 1949 int z;
1697} 1994}
1698 OUTPUT: 1995 OUTPUT:
1699 RETVAL 1996 RETVAL
1700 1997
1701void 1998void
1702draw (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)
1703 CODE: 2000 CODE:
1704{ 2001{
2002 int x, y, z;
2003
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 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
1707 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)
1708 smooth_key skey; 2007 smooth_key skey;
1709 int x, y, z; 2008 int pl_x, pl_y;
1710 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;
1711 2015
1712 // thats current max. sorry. 2016 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1715 2019
1716 // clear key, in case of extra padding 2020 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 2021 memset (&skey, 0, sizeof (skey));
1718 2022
1719 glColor4ub (255, 255, 255, 255); 2023 memset (&key, 0, sizeof (key));
1720 2024 key.r = 255;
1721 glEnable (GL_BLEND); 2025 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2026 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 2027 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2028 key.mode = GL_QUADS;
1725 2029 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 2030 key.texname = -1;
1727
1728 last_name = 0;
1729 2031
1730 mx += self->x; 2032 mx += self->x;
1731 my += self->y; 2033 my += self->y;
1732 2034
1733 // first pass: determine smooth_max 2035 // first pass: determine smooth_max
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 2051 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 2052 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 2053 self->tex [cell->tile [2]].smoothlevel));
1752 } 2054 }
1753 } 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);
1754 2060
1755 for (z = 0; z <= 2; z++) 2061 for (z = 0; z <= 2; z++)
1756 { 2062 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 2063 memset (smooth_level, 0, sizeof (smooth_level));
1758 2064
1771 { 2077 {
1772 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 2079 int px = (x + 1) * T - tex.w;
1774 int py = (y + 1) * T - tex.h; 2080 int py = (y + 1) * T - tex.h;
1775 2081
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 2082 if (key.texname != tex.name)
1779 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1780 if (!tex.name) 2086 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1782 2088
1783 glEnd (); 2089 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2090 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 2091 }
1787 2092
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793 if (cell->flags && z == 2)
1794 { 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
1795 if (cell->flags & 1) 2109 if (cell->flags & 1)
1796 { 2110 {
1797 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 2112 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 2113 int py = y * T - T * 6 / 32;
1800 2114
2115 if (tex.name)
1801 glEnd (); 2116 {
1802 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);
1803 glBegin (GL_QUADS); 2127 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 2128 }
1810 } 2129 }
1811 2130
1812 // update smooth hash 2131 // update smooth hash
1813 if (tex.smoothtile) 2132 if (tex.smoothtile)
1849 } 2168 }
1850 } 2169 }
1851 } 2170 }
1852 } 2171 }
1853 2172
2173 rc_draw (rc);
2174 rc_clear (rc);
2175
1854 // go through all smoothlevels, lowest to highest, then draw. 2176 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 2177 // this is basically counting sort
1856 { 2178 {
1857 int w, b; 2179 int w, b;
1858 2180
2181 glEnable (GL_TEXTURE_2D);
2182 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 2183 for (w = 0; w < 256 / 32; ++w)
1860 { 2184 {
1861 uint32_t smask = smooth_level [w]; 2185 uint32_t smask = smooth_level [w];
1862 if (smask) 2186 if (smask)
1863 for (b = 0; b < 32; ++b) 2187 for (b = 0; b < 32; ++b)
1882 int border = bits & 15; 2206 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2207 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 2208 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 2209 float dy = tex.t * .5f ; // 2 images/column
1886 2210
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 2211 if (tex.name)
1890 { 2212 {
2213 // this time avoiding texture state changes
2214 // save gobs of state changes.
1891 if (!tex.name) 2215 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 2216 {
2217 self->tex [skey->tile].unused = 0;
1893 2218
1894 glEnd (); 2219 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
1897 } 2222 }
1898 2223
1899 if (border) 2224 if (border)
1900 { 2225 {
1901 float ox = border * dx; 2226 float ox = border * dx;
1902 2227
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 2232 }
1908 2233
1909 if (corner) 2234 if (corner)
1910 { 2235 {
1911 float ox = corner * dx; 2236 float ox = corner * dx;
1912 2237
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2238 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2242 }
1917 } 2243 }
1918 } 2244 }
1919 } 2245 }
1920 } 2246 }
1921 } 2247 }
2248
2249 glEnd ();
2250 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1;
1922 } 2252 }
1923 2253
1924 hv_clear (smooth); 2254 hv_clear (smooth);
1925 } 2255 }
1926 2256
1927 glEnd (); 2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
1928 2262
1929 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
1930 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2275 rc_free (rc);
1931 2276
1932 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2279 if (0 <= y + my && y + my < self->rows)
1935 { 2280 {
1940 { 2285 {
1941 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
1942 2287
1943 int px = x * T; 2288 int px = x * T;
1944 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 }
1945 2296
1946 if (cell->stat_hp) 2297 if (cell->stat_hp)
1947 { 2298 {
1948 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
1949 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1960 } 2311 }
1961 } 2312 }
1962} 2313}
1963 2314
1964void 2315void
1965draw_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)
1966 CODE: 2317 CODE:
1967{ 2318{
1968 static float color[16][3] = { 2319 static float color[16][3] = {
1969 { 0.00F, 0.00F, 0.00F }, 2320 { 0.00F, 0.00F, 0.00F },
1970 { 1.00F, 1.00F, 1.00F }, 2321 { 1.00F, 1.00F, 1.00F },
2020 glDisable (GL_BLEND); 2371 glDisable (GL_BLEND);
2021 glDisable (GL_TEXTURE_2D); 2372 glDisable (GL_TEXTURE_2D);
2022} 2373}
2023 2374
2024void 2375void
2025fow_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)
2026 PPCODE: 2377 PPCODE:
2027{ 2378{
2028 int x, y; 2379 int x, y;
2029 int sw1 = sw + 2; 2380 int sw1 = sw + 2;
2030 int sh1 = sh + 2; 2381 int sh1 = sh + 2;
2038 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2039 2390
2040 mx += self->x - 1; 2391 mx += self->x - 1;
2041 my += self->y - 1; 2392 my += self->y - 1;
2042 2393
2043 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2044 2395
2045 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2046 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2047 { 2398 {
2048 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
2101 PUSHs (sv_2mortal (newSViv (sh3))); 2452 PUSHs (sv_2mortal (newSViv (sh3)));
2102 PUSHs (darkness3_sv); 2453 PUSHs (darkness3_sv);
2103} 2454}
2104 2455
2105SV * 2456SV *
2106get_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)
2107 CODE: 2458 CODE:
2108{ 2459{
2109 int x, y, x1, y1; 2460 int x, y, x1, y1;
2110 SV *data_sv = newSV (w * h * 7 + 5); 2461 SV *data_sv = newSV (w * h * 7 + 5);
2111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2462 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2168 else 2519 else
2169 *data++ = 0; 2520 *data++ = 0;
2170 } 2521 }
2171 } 2522 }
2172 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 {
2173 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2174 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2175 RETVAL = data_sv; 2531 RETVAL = data_sv;
2176} 2532}
2177 OUTPUT: 2533 OUTPUT:
2178 RETVAL 2534 RETVAL
2179 2535
2180void 2536void
2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182 PPCODE: 2538 PPCODE:
2183{ 2539{
2184 int x, y, z; 2540 int x, y, z;
2185 int w, h; 2541 int w, h;
2186 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;
2187 2553
2188 if (*data++ != 0) 2554 if (*data++ != 0)
2189 return; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2190 2556
2191 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2558 h = *data++ << 8; h |= *data++;
2193 2559
2194 // 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
2206 { 2572 {
2207 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2208 2574
2209 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2210 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2211 uint8_t flags = *data++; 2582 flags = *data++;
2212 2583
2213 if (flags) 2584 if (flags)
2214 { 2585 {
2215 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2221 2592
2222 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2223 { 2594 {
2224 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2225 2597
2226 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2227 { 2599 {
2228 tileid t = tile [z]; 2600 tileid t = tile [z];
2229 2601
2230 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2231 { 2603 {
2232 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t); 2605 need_texid (self, t);
2234 } 2606 }
2235 2607
2236 cell->tile [z] = t; 2608 cell->tile [z] = t;
2237 } 2609 }
2239 } 2611 }
2240 } 2612 }
2241 } 2613 }
2242} 2614}
2243 2615
2244MODULE = CFPlus PACKAGE = CFPlus::RW 2616MODULE = Deliantra::Client PACKAGE = DC::RW
2245 2617
2246CFPlus::RW 2618DC::RW
2247new (SV *class, SV *data_sv) 2619new (SV *class, SV *data_sv)
2248 CODE: 2620 CODE:
2249{ 2621{
2250 STRLEN datalen; 2622 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen); 2623 char *data = SvPVbyte (data_sv, datalen);
2253 RETVAL = SDL_RWFromConstMem (data, datalen); 2625 RETVAL = SDL_RWFromConstMem (data, datalen);
2254} 2626}
2255 OUTPUT: 2627 OUTPUT:
2256 RETVAL 2628 RETVAL
2257 2629
2258CFPlus::RW 2630DC::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb") 2631new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE: 2632 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2633 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2634 OUTPUT:
2263 RETVAL 2635 RETVAL
2264 2636
2265# fails on win32: 2637# fails on win32:
2266# CFPlus.xs(2268) : error C2059: syntax error : '(' 2638# dc.xs(2268) : error C2059: syntax error : '('
2267#void 2639#void
2268#close (CFPlus::RW self) 2640#close (DC::RW self)
2269# CODE: 2641# CODE:
2270# (self->(close)) (self); 2642# (self->(close)) (self);
2271 2643
2272MODULE = CFPlus PACKAGE = CFPlus::Channel 2644MODULE = Deliantra::Client PACKAGE = DC::Channel
2273 2645
2274PROTOTYPES: DISABLE 2646PROTOTYPES: DISABLE
2275 2647
2276CFPlus::Channel 2648DC::Channel
2277find () 2649find ()
2278 CODE: 2650 CODE:
2279{ 2651{
2280 RETVAL = Mix_GroupAvailable (-1); 2652 RETVAL = Mix_GroupAvailable (-1);
2281 2653
2294} 2666}
2295 OUTPUT: 2667 OUTPUT:
2296 RETVAL 2668 RETVAL
2297 2669
2298void 2670void
2299halt (CFPlus::Channel self) 2671halt (DC::Channel self)
2300 CODE: 2672 CODE:
2301 Mix_HaltChannel (self); 2673 Mix_HaltChannel (self);
2302 2674
2303void 2675void
2304expire (CFPlus::Channel self, int ticks = -1) 2676expire (DC::Channel self, int ticks = -1)
2305 CODE: 2677 CODE:
2306 Mix_ExpireChannel (self, ticks); 2678 Mix_ExpireChannel (self, ticks);
2307 2679
2308void 2680void
2309fade_out (CFPlus::Channel self, int ticks = -1) 2681fade_out (DC::Channel self, int ticks = -1)
2310 CODE: 2682 CODE:
2311 Mix_FadeOutChannel (self, ticks); 2683 Mix_FadeOutChannel (self, ticks);
2312 2684
2313int 2685int
2314volume (CFPlus::Channel self, int volume) 2686volume (DC::Channel self, int volume)
2315 CODE: 2687 CODE:
2316 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2688 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317 OUTPUT: 2689 OUTPUT:
2318 RETVAL 2690 RETVAL
2319 2691
2320void 2692void
2321unregister_all_effects (CFPlus::Channel self) 2693unregister_all_effects (DC::Channel self)
2322 CODE: 2694 CODE:
2323 Mix_UnregisterAllEffects (self); 2695 Mix_UnregisterAllEffects (self);
2324 2696
2325void 2697void
2326set_panning (CFPlus::Channel self, int left, int right) 2698set_panning (DC::Channel self, int left, int right)
2327 CODE: 2699 CODE:
2328 left = CLAMP (left , 0, 255); 2700 left = CLAMP (left , 0, 255);
2329 right = CLAMP (right, 0, 255); 2701 right = CLAMP (right, 0, 255);
2330 Mix_SetPanning (self, left, right); 2702 Mix_SetPanning (self, left, right);
2331 2703
2332void 2704void
2333set_distance (CFPlus::Channel self, int distance) 2705set_distance (DC::Channel self, int distance)
2334 CODE: 2706 CODE:
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2707 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2708
2337void 2709void
2338set_position (CFPlus::Channel self, int angle, int distance) 2710set_position (DC::Channel self, int angle, int distance)
2339 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);
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720}
2341 2721
2342void 2722void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2723set_reverse_stereo (DC::Channel self, int flip)
2344 CODE: 2724 CODE:
2345 Mix_SetReverseStereo (self, flip); 2725 Mix_SetReverseStereo (self, flip);
2346 2726
2347MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348 2728
2349PROTOTYPES: DISABLE 2729PROTOTYPES: DISABLE
2350 2730
2351CFPlus::MixChunk 2731DC::MixChunk
2352new (SV *class, CFPlus::RW rwops) 2732new (SV *class, DC::RW rwops)
2353 CODE: 2733 CODE:
2354 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2734 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355 OUTPUT: 2735 OUTPUT:
2356 RETVAL 2736 RETVAL
2357 2737
2358void 2738void
2359DESTROY (CFPlus::MixChunk self) 2739DESTROY (DC::MixChunk self)
2360 CODE: 2740 CODE:
2361 Mix_FreeChunk (self); 2741 Mix_FreeChunk (self);
2362 2742
2363int 2743int
2364volume (CFPlus::MixChunk self, int volume = -1) 2744volume (DC::MixChunk self, int volume = -1)
2365 CODE: 2745 CODE:
2366 if (items > 1) 2746 if (items > 1)
2367 volume = CLAMP (volume, 0, 128); 2747 volume = CLAMP (volume, 0, 128);
2368 RETVAL = Mix_VolumeChunk (self, volume); 2748 RETVAL = Mix_VolumeChunk (self, volume);
2369 OUTPUT: 2749 OUTPUT:
2370 RETVAL 2750 RETVAL
2371 2751
2372CFPlus::Channel 2752DC::Channel
2373play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2753play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374 CODE: 2754 CODE:
2375{ 2755{
2376 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2756 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377 2757
2378 if (RETVAL < 0) 2758 if (RETVAL < 0)
2385 } 2765 }
2386} 2766}
2387 OUTPUT: 2767 OUTPUT:
2388 RETVAL 2768 RETVAL
2389 2769
2390MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391 2771
2392int 2772int
2393volume (int volume = -1) 2773volume (int volume = -1)
2394 PROTOTYPE: ;$ 2774 PROTOTYPE: ;$
2395 CODE: 2775 CODE:
2407void 2787void
2408halt () 2788halt ()
2409 CODE: 2789 CODE:
2410 Mix_HaltMusic (); 2790 Mix_HaltMusic ();
2411 2791
2412CFPlus::MixMusic 2792DC::MixMusic
2413new (SV *class, CFPlus::RW rwops) 2793new (SV *class, DC::RW rwops)
2414 CODE: 2794 CODE:
2415 RETVAL = Mix_LoadMUS_RW (rwops); 2795 RETVAL = Mix_LoadMUS_RW (rwops);
2416 OUTPUT: 2796 OUTPUT:
2417 RETVAL 2797 RETVAL
2418 2798
2419void 2799void
2420DESTROY (CFPlus::MixMusic self) 2800DESTROY (DC::MixMusic self)
2421 CODE: 2801 CODE:
2422 Mix_FreeMusic (self); 2802 Mix_FreeMusic (self);
2423 2803
2424int 2804int
2425play (CFPlus::MixMusic self, int loops = -1) 2805play (DC::MixMusic self, int loops = -1)
2426 CODE: 2806 CODE:
2427 RETVAL = Mix_PlayMusic (self, loops); 2807 RETVAL = Mix_PlayMusic (self, loops);
2428 OUTPUT: 2808 OUTPUT:
2429 RETVAL 2809 RETVAL
2430 2810
2431void 2811void
2432fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2812fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433 CODE: 2813 CODE:
2434 Mix_FadeInMusicPos (self, loops, ms, position); 2814 Mix_FadeInMusicPos (self, loops, ms, position);
2435 2815
2436MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2816MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437 2817
2438PROTOTYPES: ENABLE 2818PROTOTYPES: ENABLE
2439 2819
2440BOOT: 2820BOOT:
2441{ 2821{
2442 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2822 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443 static const struct { 2823 static const struct {
2444 const char *name; 2824 const char *name;
2445 IV iv; 2825 IV iv;
2446 } *civ, const_iv[] = { 2826 } *civ, const_iv[] = {
2447# define const_iv(name) { # name, (IV)name } 2827# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_INTENSITY), 2862 const_iv (GL_INTENSITY),
2483 const_iv (GL_LUMINANCE), 2863 const_iv (GL_LUMINANCE),
2484 const_iv (GL_LUMINANCE_ALPHA), 2864 const_iv (GL_LUMINANCE_ALPHA),
2485 const_iv (GL_FLOAT), 2865 const_iv (GL_FLOAT),
2486 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),
2487 const_iv (GL_COMPILE), 2873 const_iv (GL_COMPILE),
2488 const_iv (GL_PROXY_TEXTURE_1D), 2874 const_iv (GL_PROXY_TEXTURE_1D),
2489 const_iv (GL_PROXY_TEXTURE_2D), 2875 const_iv (GL_PROXY_TEXTURE_2D),
2490 const_iv (GL_TEXTURE_1D), 2876 const_iv (GL_TEXTURE_1D),
2491 const_iv (GL_TEXTURE_2D), 2877 const_iv (GL_TEXTURE_2D),
2530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2916 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531 const_iv (GL_POINT_SMOOTH_HINT), 2917 const_iv (GL_POINT_SMOOTH_HINT),
2532 const_iv (GL_LINE_SMOOTH_HINT), 2918 const_iv (GL_LINE_SMOOTH_HINT),
2533 const_iv (GL_POLYGON_SMOOTH_HINT), 2919 const_iv (GL_POLYGON_SMOOTH_HINT),
2534 const_iv (GL_GENERATE_MIPMAP_HINT), 2920 const_iv (GL_GENERATE_MIPMAP_HINT),
2921 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535 const_iv (GL_FASTEST), 2922 const_iv (GL_FASTEST),
2536 const_iv (GL_DONT_CARE), 2923 const_iv (GL_DONT_CARE),
2537 const_iv (GL_NICEST), 2924 const_iv (GL_NICEST),
2538 const_iv (GL_V2F), 2925 const_iv (GL_V2F),
2539 const_iv (GL_V3F), 2926 const_iv (GL_V3F),
2547 2934
2548 texture_av = newAV (); 2935 texture_av = newAV ();
2549 AvREAL_off (texture_av); 2936 AvREAL_off (texture_av);
2550} 2937}
2551 2938
2939void
2940disable_GL_EXT_blend_func_separate ()
2941 CODE:
2942 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0;
2944
2552char * 2945char *
2553gl_vendor () 2946gl_vendor ()
2554 CODE: 2947 CODE:
2555 RETVAL = (char *)glGetString (GL_VENDOR); 2948 RETVAL = (char *)glGetString (GL_VENDOR);
2556 OUTPUT: 2949 OUTPUT:
2648void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2649 CODE: 3042 CODE:
2650 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2651 3044
2652void 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: @
2653 ALIAS: 3047 ALIAS:
2654 glColor_premultiply = 1 3048 glColor_premultiply = 1
2655 CODE: 3049 CODE:
2656 if (ix) 3050 if (ix)
2657 { 3051 {
2677 3071
2678void glRect (float x1, float y1, float x2, float y2) 3072void glRect (float x1, float y1, float x2, float y2)
2679 CODE: 3073 CODE:
2680 glRectf (x1, y1, x2, y2); 3074 glRectf (x1, y1, x2, y2);
2681 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
2682PROTOTYPES: ENABLE 3085PROTOTYPES: ENABLE
2683 3086
2684void glBegin (int mode) 3087void glBegin (int mode)
2685 3088
2686void glEnd () 3089void glEnd ()
2718void 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)
2719 CODE: 3122 CODE:
2720 if (gl.SeparableFilter2D) 3123 if (gl.SeparableFilter2D)
2721 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3124 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722 3125
2723void 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)
2724 3127
2725void 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)
2726 3129
2727void glDrawPixels (int width, int height, int format, int type, char *pixels) 3130void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728 3131
2754 3157
2755void glEndList () 3158void glEndList ()
2756 3159
2757void glCallList (int list) 3160void glCallList (int list)
2758 3161
2759MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760 3163
2761PROTOTYPES: DISABLE 3164PROTOTYPES: DISABLE
2762 3165
2763void 3166void
2764find_widget (SV *self, NV x, NV y) 3167find_widget (SV *self, NV x, NV y)
2768 XPUSHs (self); 3171 XPUSHs (self);
2769} 3172}
2770 3173
2771BOOT: 3174BOOT:
2772{ 3175{
2773 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3176 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774 3177
2775 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);
2776 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);
2777 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);
2778 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);
2779} 3182}
2780 3183
2781void 3184void
2782draw (SV *self) 3185draw (SV *self)
2783 CODE: 3186 CODE:
2787 NV x, y, w, h; 3190 NV x, y, w, h;
2788 SV *draw_x_sv = GvSV (draw_x_gv); 3191 SV *draw_x_sv = GvSV (draw_x_gv);
2789 SV *draw_y_sv = GvSV (draw_y_gv); 3192 SV *draw_y_sv = GvSV (draw_y_gv);
2790 SV *draw_w_sv = GvSV (draw_w_gv); 3193 SV *draw_w_sv = GvSV (draw_w_gv);
2791 SV *draw_h_sv = GvSV (draw_h_gv); 3194 SV *draw_h_sv = GvSV (draw_h_gv);
2792 SV *hover;
2793 double draw_x, draw_y, draw_w, draw_h; 3195 double draw_x, draw_y;
2794 3196
2795 if (!SvROK (self)) 3197 if (!SvROK (self))
2796 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3198 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797 3199
2798 hv = (HV *)SvRV (self); 3200 hv = (HV *)SvRV (self);
2799 3201
2800 if (SvTYPE (hv) != SVt_PVHV) 3202 if (SvTYPE (hv) != SVt_PVHV)
2801 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3203 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802 3204
2803 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.;
2804 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.;
2805 3207
2806 if (!h || !w) 3208 if (!h || !w)
2826 { 3228 {
2827 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3229 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828 3230
2829 if (svp && SvTRUE (*svp)) 3231 if (svp && SvTRUE (*svp))
2830 { 3232 {
2831 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);
2832 glEnable (GL_BLEND); 3234 glEnable (GL_BLEND);
2833 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3235 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834 glBegin (GL_QUADS); 3236 glBegin (GL_QUADS);
2835 glVertex2f (0, 0); 3237 glVertex2f (0, 0);
2836 glVertex2f (w, 0); 3238 glVertex2f (w, 0);
2839 glEnd (); 3241 glEnd ();
2840 glDisable (GL_BLEND); 3242 glDisable (GL_BLEND);
2841 } 3243 }
2842 } 3244 }
2843#if 0 3245#if 0
2844 if ($ENV{CFPLUS_DEBUG} & 1) { 3246 // draw borders, for debugging
2845 glPushMatrix; 3247 glPushMatrix ();
2846 glColor 1, 1, 0, 1; 3248 glColor4f (1., 1., 0., 1.);
2847 glTranslate 0.375, 0.375; 3249 glTranslatef (.5, .5, 0.);
2848 glBegin GL_LINE_LOOP; 3250 glBegin (GL_LINE_LOOP);
2849 glVertex 0 , 0; 3251 glVertex2f (0 , 0);
2850 glVertex $self->{w} - 1, 0; 3252 glVertex2f (w - 1, 0);
2851 glVertex $self->{w} - 1, $self->{h} - 1; 3253 glVertex2f (w - 1, h - 1);
2852 glVertex 0 , $self->{h} - 1; 3254 glVertex2f (0 , h - 1);
2853 glEnd; 3255 glEnd ();
2854 glPopMatrix; 3256 glPopMatrix ();
2855 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856 }
2857#endif 3257#endif
2858 PUSHMARK (SP); 3258 PUSHMARK (SP);
2859 XPUSHs (self); 3259 XPUSHs (self);
2860 PUTBACK; 3260 PUTBACK;
2861 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