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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 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);
46#endif
47
44#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
46 50
47#include <glib/gmacros.h> 51#include <glib/gmacros.h>
48 52
49#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
50 65
51#ifndef _WIN32 66#ifndef _WIN32
52# include <sys/types.h> 67# include <sys/types.h>
53# include <sys/socket.h> 68# include <sys/socket.h>
54# include <netinet/in.h> 69# include <netinet/in.h>
55# include <netinet/tcp.h> 70# include <netinet/tcp.h>
56# include <inttypes.h> 71# include <inttypes.h>
57#endif 72#endif
58 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 84
61#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
62 87
63#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
65 90
66#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
67 92
68#if 0 93/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 95
71# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
72#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
73 101
74static AV *texture_av; 102static AV *texture_av;
75 103
76static struct 104static struct
77{ 105{
… …
114 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
116} 144}
117 145
118#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
119 148
120#include "pango-font.c" 149#include "pango-font.c"
121#include "pango-fontmap.c" 150#include "pango-fontmap.c"
122#include "pango-render.c" 151#include "pango-render.c"
123 152
124typedef IV CFPlus__Channel; 153typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 154typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
128 157
129typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
130 159
131static int 160static int
132shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
133{ 162{
134 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
148 177
149typedef struct cf_layout { 178typedef struct cf_layout {
150 PangoLayout *pl; 179 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
152 int base_height; 181 int base_height;
153 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
154} *CFPlus__Layout; 184} *DC__Layout;
155 185
156static CFPlus__Font default_font; 186static DC__Font default_font;
157static PangoContext *opengl_context; 187static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
159 189
160static void 190static void
161substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
166#endif 196#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 198}
169 199
170static void 200static void
171layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
172{ 202{
173 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
174 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
175 */ 205 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
177 207
178 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 210
181 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
182} 212}
183 213
184static void 214static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 216{
187 PangoRectangle rect; 217 PangoRectangle rect;
188 218
189 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
… …
201 231
202typedef uint16_t tileid; 232typedef uint16_t tileid;
203typedef uint16_t faceid; 233typedef uint16_t faceid;
204 234
205typedef struct { 235typedef struct {
206 int name; 236 GLuint name;
207 int w, h; 237 int w, h;
208 float s, t; 238 float s, t;
209 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
210 tileid smoothtile; 240 tileid smoothtile;
211 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
212} maptex; 243} maptex;
213 244
214typedef struct { 245typedef struct {
215 uint32_t player; 246 uint32_t player;
216 tileid tile[3]; 247 tileid tile[3];
… …
229 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
231 262
232 int32_t rows; 263 int32_t rows;
233 maprow *row; 264 maprow *row;
234} *CFPlus__Map; 265} *DC__Map;
235 266
236static char * 267static char *
237prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
238{ 269{
239 char *p; 270 char *p;
… …
277 self->texs *= 2; 308 self->texs *= 2;
278 } 309 }
279} 310}
280 311
281static maprow * 312static maprow *
282map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
283{ 314{
284 if (0 > y) 315 if (0 > y)
285 { 316 {
286 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
325 356
326 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
327} 358}
328 359
329static mapcell * 360static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
331{ 362{
332 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
333} 364}
334 365
335static void 366static void
336map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
337{ 368{
338 int r; 369 int r;
339 370
340 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
348 self->oy = 0; 379 self->oy = 0;
349 self->row = 0; 380 self->row = 0;
350 self->rows = 0; 381 self->rows = 0;
351} 382}
352 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
353static void 394static void
354map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
355{ 396{
356 int x, y; 397 int x, y;
357 maprow *row; 398 maprow *row;
358 mapcell *cell; 399 mapcell *cell;
359 400
… …
371 if (x >= row->c1) 412 if (x >= row->c1)
372 break; 413 break;
373 414
374 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
375 416
376 cell->darkness = 0; 417 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 418 }
381 } 419 }
382} 420}
383 421
384typedef struct { 422typedef struct {
… …
438 n |= n >> 16; 476 n |= n >> 16;
439 477
440 return n + 1; 478 return n + 1;
441} 479}
442 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
443/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
446 495
447/******************************************************************************/ 496/******************************************************************************/
… …
485 return 0; 534 return 0;
486 535
487 return 1; 536 return 1;
488} 537}
489 538
490MODULE = CFPlus PACKAGE = CFPlus 539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
491 592
492PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
493 594
494BOOT: 595BOOT:
495{ 596{
496 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 598 static const struct {
498 const char *name; 599 const char *name;
499 IV iv; 600 IV iv;
500 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
… …
523 624
524 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
527 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
… …
604 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
609# undef const_iv 795# undef const_iv
610 }; 796 };
611 797
612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
631 817
632NV floor (NV x) 818NV floor (NV x)
633 819
634NV ceil (NV x) 820NV ceil (NV x)
635 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
636void 832void
637pango_init () 833pango_init ()
638 CODE: 834 CODE:
639{ 835{
640 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
641 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
643} 844}
644 845
645char *
646SDL_GetError () 846char *SDL_GetError ()
647 847
648int 848void SDL_braino ()
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650 849
651void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
652SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
653 866
654void 867void
655SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
656 PPCODE: 869 PPCODE:
657{ 870{
… …
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 885
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 888
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 890
681 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
682 while (*m) 892 while (*m)
683 { 893 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 895 {
686 AV *av = newAV (); 896 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
… …
713 923
714 if (RETVAL) 924 if (RETVAL)
715 { 925 {
716 av_clear (texture_av); 926 av_clear (texture_av);
717 927
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720#include "glfunc.h" 930#include "glfunc.h"
721#undef GL_FUNC 931#undef GL_FUNC
722 } 932 }
723} 933}
… …
730char * 940char *
731SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
732 942
733int 943int
734SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
735 948
736void 949void
737poll_events () 950poll_events ()
738 PPCODE: 951 PPCODE:
739{ 952{
… …
749 { 962 {
750 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
751 case SDL_KEYUP: 964 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
755 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 970 break;
758 971
759 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
778 x = ev.motion.x; 991 x = ev.motion.x;
779 y = ev.motion.y; 992 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 994 }
782 995
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 1002 }
790 break; 1003 break;
791 1004
792 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 1008
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1019 break;
807 } 1020 }
808 1021
809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810 } 1023 }
811} 1024}
812 1025
813int 1026int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 1028 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
1031
1032void
1033Mix_QuerySpec ()
1034 PPCODE:
1035{
1036 int freq, channels;
1037 Uint16 format;
1038
1039 if (Mix_QuerySpec (&freq, &format, &channels))
1040 {
1041 EXTEND (SP, 3);
1042 PUSHs (sv_2mortal (newSViv (freq)));
1043 PUSHs (sv_2mortal (newSViv (format)));
1044 PUSHs (sv_2mortal (newSViv (channels)));
1045 }
1046}
818 1047
819void 1048void
820Mix_CloseAudio () 1049Mix_CloseAudio ()
821 1050
822int 1051int
… …
857 } 1086 }
858 } 1087 }
859#endif 1088#endif
860} 1089}
861 1090
862void 1091int
863add_font (char *file) 1092add_font (char *file)
864 CODE: 1093 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
866 1097
867void 1098void
868load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
869 ALIAS: 1100 ALIAS:
870 load_image_file = 1 1101 load_image_file = 1
… …
956void 1187void
957error (char *message) 1188error (char *message)
958 CODE: 1189 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1191#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1193#endif
963 1194
964void 1195void
965fatal (char *message) 1196fatal (char *message)
966 CODE: 1197 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1199#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1201#endif
971 _exit (1); 1202 _exit (1);
972 1203
973void 1204void
974_exit (int retval = 0) 1205_exit (int retval = 0)
… …
986#if DEBUG 1217#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
988#endif 1219#endif
989} 1220}
990 1221
991MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
992 1230
993PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
994 1232
995CFPlus::Font 1233DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1235 CODE:
998{ 1236{
999 int count; 1237 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1003} 1241}
1004 OUTPUT: 1242 OUTPUT:
1005 RETVAL 1243 RETVAL
1006 1244
1007void 1245void
1008DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
1009 CODE: 1247 CODE:
1010 pango_font_description_free (self); 1248 pango_font_description_free (self);
1011 1249
1012void 1250void
1013make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1014 PROTOTYPE: $ 1252 PROTOTYPE: $
1015 CODE: 1253 CODE:
1016 default_font = self; 1254 default_font = self;
1017 1255
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1257
1020PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1021 1259
1022void 1260void
1023reset_glyph_cache () 1261glyph_cache_backup ()
1024 PROTOTYPE: 1262 PROTOTYPE:
1025 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1026 tc_clear (); 1270 tc_restore ();
1027 1271
1028CFPlus::Layout 1272DC::Layout
1029new (SV *class) 1273new (SV *class)
1030 CODE: 1274 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1032 1276
1033 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
… …
1035 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1040 1285
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1043 OUTPUT: 1288 OUTPUT:
1044 RETVAL 1289 RETVAL
1045 1290
1046void 1291void
1047DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1048 CODE: 1293 CODE:
1049 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
1050 Safefree (self); 1296 Safefree (self);
1051 1297
1052void 1298void
1053set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1054 CODE: 1300 CODE:
1055{ 1301{
1056 STRLEN textlen; 1302 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1058 1304
1059 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1060} 1306}
1061 1307
1062void 1308void
1063set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1064 CODE: 1310 CODE:
1065{ 1311{
1066 STRLEN textlen; 1312 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1068 1314
1069 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1070} 1316}
1071 1317
1072void 1318void
1073set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1074 CODE: 1320 CODE:
1075{ 1321{
1076 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1324 const char *pos = text;
… …
1113 if (attrs) 1359 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1115} 1361}
1116 1362
1117void 1363void
1118get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1119 PPCODE: 1365 PPCODE:
1120{ 1366{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1368
1123 do 1369 do
1124 { 1370 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1372
1127 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1128 { 1374 {
1129 PangoRectangle extents; 1375 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1138 1384
1139 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1140} 1386}
1141 1387
1142int 1388int
1143has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1144 CODE: 1390 CODE:
1145{ 1391{
1146 int lines = 1; 1392 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1148 1394
… …
1153} 1399}
1154 OUTPUT: 1400 OUTPUT:
1155 RETVAL 1401 RETVAL
1156 1402
1157SV * 1403SV *
1158get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1159 CODE: 1405 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1408 OUTPUT:
1163 RETVAL 1409 RETVAL
1164 1410
1165void 1411void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1413 CODE:
1168 self->r = r; 1414 self->r = r;
1169 self->g = g; 1415 self->g = g;
1170 self->b = b; 1416 self->b = b;
1171 self->a = a; 1417 self->a = a;
1172 1418
1173void 1419void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1421 CODE:
1176 if (self->font != font) 1422 if (self->font != font)
1177 { 1423 {
1178 self->font = font; 1424 self->font = font;
1179 layout_update_font (self); 1425 layout_update_font (self);
1180 } 1426 }
1181 1427
1182void 1428void
1183set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1184 CODE: 1430 CODE:
1185 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1186 { 1432 {
1187 self->base_height = base_height; 1433 self->base_height = base_height;
1188 layout_update_font (self); 1434 layout_update_font (self);
1189 } 1435 }
1190 1436
1191void 1437void
1192set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1439 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1441
1196void 1442void
1197set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1198 CODE: 1444 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1446
1201void 1447void
1202set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1203 CODE: 1449 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1451
1206void 1452void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1454 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1214 ); 1460 );
1215 1461
1216void 1462void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1464 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1466
1221void 1467void
1222size (CFPlus::Layout self) 1468size (DC::Layout self)
1223 PPCODE: 1469 PPCODE:
1224{ 1470{
1225 int w, h; 1471 int w, h;
1226 1472
1227 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
… …
1230 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1232} 1478}
1233 1479
1234int 1480int
1235descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1236 CODE: 1482 CODE:
1237{ 1483{
1238 PangoRectangle rect; 1484 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1242} 1488}
1243 OUTPUT: 1489 OUTPUT:
1244 RETVAL 1490 RETVAL
1245 1491
1246int 1492int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1494 CODE:
1249{ 1495{
1250 int index, trailing; 1496 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1253} 1499}
1254 OUTPUT: 1500 OUTPUT:
1255 RETVAL 1501 RETVAL
1256 1502
1257void 1503void
1258cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1505 PPCODE:
1260{ 1506{
1261 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1509
1264 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1514}
1269 1515
1270void 1516void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1518 PPCODE:
1273{ 1519{
1274 int line, x; 1520 int line, x;
1275 1521
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1525 --line;
1526#endif
1279 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1530}
1283 1531
1284void 1532void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1534 PPCODE:
1287{ 1535{
1288 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1289 int index, trailing; 1537 int index, trailing;
1290 1538
1291 if (line < 0) 1539 if (line < 0)
1292 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1293 1541
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1296 1544
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1546
1299 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
… …
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1554 }
1307} 1555}
1308 1556
1309void 1557void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1313 self->pl, 1562 self->pl,
1563 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1316 flags 1566 flags
1317 ); 1567 );
1568 // we assume that context_change actually clears/frees stuff
1569 // and does not do any recomputation...
1570 pango_layout_context_changed (self->pl);
1318 1571
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1572void
1573draw (DC::Layout self)
1574 CODE:
1575{
1576 glEnable (GL_TEXTURE_2D);
1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1578 glEnable (GL_BLEND);
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583
1584 rc_draw (self->rc);
1585
1586 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D);
1589}
1590
1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1592
1321PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1594
1325void 1595void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1597 CODE:
1328{ 1598{
… …
1394 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1395 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1396 } 1666 }
1397} 1667}
1398 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1399IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1400 CODE: 1759 CODE:
1401{ 1760{
1402 GLint width; 1761 GLint width;
1403 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
… …
1405 RETVAL = width > 0; 1764 RETVAL = width > 0;
1406} 1765}
1407 OUTPUT: 1766 OUTPUT:
1408 RETVAL 1767 RETVAL
1409 1768
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1770
1412PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1413 1772
1414CFPlus::Map 1773DC::Map
1415new (SV *class) 1774new (SV *class)
1416 CODE: 1775 CODE:
1417 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1777 RETVAL->x = 0;
1419 RETVAL->y = 0; 1778 RETVAL->y = 0;
… …
1427 RETVAL->row = 0; 1786 RETVAL->row = 0;
1428 OUTPUT: 1787 OUTPUT:
1429 RETVAL 1788 RETVAL
1430 1789
1431void 1790void
1432DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1433 CODE: 1792 CODE:
1434{ 1793{
1435 map_clear (self); 1794 map_clear (self);
1436 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1437 Safefree (self->tex); 1796 Safefree (self->tex);
1438 Safefree (self); 1797 Safefree (self);
1439} 1798}
1440 1799
1441void 1800void
1442resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1802 CODE:
1444 self->w = map_width; 1803 self->w = map_width;
1445 self->h = map_height; 1804 self->h = map_height;
1446 1805
1447void 1806void
1448clear (CFPlus::Map self) 1807clear (DC::Map self)
1449 CODE: 1808 CODE:
1450 map_clear (self); 1809 map_clear (self);
1451 1810
1452void 1811void
1453set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1813 CODE:
1455{ 1814{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1816 need_texid (self, tile);
1458} 1817}
1459 1818
1460void 1819void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1821 CODE:
1463{ 1822{
1464 tileid texid; 1823 tileid texid;
1465 maptex *tex; 1824 maptex *tex;
1466 1825
… …
1479 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1481} 1840}
1482 1841
1483void 1842void
1484set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1843set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485 CODE: 1844 CODE:
1486{ 1845{
1487 need_texid (self, texid); 1846 need_texid (self, texid);
1488 1847
1489 { 1848 {
… …
1508 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1509 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1870}
1512 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1513int 1892int
1514ox (CFPlus::Map self) 1893ox (DC::Map self)
1515 ALIAS: 1894 ALIAS:
1516 oy = 1 1895 oy = 1
1517 x = 2 1896 x = 2
1518 y = 3 1897 y = 3
1519 w = 4 1898 w = 4
… …
1530 } 1909 }
1531 OUTPUT: 1910 OUTPUT:
1532 RETVAL 1911 RETVAL
1533 1912
1534void 1913void
1535scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1536 CODE: 1915 CODE:
1537{ 1916{
1538 if (dx > 0) 1917 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1919 else if (dx < 0)
… …
1556 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1557 } 1936 }
1558} 1937}
1559 1938
1560SV * 1939SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1941 CODE:
1563{ 1942{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1945 mapcell *cell;
… …
1594 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1595 1974
1596 do 1975 do
1597 { 1976 {
1598 ext = *data++; 1977 ext = *data++;
1599 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1600 1979
1601 if (cmd < 4) 1980 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1604 { 1983 {
… …
1607 } 1986 }
1608 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1611 { 1990 {
1612 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1613 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614 1995
1615 data += *data + 1; 1996 data += *data + 1;
1616 } 1997 }
1617 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 1999 cell->flags = *data++;
… …
1635 cell->tile [z] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
1636 2017
1637 if (cell->tile [z]) 2018 if (cell->tile [z])
1638 { 2019 {
1639 maptex *tex = self->tex + cell->tile [z]; 2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
1640 if (!tex->name) 2022 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z])); 2023 av_push (missing, newSViv (cell->tile [z]));
1642 2024
1643 if (tex->smoothtile) 2025 if (tex->smoothtile)
1644 { 2026 {
1645 maptex *smooth = self->tex + tex->smoothtile; 2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
1646 if (!smooth->name) 2029 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile)); 2030 av_push (missing, newSViv (tex->smoothtile));
1648 } 2031 }
1649 } 2032 }
1650 } 2033 }
1651 } 2034 }
1652 else 2035 else
1653 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1654 } 2037 }
1655} 2038}
1656 OUTPUT: 2039 OUTPUT:
1657 RETVAL 2040 RETVAL
1658 2041
1659SV * 2042SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 2044 CODE:
1662{ 2045{
1663 int x1, x; 2046 int x1, x;
1664 int y1, y; 2047 int y1, y;
1665 int z; 2048 int z;
… …
1710} 2093}
1711 OUTPUT: 2094 OUTPUT:
1712 RETVAL 2095 RETVAL
1713 2096
1714void 2097void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716 CODE: 2099 CODE:
1717{ 2100{
2101 int x, y, z;
2102
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 2106 smooth_key skey;
1722 int x, y, z; 2107 int pl_x, pl_y;
1723 int last_name; 2108 maptex pl_tex;
2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden;
1724 2113
2114 pl_tex.name = 0;
2115
1725 // thats current max. sorry. 2116 // that's current max. sorry.
1726 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1728 2119
1729 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1731 2122
1732 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1733 2124 key.r = 255;
1734 glEnable (GL_BLEND); 2125 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1738 2129 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1;
1742 2130
1743 mx += self->x; 2131 mx += self->x;
1744 my += self->y; 2132 my += self->y;
1745 2133
1746 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
… …
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1765 } 2153 }
1766 } 2154 }
1767 2155
2156 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1768 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1769 { 2164 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1771 2167
1772 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1773 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1774 { 2170 {
1775 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
… …
1783 if (tile) 2179 if (tile)
1784 { 2180 {
1785 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1786 int px, py; 2182 int px, py;
1787 2183
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1791 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1792 if (!tex.name) 2188 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1794 2190
1795 glEnd (); 2191 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2193 }
1799 2194
1800 px = (x + 1) * T - tex.w; 2195 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h; 2196 py = (y + 1) * T - tex.h;
1802 2197
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2199 {
1810 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1811 { 2203 continue;
1812 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32;
1815
1816 glEnd ();
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1818 glBegin (GL_QUADS);
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 }
1825 } 2204 }
2205
2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1826 2210
1827 // update smooth hash 2211 // update smooth hash
1828 if (tex.smoothtile) 2212 if (tex.smoothtile)
1829 { 2213 {
1830 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
… …
1861 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1862 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1863 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1864 } 2248 }
1865 } 2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
2285 }
2286 }
1866 } 2287 }
1867 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1868 2292
1869 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2294 // this is basically counting sort
1871 { 2295 {
1872 int w, b; 2296 int w, b;
1873 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1875 { 2301 {
1876 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1877 if (smask) 2303 if (smask)
1878 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
… …
1897 int border = bits & 15; 2323 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1901 2327
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2328 if (tex.name)
1905 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1906 if (!tex.name) 2332 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1908 2335
1909 glEnd (); 2336 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1912 } 2339 }
1913 2340
1914 if (border) 2341 if (border)
1915 { 2342 {
1916 float ox = border * dx; 2343 float ox = border * dx;
1917 2344
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2349 }
1923 2350
1924 if (corner) 2351 if (corner)
1925 { 2352 {
1926 float ox = corner * dx; 2353 float ox = corner * dx;
1927 2354
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1932 } 2360 }
1933 } 2361 }
1934 } 2362 }
1935 } 2363 }
1936 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1937 } 2369 }
1938 2370
1939 hv_clear (smooth); 2371 hv_clear (smooth);
1940 } 2372 }
1941 2373
1942 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1943 2379
1944 glDisable (GL_TEXTURE_2D); 2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
1945 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1946 2397
1947 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1950 { 2401 {
… …
1955 { 2406 {
1956 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1957 2408
1958 int px = x * T; 2409 int px = x * T;
1959 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
1960 2417
1961 if (cell->stat_hp) 2418 if (cell->stat_hp)
1962 { 2419 {
1963 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1964 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1975 } 2432 }
1976 } 2433 }
1977} 2434}
1978 2435
1979void 2436void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1981 CODE: 2438 CODE:
1982{ 2439{
1983 static float color[16][3] = { 2440 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1988 2445
1989 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1993 2450
1994 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1998 2455
1999 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
2000 2457
2001 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
2004 }; 2461 };
2005 2462
2006 int x, y; 2463 int x, y;
2007 2464
2008 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
2013 2476
2014 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
… …
2018 2481
2019 if (m) 2482 if (m)
2020 { 2483 {
2021 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2022 2485
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2025 2488
2026 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2494 }
… …
2035 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2037} 2500}
2038 2501
2039void 2502void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2504 PPCODE:
2042{ 2505{
2043 int x, y; 2506 int x, y;
2044 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
… …
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2054 2517
2055 mx += self->x - 1; 2518 mx += self->x - 1;
2056 my += self->y - 1; 2519 my += self->y - 1;
2057 2520
2058 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2059 2522
2060 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2062 { 2525 {
2063 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
… …
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2530 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2069 2532
2070 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2536 }
2074 } 2537 }
2075 2538
2076 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
… …
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2118} 2581}
2119 2582
2120SV * 2583SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2585 CODE:
2123{ 2586{
2124 int x, y, x1, y1; 2587 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2183 else 2646 else
2184 *data++ = 0; 2647 *data++ = 0;
2185 } 2648 }
2186 } 2649 }
2187 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2188 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2190 RETVAL = data_sv; 2658 RETVAL = data_sv;
2191} 2659}
2192 OUTPUT: 2660 OUTPUT:
2193 RETVAL 2661 RETVAL
2194 2662
2195void 2663void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2665 PPCODE:
2198{ 2666{
2199 int x, y, z; 2667 int x, y, z;
2200 int w, h; 2668 int w, h;
2201 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2202 2680
2203 if (*data++ != 0) 2681 if (*data++ != 0)
2204 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2205 2683
2206 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2208 2686
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2687 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2221 { 2699 {
2222 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2223 2701
2224 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2225 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2226 uint8_t flags = *data++; 2709 flags = *data++;
2227 2710
2228 if (flags) 2711 if (flags)
2229 { 2712 {
2230 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
… …
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2719
2237 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2238 { 2721 {
2239 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2240 2724
2241 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2242 { 2726 {
2243 tileid t = tile [z]; 2727 tileid t = tile [z];
2244 2728
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2730 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2732 need_texid (self, t);
2249 } 2733 }
2250 2734
2251 cell->tile [z] = t; 2735 cell->tile [z] = t;
2252 } 2736 }
… …
2254 } 2738 }
2255 } 2739 }
2256 } 2740 }
2257} 2741}
2258 2742
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2744
2261CFPlus::RW 2745DC::RW
2262new (SV *class, SV *data_sv) 2746new (SV *class, SV *data_sv)
2263 CODE: 2747 CODE:
2264{ 2748{
2265 STRLEN datalen; 2749 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2750 char *data = SvPVbyte (data_sv, datalen);
… …
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2753}
2270 OUTPUT: 2754 OUTPUT:
2271 RETVAL 2755 RETVAL
2272 2756
2273CFPlus::RW 2757DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2759 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2760 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2761 OUTPUT:
2278 RETVAL 2762 RETVAL
2279 2763
2280# fails on win32: 2764# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2765# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2766#void
2283#close (CFPlus::RW self) 2767#close (DC::RW self)
2284# CODE: 2768# CODE:
2285# (self->(close)) (self); 2769# (self->(close)) (self);
2286 2770
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2772
2289PROTOTYPES: DISABLE 2773PROTOTYPES: DISABLE
2290 2774
2291CFPlus::Channel 2775DC::Channel
2292find () 2776find ()
2293 CODE: 2777 CODE:
2294{ 2778{
2295 RETVAL = Mix_GroupAvailable (-1); 2779 RETVAL = Mix_GroupAvailable (-1);
2296 2780
… …
2309} 2793}
2310 OUTPUT: 2794 OUTPUT:
2311 RETVAL 2795 RETVAL
2312 2796
2313void 2797void
2314halt (CFPlus::Channel self) 2798halt (DC::Channel self)
2315 CODE: 2799 CODE:
2316 Mix_HaltChannel (self); 2800 Mix_HaltChannel (self);
2317 2801
2318void 2802void
2319expire (CFPlus::Channel self, int ticks = -1) 2803expire (DC::Channel self, int ticks = -1)
2320 CODE: 2804 CODE:
2321 Mix_ExpireChannel (self, ticks); 2805 Mix_ExpireChannel (self, ticks);
2322 2806
2323void 2807void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2808fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2809 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2810 Mix_FadeOutChannel (self, ticks);
2327 2811
2328int 2812int
2329volume (CFPlus::Channel self, int volume) 2813volume (DC::Channel self, int volume)
2330 CODE: 2814 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2816 OUTPUT:
2333 RETVAL 2817 RETVAL
2334 2818
2335void 2819void
2336unregister_all_effects (CFPlus::Channel self) 2820unregister_all_effects (DC::Channel self)
2337 CODE: 2821 CODE:
2338 Mix_UnregisterAllEffects (self); 2822 Mix_UnregisterAllEffects (self);
2339 2823
2340void 2824void
2341set_panning (CFPlus::Channel self, int left, int right) 2825set_panning (DC::Channel self, int left, int right)
2342 CODE: 2826 CODE:
2343 left = CLAMP (left , 0, 255); 2827 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2828 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2829 Mix_SetPanning (self, left, right);
2346 2830
2347void 2831void
2348set_distance (CFPlus::Channel self, int distance) 2832set_distance (DC::Channel self, int distance)
2349 CODE: 2833 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2835
2352void 2836void
2353set_position (CFPlus::Channel self, int angle, int distance) 2837set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2838 CODE:
2355 2839
2356void 2840void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2842 CODE:
2359{ 2843{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2847}
2364 2848
2365void 2849void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2850set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2851 CODE:
2368 Mix_SetReverseStereo (self, flip); 2852 Mix_SetReverseStereo (self, flip);
2369 2853
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2855
2372PROTOTYPES: DISABLE 2856PROTOTYPES: DISABLE
2373 2857
2374CFPlus::MixChunk 2858DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2859new (SV *class, DC::RW rwops)
2376 CODE: 2860 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2862 OUTPUT:
2379 RETVAL 2863 RETVAL
2380 2864
2381void 2865void
2382DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2383 CODE: 2867 CODE:
2384 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2385 2869
2386int 2870int
2387volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2872 CODE:
2389 if (items > 1) 2873 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2874 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2876 OUTPUT:
2393 RETVAL 2877 RETVAL
2394 2878
2395CFPlus::Channel 2879DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2881 CODE:
2398{ 2882{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2884
2401 if (RETVAL < 0) 2885 if (RETVAL < 0)
… …
2408 } 2892 }
2409} 2893}
2410 OUTPUT: 2894 OUTPUT:
2411 RETVAL 2895 RETVAL
2412 2896
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2898
2415int 2899int
2416volume (int volume = -1) 2900volume (int volume = -1)
2417 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2418 CODE: 2902 CODE:
… …
2430void 2914void
2431halt () 2915halt ()
2432 CODE: 2916 CODE:
2433 Mix_HaltMusic (); 2917 Mix_HaltMusic ();
2434 2918
2435CFPlus::MixMusic 2919DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2920new (SV *class, DC::RW rwops)
2437 CODE: 2921 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2922 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2923 OUTPUT:
2440 RETVAL 2924 RETVAL
2441 2925
2442void 2926void
2443DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2444 CODE: 2928 CODE:
2445 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2446 2930
2447int 2931int
2448play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2449 CODE: 2933 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2935 OUTPUT:
2452 RETVAL 2936 RETVAL
2453 2937
2454void 2938void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2940 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2942
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2944
2461PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2462 2946
2463BOOT: 2947BOOT:
2464{ 2948{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2950 static const struct {
2467 const char *name; 2951 const char *name;
2468 IV iv; 2952 IV iv;
2469 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
… …
2490 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
… …
2505 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2998 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2999 const_iv (GL_COMPRESSED_ALPHA_ARB),
3000 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3001 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3002 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3003 const_iv (GL_COMPRESSED_RGB_ARB),
3004 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
… …
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2564 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2565# undef const_iv 3064# undef const_iv
2566 }; 3065 };
2567 3066
2568 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2570 3069
2571 texture_av = newAV (); 3070 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2573} 3072}
2574 3073
3074void
3075disable_GL_EXT_blend_func_separate ()
3076 CODE:
3077 gl.BlendFuncSeparate = 0;
3078 gl.BlendFuncSeparateEXT = 0;
3079
3080void
3081apple_nvidia_bug (int enable)
3082
2575char * 3083char *
2576gl_vendor () 3084gl_vendor ()
2577 CODE: 3085 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 3087 OUTPUT:
… …
2628 3136
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3138 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2632 3140
3141# void glBlendEquation (int se)
3142
2633void glDepthMask (int flag) 3143void glDepthMask (int flag)
2634 3144
2635void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2636 3146
2637void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
… …
2671void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2672 CODE: 3182 CODE:
2673 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2674 3184
2675void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2676 ALIAS: 3187 ALIAS:
2677 glColor_premultiply = 1 3188 glColor_premultiply = 1
2678 CODE: 3189 CODE:
2679 if (ix) 3190 if (ix)
2680 { 3191 {
… …
2700 3211
2701void glRect (float x1, float y1, float x2, float y2) 3212void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3213 CODE:
2703 glRectf (x1, y1, x2, y2); 3214 glRectf (x1, y1, x2, y2);
2704 3215
3216void glRect_lineloop (float x1, float y1, float x2, float y2)
3217 CODE:
3218 glBegin (GL_LINE_LOOP);
3219 glVertex2f (x1, y1);
3220 glVertex2f (x2, y1);
3221 glVertex2f (x2, y2);
3222 glVertex2f (x1, y2);
3223 glEnd ();
3224
2705PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2706 3226
2707void glBegin (int mode) 3227void glBegin (int mode)
2708 3228
2709void glEnd () 3229void glEnd ()
… …
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 3262 CODE:
2743 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3265
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 3267
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 3269
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3271
… …
2777 3297
2778void glEndList () 3298void glEndList ()
2779 3299
2780void glCallList (int list) 3300void glCallList (int list)
2781 3301
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3303
2784PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2785 3305
2786void 3306void
2787find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
… …
2791 XPUSHs (self); 3311 XPUSHs (self);
2792} 3312}
2793 3313
2794BOOT: 3314BOOT:
2795{ 3315{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3317
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3322}
2803 3323
2804void 3324void
2805draw (SV *self) 3325draw (SV *self)
2806 CODE: 3326 CODE:
… …
2810 NV x, y, w, h; 3330 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3331 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3332 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3335 double draw_x, draw_y;
2817 3336
2818 if (!SvROK (self)) 3337 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3339
2821 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2822 3341
2823 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3344
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3347
2829 if (!h || !w) 3348 if (!h || !w)
… …
2849 { 3368 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3370
2852 if (svp && SvTRUE (*svp)) 3371 if (svp && SvTRUE (*svp))
2853 { 3372 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3374 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3376 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3377 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3378 glVertex2f (w, 0);
… …
2862 glEnd (); 3381 glEnd ();
2863 glDisable (GL_BLEND); 3382 glDisable (GL_BLEND);
2864 } 3383 }
2865 } 3384 }
2866#if 0 3385#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3386 // draw borders, for debugging
2868 glPushMatrix; 3387 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3388 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3389 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3390 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3391 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3392 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3393 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3394 glVertex2f (0 , h - 1);
2876 glEnd; 3395 glEnd ();
2877 glPopMatrix; 3396 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3397#endif
2881 PUSHMARK (SP); 3398 PUSHMARK (SP);
2882 XPUSHs (self); 3399 XPUSHs (self);
2883 PUTBACK; 3400 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3401 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines