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.229 by root, Mon Aug 13 16:20:17 2007 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
120 151
121#include "pango-font.c" 152#include "pango-font.c"
122#include "pango-fontmap.c" 153#include "pango-fontmap.c"
123#include "pango-render.c" 154#include "pango-render.c"
124 155
125typedef IV CFPlus__Channel; 156typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 157typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
129 160
130typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
131 162
132static int 163static int
133shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
134{ 165{
135 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
149 180
150typedef struct cf_layout { 181typedef struct cf_layout {
151 PangoLayout *pl; 182 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
153 int base_height; 184 int base_height;
154 CFPlus__Font font; 185 DC__Font font;
155 rc_t *rc; 186 rc_t *rc;
156} *CFPlus__Layout; 187} *DC__Layout;
157 188
158static CFPlus__Font default_font; 189static DC__Font default_font;
159static PangoContext *opengl_context; 190static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
161 192
162static void 193static void
163substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
168#endif 199#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 201}
171 202
172static void 203static void
173layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
174{ 205{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
177 */ 208 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
179 210
180 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 213
183 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
184} 215}
185 216
186static void 217static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 219{
189 PangoRectangle rect; 220 PangoRectangle rect;
190 221
191 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
209 int w, h; 240 int w, h;
210 float s, t; 241 float s, t;
211 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
212 tileid smoothtile; 243 tileid smoothtile;
213 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
214} maptex; 246} maptex;
215 247
216typedef struct { 248typedef struct {
217 uint32_t player; 249 uint32_t player;
218 tileid tile[3]; 250 tileid tile[3];
231 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
233 265
234 int32_t rows; 266 int32_t rows;
235 maprow *row; 267 maprow *row;
236} *CFPlus__Map; 268} *DC__Map;
237 269
238static char * 270static char *
239prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
240{ 272{
241 char *p; 273 char *p;
279 self->texs *= 2; 311 self->texs *= 2;
280 } 312 }
281} 313}
282 314
283static maprow * 315static maprow *
284map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
285{ 317{
286 if (0 > y) 318 if (0 > y)
287 { 319 {
288 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
327 359
328 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
329} 361}
330 362
331static mapcell * 363static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
333{ 365{
334 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
335} 367}
336 368
337static void 369static void
338map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
339{ 371{
340 int r; 372 int r;
341 373
342 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
350 self->oy = 0; 382 self->oy = 0;
351 self->row = 0; 383 self->row = 0;
352 self->rows = 0; 384 self->rows = 0;
353} 385}
354 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
355static void 397static void
356map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 399{
358 int x, y; 400 int x, y;
359 maprow *row; 401 maprow *row;
360 mapcell *cell; 402 mapcell *cell;
361 403
373 if (x >= row->c1) 415 if (x >= row->c1)
374 break; 416 break;
375 417
376 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
377 419
378 cell->darkness = 0; 420 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 421 }
383 } 422 }
384} 423}
385 424
386typedef struct { 425typedef struct {
440 n |= n >> 16; 479 n |= n >> 16;
441 480
442 return n + 1; 481 return n + 1;
443} 482}
444 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
445/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
448 498
449/******************************************************************************/ 499/******************************************************************************/
487 return 0; 537 return 0;
488 538
489 return 1; 539 return 1;
490} 540}
491 541
492MODULE = CFPlus PACKAGE = CFPlus 542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
493 595
494PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
495 597
496BOOT: 598BOOT:
497{ 599{
498 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 601 static const struct {
500 const char *name; 602 const char *name;
501 IV iv; 603 IV iv;
502 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
525 627
526 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
529 631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
681
682 const_iv (SDLK_FIRST),
683 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
765
766 const_iv (KMOD_LRAM),
767
768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
611# undef const_iv 798# undef const_iv
612 }; 799 };
613 800
614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 820
634NV floor (NV x) 821NV floor (NV x)
635 822
636NV ceil (NV x) 823NV ceil (NV x)
637 824
825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
638void 835void
639pango_init () 836pango_init ()
640 CODE: 837 CODE:
641{ 838{
642 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
645} 847}
646 848
647char *
648SDL_GetError () 849char *SDL_GetError ()
649 850
650int 851void SDL_braino ()
651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652 852
653void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
654SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
655 869
656void 870void
657SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
658 PPCODE: 872 PPCODE:
659{ 873{
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674 888
675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676#if SDL_VERSION_ATLEAST(1,2,10)
677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
680 891
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 893
683 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
684 while (*m) 895 while (*m)
685 { 896 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
687 { 898 {
688 AV *av = newAV (); 899 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
715 926
716 if (RETVAL) 927 if (RETVAL)
717 { 928 {
718 av_clear (texture_av); 929 av_clear (texture_av);
719 930
720 SDL_WM_SetCaption ("Crossfire TRT Client " VERSION, "Crossfire TRT"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722#include "glfunc.h" 933#include "glfunc.h"
723#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724 } 938 }
725} 939}
726 OUTPUT: 940 OUTPUT:
727 RETVAL 941 RETVAL
728 942
732char * 946char *
733SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
734 948
735int 949int
736SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
737 954
738void 955void
739poll_events () 956poll_events ()
740 PPCODE: 957 PPCODE:
741{ 958{
751 { 968 {
752 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
753 case SDL_KEYUP: 970 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 976 break;
760 977
761 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 997 x = ev.motion.x;
781 y = ev.motion.y; 998 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 1000 }
784 1001
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 1008 }
792 break; 1009 break;
793 1010
794 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 1014
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 1025 break;
809 } 1026 }
810 1027
811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812 } 1029 }
813} 1030}
814 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
815int 1045int
816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817 POSTCALL: 1047 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
819 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
1050
1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
820 1066
821void 1067void
822Mix_CloseAudio () 1068Mix_CloseAudio ()
823 1069
824int 1070int
859 } 1105 }
860 } 1106 }
861#endif 1107#endif
862} 1108}
863 1109
864void 1110int
865add_font (char *file) 1111add_font (char *file)
866 CODE: 1112 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
868 1116
869void 1117void
870load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
871 ALIAS: 1119 ALIAS:
872 load_image_file = 1 1120 load_image_file = 1
958void 1206void
959error (char *message) 1207error (char *message)
960 CODE: 1208 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1210#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1212#endif
965 1213
966void 1214void
967fatal (char *message) 1215fatal (char *message)
968 CODE: 1216 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1218#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1220#endif
973 _exit (1); 1221 _exit (1);
974 1222
975void 1223void
976_exit (int retval = 0) 1224_exit (int retval = 0)
988#if DEBUG 1236#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
990#endif 1238#endif
991} 1239}
992 1240
993MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1248MODULE = Deliantra::Client PACKAGE = DC::Font
994 1249
995PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
996 1251
997CFPlus::Font 1252DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1254 CODE:
1000{ 1255{
1001 int count; 1256 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1260}
1006 OUTPUT: 1261 OUTPUT:
1007 RETVAL 1262 RETVAL
1008 1263
1009void 1264void
1010DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
1011 CODE: 1266 CODE:
1012 pango_font_description_free (self); 1267 pango_font_description_free (self);
1013 1268
1014void 1269void
1015make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1016 PROTOTYPE: $ 1271 PROTOTYPE: $
1017 CODE: 1272 CODE:
1018 default_font = self; 1273 default_font = self;
1019 1274
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1276
1022PROTOTYPES: DISABLE 1277PROTOTYPES: DISABLE
1023 1278
1024void 1279void
1025reset_glyph_cache () 1280glyph_cache_backup ()
1026 PROTOTYPE: 1281 PROTOTYPE:
1027 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
1028 tc_clear (); 1289 tc_restore ();
1029 1290
1030CFPlus::Layout 1291DC::Layout
1031new (SV *class) 1292new (SV *class)
1032 CODE: 1293 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1034 1295
1035 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1046 OUTPUT: 1307 OUTPUT:
1047 RETVAL 1308 RETVAL
1048 1309
1049void 1310void
1050DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1051 CODE: 1312 CODE:
1052 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1053 rc_free (self->rc); 1314 rc_free (self->rc);
1054 Safefree (self); 1315 Safefree (self);
1055 1316
1056void 1317void
1057set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1058 CODE: 1319 CODE:
1059{ 1320{
1060 STRLEN textlen; 1321 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1062 1323
1063 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1064} 1325}
1065 1326
1066void 1327void
1067set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1068 CODE: 1329 CODE:
1069{ 1330{
1070 STRLEN textlen; 1331 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1072 1333
1073 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1074} 1335}
1075 1336
1076void 1337void
1077set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1078 CODE: 1339 CODE:
1079{ 1340{
1080 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1343 const char *pos = text;
1117 if (attrs) 1378 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1119} 1380}
1120 1381
1121void 1382void
1122get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1123 PPCODE: 1384 PPCODE:
1124{ 1385{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1387
1127 do 1388 do
1128 { 1389 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1391
1131 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1132 { 1393 {
1133 PangoRectangle extents; 1394 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1403
1143 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1144} 1405}
1145 1406
1146int 1407int
1147has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1148 CODE: 1409 CODE:
1149{ 1410{
1150 int lines = 1; 1411 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1152 1413
1157} 1418}
1158 OUTPUT: 1419 OUTPUT:
1159 RETVAL 1420 RETVAL
1160 1421
1161SV * 1422SV *
1162get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1163 CODE: 1424 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1427 OUTPUT:
1167 RETVAL 1428 RETVAL
1168 1429
1169void 1430void
1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171 CODE: 1432 CODE:
1172 self->r = r; 1433 self->r = r;
1173 self->g = g; 1434 self->g = g;
1174 self->b = b; 1435 self->b = b;
1175 self->a = a; 1436 self->a = a;
1176 1437
1177void 1438void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1440 CODE:
1180 if (self->font != font) 1441 if (self->font != font)
1181 { 1442 {
1182 self->font = font; 1443 self->font = font;
1183 layout_update_font (self); 1444 layout_update_font (self);
1184 } 1445 }
1185 1446
1186void 1447void
1187set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1188 CODE: 1449 CODE:
1189 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1190 { 1451 {
1191 self->base_height = base_height; 1452 self->base_height = base_height;
1192 layout_update_font (self); 1453 layout_update_font (self);
1193 } 1454 }
1194 1455
1195void 1456void
1196set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1458 CODE:
1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199 1460
1200void 1461void
1201set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1202 CODE: 1463 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1465
1205void 1466void
1206set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1207 CODE: 1468 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1470
1210void 1471void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1473 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1218 ); 1479 );
1219 1480
1220void 1481void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1483 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1485
1225void 1486void
1226size (CFPlus::Layout self) 1487size (DC::Layout self)
1227 PPCODE: 1488 PPCODE:
1228{ 1489{
1229 int w, h; 1490 int w, h;
1230 1491
1231 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1236} 1497}
1237 1498
1238int 1499int
1239descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1240 CODE: 1501 CODE:
1241{ 1502{
1242 PangoRectangle rect; 1503 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1246} 1507}
1247 OUTPUT: 1508 OUTPUT:
1248 RETVAL 1509 RETVAL
1249 1510
1250int 1511int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1513 CODE:
1253{ 1514{
1254 int index, trailing; 1515 int index, trailing;
1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1257} 1518}
1258 OUTPUT: 1519 OUTPUT:
1259 RETVAL 1520 RETVAL
1260 1521
1261void 1522void
1262cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1524 PPCODE:
1264{ 1525{
1265 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1528
1268 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1533}
1273 1534
1274void 1535void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1537 PPCODE:
1277{ 1538{
1278 int line, x; 1539 int line, x;
1279 1540
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1544 --line;
1545#endif
1283 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1549}
1287 1550
1288void 1551void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1553 PPCODE:
1291{ 1554{
1292 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1293 int index, trailing; 1556 int index, trailing;
1294 1557
1295 if (line < 0) 1558 if (line < 0)
1296 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1297 1560
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1300 1563
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302 1565
1303 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1573 }
1311} 1574}
1312 1575
1313void 1576void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1578 CODE:
1316 rc_clear (self->rc); 1579 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1318 self->pl, 1581 self->pl,
1319 self->rc, 1582 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1587 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1588 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1589 pango_layout_context_changed (self->pl);
1327 1590
1328void 1591void
1329draw (CFPlus::Layout self) 1592draw (DC::Layout self)
1330 CODE: 1593 CODE:
1331{ 1594{
1332 glEnable (GL_TEXTURE_2D); 1595 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1597 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1605 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1606 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1607 glDisable (GL_TEXTURE_2D);
1345} 1608}
1346 1609
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1611
1349PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1613
1353void 1614void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1616 CODE:
1356{ 1617{
1422 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1423 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1424 } 1685 }
1425} 1686}
1426 1687
1688void
1689draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE: 1810 CODE:
1429{ 1811{
1430 GLint width; 1812 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1433 RETVAL = width > 0; 1815 RETVAL = width > 0;
1434} 1816}
1435 OUTPUT: 1817 OUTPUT:
1436 RETVAL 1818 RETVAL
1437 1819
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1821
1440PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1441 1823
1442CFPlus::Map 1824DC::Map
1443new (SV *class) 1825new (SV *class)
1444 CODE: 1826 CODE:
1445 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1828 RETVAL->x = 0;
1447 RETVAL->y = 0; 1829 RETVAL->y = 0;
1455 RETVAL->row = 0; 1837 RETVAL->row = 0;
1456 OUTPUT: 1838 OUTPUT:
1457 RETVAL 1839 RETVAL
1458 1840
1459void 1841void
1460DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1461 CODE: 1843 CODE:
1462{ 1844{
1463 map_clear (self); 1845 map_clear (self);
1464 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1465 Safefree (self->tex); 1847 Safefree (self->tex);
1466 Safefree (self); 1848 Safefree (self);
1467} 1849}
1468 1850
1469void 1851void
1470resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1853 CODE:
1472 self->w = map_width; 1854 self->w = map_width;
1473 self->h = map_height; 1855 self->h = map_height;
1474 1856
1475void 1857void
1476clear (CFPlus::Map self) 1858clear (DC::Map self)
1477 CODE: 1859 CODE:
1478 map_clear (self); 1860 map_clear (self);
1479 1861
1480void 1862void
1481set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1864 CODE:
1483{ 1865{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1867 need_texid (self, tile);
1486} 1868}
1487 1869
1488void 1870void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1872 CODE:
1491{ 1873{
1492 tileid texid; 1874 tileid texid;
1493 maptex *tex; 1875 maptex *tex;
1494 1876
1507 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1509} 1891}
1510 1892
1511void 1893void
1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1894set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1513 CODE: 1895 CODE:
1514{ 1896{
1515 need_texid (self, texid); 1897 need_texid (self, texid);
1516 1898
1517 { 1899 {
1536 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1537 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1921}
1540 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1541int 1943int
1542ox (CFPlus::Map self) 1944ox (DC::Map self)
1543 ALIAS: 1945 ALIAS:
1544 oy = 1 1946 oy = 1
1545 x = 2 1947 x = 2
1546 y = 3 1948 y = 3
1547 w = 4 1949 w = 4
1558 } 1960 }
1559 OUTPUT: 1961 OUTPUT:
1560 RETVAL 1962 RETVAL
1561 1963
1562void 1964void
1563scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1564 CODE: 1966 CODE:
1565{ 1967{
1566 if (dx > 0) 1968 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1970 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1585 } 1987 }
1586} 1988}
1587 1989
1588SV * 1990SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1992 CODE:
1591{ 1993{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1996 mapcell *cell;
1622 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1623 2025
1624 do 2026 do
1625 { 2027 {
1626 ext = *data++; 2028 ext = *data++;
1627 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1628 2030
1629 if (cmd < 4) 2031 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1631 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1632 { 2034 {
1633 cell->stat_width = 1; 2035 cell->stat_width = 1;
1634 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1635 } 2037 }
1636 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1639 { 2041 {
1640 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1641 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642 2046
1643 data += *data + 1; 2047 data += *data + 1;
1644 } 2048 }
1645 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 2050 cell->flags = *data++;
1663 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1664 2068
1665 if (cell->tile [z]) 2069 if (cell->tile [z])
1666 { 2070 {
1667 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1668 if (!tex->name) 2073 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1670 2075
1671 if (tex->smoothtile) 2076 if (tex->smoothtile)
1672 { 2077 {
1673 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1674 if (!smooth->name) 2080 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1676 } 2082 }
1677 } 2083 }
1678 } 2084 }
1679 } 2085 }
1680 else 2086 else
1681 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1682 } 2088 }
1683} 2089}
1684 OUTPUT: 2090 OUTPUT:
1685 RETVAL 2091 RETVAL
1686 2092
1687SV * 2093SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 2095 CODE:
1690{ 2096{
1691 int x1, x; 2097 int x1, x;
1692 int y1, y; 2098 int y1, y;
1693 int z; 2099 int z;
1738} 2144}
1739 OUTPUT: 2145 OUTPUT:
1740 RETVAL 2146 RETVAL
1741 2147
1742void 2148void
1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744 CODE: 2150 CODE:
1745{ 2151{
1746 int x, y, z; 2152 int x, y, z;
1747 2153
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751 smooth_key skey; 2157 smooth_key skey;
1752 2158 int pl_x, pl_y;
2159 maptex pl_tex;
1753 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1754 rc_key_t key; 2162 rc_key_t key;
1755 rc_array_t *arr; 2163 rc_array_t *arr;
1756 2164
2165 pl_tex.name = 0;
2166
1757 // thats current max. sorry. 2167 // that's current max. sorry.
1758 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1759 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1760 2170
1761 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1766 key.g = 255; 2176 key.g = 255;
1767 key.b = 255; 2177 key.b = 255;
1768 key.a = 255; 2178 key.a = 255;
1769 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772 2181
1773 mx += self->x; 2182 mx += self->x;
1774 my += self->y; 2183 my += self->y;
1775 2184
1776 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801 2210
1802 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1803 { 2212 {
1804 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1805 2215
1806 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1807 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1808 { 2218 {
1809 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
1819 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1820 int px, py; 2230 int px, py;
1821 2231
1822 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1823 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1824 if (!tex.name) 2236 if (!tex.name)
1825 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826 2238
1827 key.texname = tex.name; 2239 key.texname = tex.name;
1828 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1829 } 2241 }
1830 2242
1831 px = (x + 1) * T - tex.w; 2243 px = (x + 1) * T - tex.w;
1832 py = (y + 1) * T - tex.h; 2244 py = (y + 1) * T - tex.h;
2245
2246 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 {
2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
2251 continue;
2252 }
1833 2253
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2255 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2256 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2257 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838
1839 if (cell->flags && z == 2)
1840 {
1841 // overlays such as the speech bubble, probably more to come
1842 if (cell->flags & 1)
1843 {
1844 maptex tex = self->tex [1];
1845 int px = x * T + T * 2 / 32;
1846 int py = y * T - T * 6 / 32;
1847
1848 if (tex.name)
1849 {
1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860 }
1861 }
1862 }
1863 2258
1864 // update smooth hash 2259 // update smooth hash
1865 if (tex.smoothtile) 2260 if (tex.smoothtile)
1866 { 2261 {
1867 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
1896 // corners 2291 // corners
1897 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2292 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1899 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1900 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2296 }
2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901 } 2317 }
1902 } 2318 }
1903 } 2319 }
1904 } 2320 }
1905 2321
1945 { 2361 {
1946 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
1947 // save gobs of state changes. 2363 // save gobs of state changes.
1948 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
1949 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
1950 glEnd (); 2368 glEnd ();
1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952 glBegin (GL_QUADS); 2370 glBegin (GL_QUADS);
1953 } 2371 }
1954 2372
1983 } 2401 }
1984 2402
1985 hv_clear (smooth); 2403 hv_clear (smooth);
1986 } 2404 }
1987 2405
2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
2411
2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
2420 rc_draw (rc);
2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
2425
1988 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
1989 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
1990 2429
1991 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1992 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1994 { 2433 {
1999 { 2438 {
2000 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
2001 2440
2002 int px = x * T; 2441 int px = x * T;
2003 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
2004 2449
2005 if (cell->stat_hp) 2450 if (cell->stat_hp)
2006 { 2451 {
2007 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
2008 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2019 } 2464 }
2020 } 2465 }
2021} 2466}
2022 2467
2023void 2468void
2024draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2025 CODE: 2470 CODE:
2026{ 2471{
2027 static float color[16][3] = { 2472 static float color[16][3] = {
2028 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
2029 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
2030 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
2031 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
2032 2477
2033 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2034 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2035 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2036 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2037 2482
2038 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2039 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2040 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2041 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2042 2487
2043 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2044 2489
2045 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2046 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2047 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2048 }; 2493 };
2049 2494
2050 int x, y; 2495 int x, y;
2051 2496
2052 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
2053 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2055 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2057 2508
2058 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
2062 2513
2063 if (m) 2514 if (m)
2064 { 2515 {
2065 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2066 2517
2067 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2068 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2069 2520
2070 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2071 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075 } 2526 }
2079 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2080 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2081} 2532}
2082 2533
2083void 2534void
2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085 PPCODE: 2536 PPCODE:
2086{ 2537{
2087 int x, y; 2538 int x, y;
2088 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2089 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2090 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2091 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095 2546
2096 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2097 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2098 2549
2099 mx += self->x - 1; 2550 mx += self->x - 1;
2100 my += self->y - 1; 2551 my += self->y - 1;
2101
2102 memset (darkness1, 255, sw1 * sh1);
2103 2552
2104 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2105 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2106 { 2555 {
2107 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
2110 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2111 { 2560 {
2112 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2113 2562
2114 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2115 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117 } 2566 }
2118 } 2567 }
2119 2568
2120 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
2140 2589
2141 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2144 2593
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154 } 2603 }
2155 2604
2156 free (darkness1); 2605 free (darkness1);
2157 2606
2158 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2159 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2160 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2161 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2162} 2611}
2163 2612
2164SV * 2613SV *
2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2166 CODE: 2615 CODE:
2167{ 2616{
2168 int x, y, x1, y1; 2617 int x, y, x1, y1;
2169 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2170 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2227 else 2676 else
2228 *data++ = 0; 2677 *data++ = 0;
2229 } 2678 }
2230 } 2679 }
2231 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2232 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2233 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2234 RETVAL = data_sv; 2688 RETVAL = data_sv;
2235} 2689}
2236 OUTPUT: 2690 OUTPUT:
2237 RETVAL 2691 RETVAL
2238 2692
2239void 2693void
2240set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241 PPCODE: 2695 PPCODE:
2242{ 2696{
2243 int x, y, z; 2697 int x, y, z;
2244 int w, h; 2698 int w, h;
2245 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2246 2710
2247 if (*data++ != 0) 2711 if (*data++ != 0)
2248 XSRETURN_EMPTY; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2249 2713
2250 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2265 { 2729 {
2266 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2267 2731
2268 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2269 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2270 uint8_t flags = *data++; 2739 flags = *data++;
2271 2740
2272 if (flags) 2741 if (flags)
2273 { 2742 {
2274 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2275 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
2278 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280 2749
2281 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2282 { 2751 {
2283 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2284 2754
2285 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2286 { 2756 {
2287 tileid t = tile [z]; 2757 tileid t = tile [z];
2288 2758
2289 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2290 { 2760 {
2291 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2292 need_texid (self, t); 2762 need_texid (self, t);
2293 } 2763 }
2294 2764
2295 cell->tile [z] = t; 2765 cell->tile [z] = t;
2296 } 2766 }
2298 } 2768 }
2299 } 2769 }
2300 } 2770 }
2301} 2771}
2302 2772
2303MODULE = CFPlus PACKAGE = CFPlus::RW 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2304 2774
2305CFPlus::RW 2775DC::RW
2306new (SV *class, SV *data_sv) 2776new (SV *class, SV *data_sv)
2307 CODE: 2777 CODE:
2308{ 2778{
2309 STRLEN datalen; 2779 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen); 2780 char *data = SvPVbyte (data_sv, datalen);
2312 RETVAL = SDL_RWFromConstMem (data, datalen); 2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2313} 2783}
2314 OUTPUT: 2784 OUTPUT:
2315 RETVAL 2785 RETVAL
2316 2786
2317CFPlus::RW 2787DC::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb") 2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE: 2789 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode); 2790 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT: 2791 OUTPUT:
2322 RETVAL 2792 RETVAL
2323 2793
2324# fails on win32: 2794# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '(' 2795# dc.xs(2268) : error C2059: syntax error : '('
2326#void 2796#void
2327#close (CFPlus::RW self) 2797#close (DC::RW self)
2328# CODE: 2798# CODE:
2329# (self->(close)) (self); 2799# (self->(close)) (self);
2330 2800
2331MODULE = CFPlus PACKAGE = CFPlus::Channel 2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2332 2802
2333PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2334 2804
2335CFPlus::Channel 2805DC::Channel
2336find () 2806find ()
2337 CODE: 2807 CODE:
2338{ 2808{
2339 RETVAL = Mix_GroupAvailable (-1); 2809 RETVAL = Mix_GroupAvailable (-1);
2340 2810
2341 if (RETVAL < 0) 2811 if (RETVAL < 0)
2342 { 2812 {
2343 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2344 2814
2345 if (RETVAL < 0) 2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2346 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2347 2822 }
2823 else
2348 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2349 } 2825 }
2350 2826
2351 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2352 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2353} 2829}
2354 OUTPUT: 2830 OUTPUT:
2355 RETVAL 2831 RETVAL
2356 2832
2357void 2833void
2358halt (CFPlus::Channel self) 2834halt (DC::Channel self)
2359 CODE: 2835 CODE:
2360 Mix_HaltChannel (self); 2836 Mix_HaltChannel (self);
2361 2837
2362void 2838void
2363expire (CFPlus::Channel self, int ticks = -1) 2839expire (DC::Channel self, int ticks = -1)
2364 CODE: 2840 CODE:
2365 Mix_ExpireChannel (self, ticks); 2841 Mix_ExpireChannel (self, ticks);
2366 2842
2367void 2843void
2368fade_out (CFPlus::Channel self, int ticks = -1) 2844fade_out (DC::Channel self, int ticks = -1)
2369 CODE: 2845 CODE:
2370 Mix_FadeOutChannel (self, ticks); 2846 Mix_FadeOutChannel (self, ticks);
2371 2847
2372int 2848int
2373volume (CFPlus::Channel self, int volume) 2849volume (DC::Channel self, int volume)
2374 CODE: 2850 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT: 2852 OUTPUT:
2377 RETVAL 2853 RETVAL
2378 2854
2379void 2855void
2380unregister_all_effects (CFPlus::Channel self) 2856unregister_all_effects (DC::Channel self)
2381 CODE: 2857 CODE:
2382 Mix_UnregisterAllEffects (self); 2858 Mix_UnregisterAllEffects (self);
2383 2859
2384void 2860void
2385set_panning (CFPlus::Channel self, int left, int right) 2861set_panning (DC::Channel self, int left, int right)
2386 CODE: 2862 CODE:
2387 left = CLAMP (left , 0, 255); 2863 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255); 2864 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right); 2865 Mix_SetPanning (self, left, right);
2390 2866
2391void 2867void
2392set_distance (CFPlus::Channel self, int distance) 2868set_distance (DC::Channel self, int distance)
2393 CODE: 2869 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395 2871
2396void 2872void
2397set_position (CFPlus::Channel self, int angle, int distance) 2873set_position (DC::Channel self, int angle, int distance)
2398 CODE: 2874 CODE:
2399 2875
2400void 2876void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402 CODE: 2878 CODE:
2403{ 2879{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2880 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407} 2883}
2408 2884
2409void 2885void
2410set_reverse_stereo (CFPlus::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2411 CODE: 2887 CODE:
2412 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2413 2889
2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415 2891
2416PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2417 2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2418CFPlus::MixChunk 2906DC::MixChunk
2419new (SV *class, CFPlus::RW rwops) 2907new (SV *class, DC::RW rwops)
2420 CODE: 2908 CODE:
2421 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422 OUTPUT: 2910 OUTPUT:
2423 RETVAL 2911 RETVAL
2424 2912
2425void 2913void
2426DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2427 CODE: 2915 CODE:
2428 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2429 2917
2430int 2918int
2431volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2432 CODE: 2920 CODE:
2433 if (items > 1) 2921 if (items > 1)
2434 volume = CLAMP (volume, 0, 128); 2922 volume = CLAMP (volume, 0, 128);
2435 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2436 OUTPUT: 2924 OUTPUT:
2437 RETVAL 2925 RETVAL
2438 2926
2439CFPlus::Channel 2927DC::Channel
2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441 CODE: 2929 CODE:
2442{ 2930{
2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444 2932
2445 if (RETVAL < 0) 2933 if (RETVAL < 0)
2452 } 2940 }
2453} 2941}
2454 OUTPUT: 2942 OUTPUT:
2455 RETVAL 2943 RETVAL
2456 2944
2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2458 2958
2459int 2959int
2460volume (int volume = -1) 2960volume (int volume = -1)
2461 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2462 CODE: 2962 CODE:
2474void 2974void
2475halt () 2975halt ()
2476 CODE: 2976 CODE:
2477 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2478 2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2985
2479CFPlus::MixMusic 2986DC::MixMusic
2480new (SV *class, CFPlus::RW rwops) 2987new (SV *class, DC::RW rwops)
2481 CODE: 2988 CODE:
2482 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2483 OUTPUT: 2990 OUTPUT:
2484 RETVAL 2991 RETVAL
2485 2992
2486void 2993void
2487DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2488 CODE: 2995 CODE:
2489 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2490 2997
2491int 2998int
2492play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2493 CODE: 3000 CODE:
2494 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2495 OUTPUT: 3002 OUTPUT:
2496 RETVAL 3003 RETVAL
2497 3004
2498void 3005void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500 CODE: 3007 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2502 3009
2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504 3011
2505PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2506 3013
2507BOOT: 3014BOOT:
2508{ 3015{
2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510 static const struct { 3017 static const struct {
2511 const char *name; 3018 const char *name;
2512 IV iv; 3019 IV iv;
2513 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2514# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2518 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2519 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2520 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2521 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2522 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
2534 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2535 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2536 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2537 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2539 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2540 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2541 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2542 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2543 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
2549 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2550 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2551 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2552 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2554 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2557 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2558 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT), 3116 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT), 3117 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT), 3118 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT), 3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE), 3122 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2605 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2606 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2607 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2608 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2609# undef const_iv 3131# undef const_iv
2610 }; 3132 };
2611 3133
2612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614 3136
2615 texture_av = newAV (); 3137 texture_av = newAV ();
2616 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2617} 3139}
2618 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2619char * 3150char *
2620gl_vendor () 3151gl_vendor ()
2621 CODE: 3152 CODE:
2622 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2623 OUTPUT: 3154 OUTPUT:
2671void glBlendFunc (int sfactor, int dfactor) 3202void glBlendFunc (int sfactor, int dfactor)
2672 3203
2673void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3204void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674 CODE: 3205 CODE:
2675 gl_BlendFuncSeparate (sa, da, saa, daa); 3206 gl_BlendFuncSeparate (sa, da, saa, daa);
3207
3208# void glBlendEquation (int se)
2676 3209
2677void glDepthMask (int flag) 3210void glDepthMask (int flag)
2678 3211
2679void glLogicOp (int opcode) 3212void glLogicOp (int opcode)
2680 3213
2715void glRotate (float angle, float x, float y, float z) 3248void glRotate (float angle, float x, float y, float z)
2716 CODE: 3249 CODE:
2717 glRotatef (angle, x, y, z); 3250 glRotatef (angle, x, y, z);
2718 3251
2719void glColor (float r, float g, float b, float a = 1.0) 3252void glColor (float r, float g, float b, float a = 1.0)
3253 PROTOTYPE: @
2720 ALIAS: 3254 ALIAS:
2721 glColor_premultiply = 1 3255 glColor_premultiply = 1
2722 CODE: 3256 CODE:
2723 if (ix) 3257 if (ix)
2724 { 3258 {
2744 3278
2745void glRect (float x1, float y1, float x2, float y2) 3279void glRect (float x1, float y1, float x2, float y2)
2746 CODE: 3280 CODE:
2747 glRectf (x1, y1, x2, y2); 3281 glRectf (x1, y1, x2, y2);
2748 3282
3283void glRect_lineloop (float x1, float y1, float x2, float y2)
3284 CODE:
3285 glBegin (GL_LINE_LOOP);
3286 glVertex2f (x1, y1);
3287 glVertex2f (x2, y1);
3288 glVertex2f (x2, y2);
3289 glVertex2f (x1, y2);
3290 glEnd ();
3291
2749PROTOTYPES: ENABLE 3292PROTOTYPES: ENABLE
2750 3293
2751void glBegin (int mode) 3294void glBegin (int mode)
2752 3295
2753void glEnd () 3296void glEnd ()
2785void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3328void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786 CODE: 3329 CODE:
2787 if (gl.SeparableFilter2D) 3330 if (gl.SeparableFilter2D)
2788 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3331 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789 3332
2790void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3333void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791 3334
2792void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3335void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793 3336
2794void glDrawPixels (int width, int height, int format, int type, char *pixels) 3337void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795 3338
2821 3364
2822void glEndList () 3365void glEndList ()
2823 3366
2824void glCallList (int list) 3367void glCallList (int list)
2825 3368
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3369void c_init ()
3370 CODE:
3371 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3372 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3373
3374MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827 3375
2828PROTOTYPES: DISABLE 3376PROTOTYPES: DISABLE
2829 3377
2830void 3378void
2831find_widget (SV *self, NV x, NV y) 3379find_widget (SV *self, NV x, NV y)
2835 XPUSHs (self); 3383 XPUSHs (self);
2836} 3384}
2837 3385
2838BOOT: 3386BOOT:
2839{ 3387{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3388 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841 3389
2842 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3390 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2843 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3391 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2844 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3392 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2845 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3393 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846} 3394}
2847 3395
2848void 3396void
2849draw (SV *self) 3397draw (SV *self)
2850 CODE: 3398 CODE:
2857 SV *draw_w_sv = GvSV (draw_w_gv); 3405 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv); 3406 SV *draw_h_sv = GvSV (draw_h_gv);
2859 double draw_x, draw_y; 3407 double draw_x, draw_y;
2860 3408
2861 if (!SvROK (self)) 3409 if (!SvROK (self))
2862 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3410 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2863 3411
2864 hv = (HV *)SvRV (self); 3412 hv = (HV *)SvRV (self);
2865 3413
2866 if (SvTYPE (hv) != SVt_PVHV) 3414 if (SvTYPE (hv) != SVt_PVHV)
2867 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3415 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2868 3416
2869 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3417 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2870 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3418 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2871 3419
2872 if (!h || !w) 3420 if (!h || !w)
2905 glEnd (); 3453 glEnd ();
2906 glDisable (GL_BLEND); 3454 glDisable (GL_BLEND);
2907 } 3455 }
2908 } 3456 }
2909#if 0 3457#if 0
2910 if ($ENV{CFPLUS_DEBUG} & 1) { 3458 // draw borders, for debugging
2911 glPushMatrix; 3459 glPushMatrix ();
2912 glColor 1, 1, 0, 1; 3460 glColor4f (1., 1., 0., 1.);
2913 glTranslate 0.375, 0.375; 3461 glTranslatef (.5, .5, 0.);
2914 glBegin GL_LINE_LOOP; 3462 glBegin (GL_LINE_LOOP);
2915 glVertex 0 , 0; 3463 glVertex2f (0 , 0);
2916 glVertex $self->{w} - 1, 0; 3464 glVertex2f (w - 1, 0);
2917 glVertex $self->{w} - 1, $self->{h} - 1; 3465 glVertex2f (w - 1, h - 1);
2918 glVertex 0 , $self->{h} - 1; 3466 glVertex2f (0 , h - 1);
2919 glEnd; 3467 glEnd ();
2920 glPopMatrix; 3468 glPopMatrix ();
2921 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2922 }
2923#endif 3469#endif
2924 PUSHMARK (SP); 3470 PUSHMARK (SP);
2925 XPUSHs (self); 3471 XPUSHs (self);
2926 PUTBACK; 3472 PUTBACK;
2927 call_method ("_draw", G_VOID | G_DISCARD); 3473 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines