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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
43 61
44#ifndef _WIN32 62#ifndef _WIN32
45# include <sys/types.h> 63# include <sys/types.h>
46# include <sys/socket.h> 64# include <sys/socket.h>
47# include <netinet/in.h> 65# include <netinet/in.h>
48# include <netinet/tcp.h> 66# include <netinet/tcp.h>
49# include <inttypes.h> 67# include <inttypes.h>
50#endif 68#endif
51 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 80
54#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
55 82
56#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
58 85
59#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
60 87
61#if 0 88/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else
64# define PARACHUTE 0
65#endif
66 90
67static AV *texture_av; 91static AV *texture_av;
68 92
69static struct 93static struct
70{ 94{
107 av_push (texture_av, (SV *)(size_t)name); 131 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 132 glDeleteTextures (1, &name);
109} 133}
110 134
111#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
112 137
113#include "pango-font.c" 138#include "pango-font.c"
114#include "pango-fontmap.c" 139#include "pango-fontmap.c"
115#include "pango-render.c" 140#include "pango-render.c"
116 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
119 146
120typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
121 148
122static int 149static int
123shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
124{ 151{
125 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
139 166
140typedef struct cf_layout { 167typedef struct cf_layout {
141 PangoLayout *pl; 168 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
143 int base_height; 170 int base_height;
144 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
145} *CFPlus__Layout; 173} *DC__Layout;
146 174
147static CFPlus__Font default_font; 175static DC__Font default_font;
148static PangoContext *opengl_context; 176static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
150 178
151static void 179static void
152substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
157#endif 185#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 187}
160 188
161static void 189static void
162layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
163{ 191{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
166 */ 194 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
168 196
169 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 199
172 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
173} 201}
174 202
175static void 203static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 205{
178 PangoRectangle rect; 206 PangoRectangle rect;
179 207
180 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
192 220
193typedef uint16_t tileid; 221typedef uint16_t tileid;
194typedef uint16_t faceid; 222typedef uint16_t faceid;
195 223
196typedef struct { 224typedef struct {
197 int name; 225 GLuint name;
198 int w, h; 226 int w, h;
199 float s, t; 227 float s, t;
200 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
201 tileid smoothtile; 229 tileid smoothtile;
202 uint8_t smoothlevel; 230 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
222 250
223 int32_t rows; 251 int32_t rows;
224 maprow *row; 252 maprow *row;
225} *CFPlus__Map; 253} *DC__Map;
226 254
227static char * 255static char *
228prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
229{ 257{
230 char *p; 258 char *p;
268 self->texs *= 2; 296 self->texs *= 2;
269 } 297 }
270} 298}
271 299
272static maprow * 300static maprow *
273map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
274{ 302{
275 if (0 > y) 303 if (0 > y)
276 { 304 {
277 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
316 344
317 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
318} 346}
319 347
320static mapcell * 348static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
322{ 350{
323 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
324} 352}
325 353
326static void 354static void
327map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
328{ 356{
329 int r; 357 int r;
330 358
331 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
340 self->row = 0; 368 self->row = 0;
341 self->rows = 0; 369 self->rows = 0;
342} 370}
343 371
344static void 372static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 373map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 374{
347 int x, y; 375 int x, y;
348 maprow *row; 376 maprow *row;
349 mapcell *cell; 377 mapcell *cell;
350 378
429 n |= n >> 16; 457 n |= n >> 16;
430 458
431 return n + 1; 459 return n + 1;
432} 460}
433 461
462static unsigned int
463popcount (unsigned int n)
464{
465 n -= (n >> 1) & 0x55555555U;
466 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
467 n = ((n >> 4) + n) & 0x0f0f0f0fU;
468 n *= 0x01010101U;
469
470 return n >> 24;
471}
472
434/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
437 476
438/******************************************************************************/ 477/******************************************************************************/
476 return 0; 515 return 0;
477 516
478 return 1; 517 return 1;
479} 518}
480 519
481MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
482 521
483PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
484 523
485BOOT: 524BOOT:
486{ 525{
487 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 527 static const struct {
489 const char *name; 528 const char *name;
490 IV iv; 529 IV iv;
491 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
514 553
515 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
518 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
641
642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
600# undef const_iv 670# undef const_iv
601 }; 671 };
602 672
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 692
623NV floor (NV x) 693NV floor (NV x)
624 694
625NV ceil (NV x) 695NV ceil (NV x)
626 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
627void 701void
628pango_init () 702pango_init ()
629 CODE: 703 CODE:
630{ 704{
631 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif
634} 713}
635 714
636char *
637SDL_GetError () 715char *SDL_GetError ()
638 716
639int 717int SDL_Init (U32 flags)
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 718
642void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
643SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
644 733
645void 734void
646SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
647 PPCODE: 736 PPCODE:
648{ 737{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 752
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 755
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 757
672 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
673 while (*m) 759 while (*m)
674 { 760 {
675 if ((*m)->w >= 640 && (*m)->h >= 480)
676 {
677 AV *av = newAV (); 761 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
681 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
682 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
683 }
684 767
685 ++m; 768 ++m;
686 } 769 }
687} 770}
688 771
704 787
705 if (RETVAL) 788 if (RETVAL)
706 { 789 {
707 av_clear (texture_av); 790 av_clear (texture_av);
708 791
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 793#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 794#include "glfunc.h"
712#undef GL_FUNC 795#undef GL_FUNC
713 } 796 }
714} 797}
721char * 804char *
722SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
723 806
724int 807int
725SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
726 812
727void 813void
728poll_events () 814poll_events ()
729 PPCODE: 815 PPCODE:
730{ 816{
740 { 826 {
741 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
742 case SDL_KEYUP: 828 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 832 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 834 break;
749 835
750 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 855 x = ev.motion.x;
770 y = ev.motion.y; 856 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 858 }
773 859
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 866 }
781 break; 867 break;
782 868
783 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 872
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 883 break;
798 } 884 }
799 885
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 886 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 887 }
802} 888}
803 889
804int 890int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 891Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 892 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
809 895
810void 896void
897Mix_QuerySpec ()
898 PPCODE:
899{
900 int freq, channels;
901 Uint16 format;
902
903 if (Mix_QuerySpec (&freq, &format, &channels))
904 {
905 EXTEND (SP, 3);
906 PUSHs (sv_2mortal (newSViv (freq)));
907 PUSHs (sv_2mortal (newSViv (format)));
908 PUSHs (sv_2mortal (newSViv (channels)));
909 }
910}
911
912void
811Mix_CloseAudio () 913Mix_CloseAudio ()
812 914
813int 915int
814Mix_AllocateChannels (int numchans = -1) 916Mix_AllocateChannels (int numchans = -1)
917
918const char *
919Mix_GetError ()
815 920
816void 921void
817lowdelay (int fd, int val = 1) 922lowdelay (int fd, int val = 1)
818 CODE: 923 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 924 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 950 }
846 } 951 }
847#endif 952#endif
848} 953}
849 954
850void 955int
851add_font (char *file) 956add_font (char *file)
852 CODE: 957 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
854 961
855void 962void
856load_image_inline (SV *image_) 963load_image_inline (SV *image_)
857 ALIAS: 964 ALIAS:
858 load_image_file = 1 965 load_image_file = 1
861 STRLEN image_len; 968 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 969 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 970 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 971 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 972 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 973 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 974 : SDL_RWFromConstMem (image, image_len);
868 975
869 if (!rw) 976 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 977 croak ("load_image: %s", SDL_GetError ());
871 978
944void 1051void
945error (char *message) 1052error (char *message)
946 CODE: 1053 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1055#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1057#endif
951 1058
952void 1059void
953fatal (char *message) 1060fatal (char *message)
954 CODE: 1061 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1063#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1065#endif
959 _exit (1); 1066 _exit (1);
960 1067
961void 1068void
962_exit (int retval = 0) 1069_exit (int retval = 0)
974#if DEBUG 1081#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
976#endif 1083#endif
977} 1084}
978 1085
979MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
980 1087
981PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
982 1089
983CFPlus::Font 1090DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1092 CODE:
986{ 1093{
987 int count; 1094 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1098}
992 OUTPUT: 1099 OUTPUT:
993 RETVAL 1100 RETVAL
994 1101
995void 1102void
996DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
997 CODE: 1104 CODE:
998 pango_font_description_free (self); 1105 pango_font_description_free (self);
999 1106
1000void 1107void
1001make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1002 PROTOTYPE: $ 1109 PROTOTYPE: $
1003 CODE: 1110 CODE:
1004 default_font = self; 1111 default_font = self;
1005 1112
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1114
1008PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1009 1116
1010void 1117void
1011reset_glyph_cache () 1118glyph_cache_backup ()
1012 PROTOTYPE: 1119 PROTOTYPE:
1013 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1014 tc_clear (); 1127 tc_restore ();
1015 1128
1016CFPlus::Layout 1129DC::Layout
1017new (SV *class) 1130new (SV *class)
1018 CODE: 1131 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1020 1133
1021 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1028 1142
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1031 OUTPUT: 1145 OUTPUT:
1032 RETVAL 1146 RETVAL
1033 1147
1034void 1148void
1035DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1036 CODE: 1150 CODE:
1037 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
1038 Safefree (self); 1153 Safefree (self);
1039 1154
1040void 1155void
1041set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1042 CODE: 1157 CODE:
1043{ 1158{
1044 STRLEN textlen; 1159 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1046 1161
1047 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1048} 1163}
1049 1164
1050void 1165void
1051set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1052 CODE: 1167 CODE:
1053{ 1168{
1054 STRLEN textlen; 1169 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1056 1171
1057 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1058} 1173}
1059 1174
1060void 1175void
1061set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1062 CODE: 1177 CODE:
1063{ 1178{
1064 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1181 const char *pos = text;
1101 if (attrs) 1216 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1103} 1218}
1104 1219
1105void 1220void
1106get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1107 PPCODE: 1222 PPCODE:
1108{ 1223{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1225
1111 do 1226 do
1112 { 1227 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1229
1115 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1116 { 1231 {
1117 PangoRectangle extents; 1232 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1241
1127 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1128} 1243}
1129 1244
1130int 1245int
1131has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1132 CODE: 1247 CODE:
1133{ 1248{
1134 int lines = 1; 1249 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1136 1251
1141} 1256}
1142 OUTPUT: 1257 OUTPUT:
1143 RETVAL 1258 RETVAL
1144 1259
1145SV * 1260SV *
1146get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1147 CODE: 1262 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1265 OUTPUT:
1151 RETVAL 1266 RETVAL
1152 1267
1153void 1268void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1269set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1270 CODE:
1156 self->r = r; 1271 self->r = r;
1157 self->g = g; 1272 self->g = g;
1158 self->b = b; 1273 self->b = b;
1159 self->a = a; 1274 self->a = a;
1160 1275
1161void 1276void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1278 CODE:
1164 if (self->font != font) 1279 if (self->font != font)
1165 { 1280 {
1166 self->font = font; 1281 self->font = font;
1167 layout_update_font (self); 1282 layout_update_font (self);
1168 } 1283 }
1169 1284
1170void 1285void
1171set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1172 CODE: 1287 CODE:
1173 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1174 { 1289 {
1175 self->base_height = base_height; 1290 self->base_height = base_height;
1176 layout_update_font (self); 1291 layout_update_font (self);
1177 } 1292 }
1178 1293
1179void 1294void
1180set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1296 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1297 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1298
1184void 1299void
1185set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1186 CODE: 1301 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1303
1189void 1304void
1190set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1191 CODE: 1306 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1308
1194void 1309void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1311 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1202 ); 1317 );
1203 1318
1204void 1319void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1321 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1323
1209void 1324void
1210size (CFPlus::Layout self) 1325size (DC::Layout self)
1211 PPCODE: 1326 PPCODE:
1212{ 1327{
1213 int w, h; 1328 int w, h;
1214 1329
1215 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1220} 1335}
1221 1336
1222int 1337int
1223descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1224 CODE: 1339 CODE:
1225{ 1340{
1226 PangoRectangle rect; 1341 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1230} 1345}
1231 OUTPUT: 1346 OUTPUT:
1232 RETVAL 1347 RETVAL
1233 1348
1234int 1349int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1351 CODE:
1237{ 1352{
1238 int index, trailing; 1353 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1354 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1241} 1356}
1242 OUTPUT: 1357 OUTPUT:
1243 RETVAL 1358 RETVAL
1244 1359
1245void 1360void
1246cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1362 PPCODE:
1248{ 1363{
1249 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1366
1252 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1371}
1257 1372
1258void 1373void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1375 PPCODE:
1261{ 1376{
1262 int line, x; 1377 int line, x;
1263 1378
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1382 --line;
1383#endif
1267 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1387}
1271 1388
1272void 1389void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1391 PPCODE:
1275{ 1392{
1276 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1277 int index, trailing; 1394 int index, trailing;
1278 1395
1279 if (line < 0) 1396 if (line < 0)
1280 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1281 1398
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1284 1401
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1402 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1403
1287 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1411 }
1295} 1412}
1296 1413
1297void 1414void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1301 self->pl, 1419 self->pl,
1420 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1304 flags 1423 flags
1305 ); 1424 );
1425 // we assume that context_change actually clears/frees stuff
1426 // and does not do any recomputation...
1427 pango_layout_context_changed (self->pl);
1306 1428
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1429void
1430draw (DC::Layout self)
1431 CODE:
1432{
1433 glEnable (GL_TEXTURE_2D);
1434 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1435 glEnable (GL_BLEND);
1436 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1437 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1438 glEnable (GL_ALPHA_TEST);
1439 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1440
1441 rc_draw (self->rc);
1442
1443 glDisable (GL_ALPHA_TEST);
1444 glDisable (GL_BLEND);
1445 glDisable (GL_TEXTURE_2D);
1446}
1447
1448MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1449
1309PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1451
1313void 1452void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1454 CODE:
1316{ 1455{
1343 HV *hv = (HV *)SvRV (self); 1482 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1483 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1484 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1485 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1486
1487 if (name <= 0)
1488 XSRETURN_EMPTY;
1489
1348 if (items < 5) 1490 if (items < 5)
1349 { 1491 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1492 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1493 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1494 }
1390 RETVAL = width > 0; 1532 RETVAL = width > 0;
1391} 1533}
1392 OUTPUT: 1534 OUTPUT:
1393 RETVAL 1535 RETVAL
1394 1536
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1538
1397PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1398 1540
1399CFPlus::Map 1541DC::Map
1400new (SV *class) 1542new (SV *class)
1401 CODE: 1543 CODE:
1402 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1545 RETVAL->x = 0;
1404 RETVAL->y = 0; 1546 RETVAL->y = 0;
1412 RETVAL->row = 0; 1554 RETVAL->row = 0;
1413 OUTPUT: 1555 OUTPUT:
1414 RETVAL 1556 RETVAL
1415 1557
1416void 1558void
1417DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1418 CODE: 1560 CODE:
1419{ 1561{
1420 map_clear (self); 1562 map_clear (self);
1421 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1422 Safefree (self->tex); 1564 Safefree (self->tex);
1423 Safefree (self); 1565 Safefree (self);
1424} 1566}
1425 1567
1426void 1568void
1427resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1570 CODE:
1429 self->w = map_width; 1571 self->w = map_width;
1430 self->h = map_height; 1572 self->h = map_height;
1431 1573
1432void 1574void
1433clear (CFPlus::Map self) 1575clear (DC::Map self)
1434 CODE: 1576 CODE:
1435 map_clear (self); 1577 map_clear (self);
1436 1578
1437void 1579void
1438set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1581 CODE:
1440{ 1582{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1584 need_texid (self, tile);
1443} 1585}
1444 1586
1445void 1587void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1589 CODE:
1448{ 1590{
1449 tileid texid; 1591 tileid texid;
1450 maptex *tex; 1592 maptex *tex;
1451 1593
1464 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1466} 1608}
1467 1609
1468void 1610void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1611set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1612 CODE:
1471{ 1613{
1472 need_texid (self, texid); 1614 need_texid (self, texid);
1473 1615
1474 { 1616 {
1494 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1638}
1497 1639
1498int 1640int
1499ox (CFPlus::Map self) 1641ox (DC::Map self)
1500 ALIAS: 1642 ALIAS:
1501 oy = 1 1643 oy = 1
1502 x = 2 1644 x = 2
1503 y = 3 1645 y = 3
1504 w = 4 1646 w = 4
1515 } 1657 }
1516 OUTPUT: 1658 OUTPUT:
1517 RETVAL 1659 RETVAL
1518 1660
1519void 1661void
1520scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1521 CODE: 1663 CODE:
1522{ 1664{
1523 if (dx > 0) 1665 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1667 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1682 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1542 } 1684 }
1543} 1685}
1544 1686
1545void 1687SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1689 CODE:
1548{ 1690{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1693 mapcell *cell;
1552 int x, y, flags; 1694 int x, y, z, flags;
1695 AV *missing = newAV ();
1696 RETVAL = newRV_noinc ((SV *)missing);
1553 1697
1554 while (data < data_end - 1) 1698 while (data < data_end - 1)
1555 { 1699 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1700 flags = (data [0] << 8) + data [1]; data += 2;
1557 1701
1577 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1578 1722
1579 do 1723 do
1580 { 1724 {
1581 ext = *data++; 1725 ext = *data++;
1582 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1583 1727
1584 if (cmd < 4) 1728 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1587 { 1731 {
1590 } 1734 }
1591 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1594 { 1738 {
1595 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1743
1598 data += *data + 1; 1744 data += *data + 1;
1599 } 1745 }
1600 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1747 cell->flags = *data++;
1608 } 1754 }
1609 else 1755 else
1610 cell->darkness = *data++ + 1; 1756 cell->darkness = *data++ + 1;
1611 } 1757 }
1612 1758
1759 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1760 if (flags & (4 >> z))
1614 { 1761 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1762 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1763 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1764 cell->tile [z] = self->face2tile [face];
1765
1766 if (cell->tile [z])
1767 {
1768 maptex *tex = self->tex + cell->tile [z];
1769 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z]));
1771
1772 if (tex->smoothtile)
1773 {
1774 maptex *smooth = self->tex + tex->smoothtile;
1775 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile));
1777 }
1778 }
1618 } 1779 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1780 }
1634 else 1781 else
1635 cell->darkness = 0; 1782 cell->darkness = 0;
1636 } 1783 }
1637} 1784}
1785 OUTPUT:
1786 RETVAL
1638 1787
1639SV * 1788SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1790 CODE:
1642{ 1791{
1643 int x1, x; 1792 int x1, x;
1644 int y1, y; 1793 int y1, y;
1645 int z; 1794 int z;
1690} 1839}
1691 OUTPUT: 1840 OUTPUT:
1692 RETVAL 1841 RETVAL
1693 1842
1694void 1843void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1696 CODE: 1845 CODE:
1697{ 1846{
1847 int x, y, z;
1848
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1852 smooth_key skey;
1702 int x, y, z; 1853 int pl_x, pl_y;
1703 int last_name; 1854 maptex pl_tex;
1855 rc_t *rc = rc_alloc ();
1856 rc_key_t key;
1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1704 1860
1705 // thats current max. sorry. 1861 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1708 1864
1709 // clear key, in case of extra padding 1865 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1866 memset (&skey, 0, sizeof (skey));
1711 1867
1712 glColor4ub (255, 255, 255, 255); 1868 memset (&key, 0, sizeof (key));
1713 1869 key.r = 255;
1714 glEnable (GL_BLEND); 1870 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1871 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1872 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1873 key.mode = GL_QUADS;
1718 1874 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1875 key.texname = -1;
1720
1721 last_name = 0;
1722 1876
1723 mx += self->x; 1877 mx += self->x;
1724 my += self->y; 1878 my += self->y;
1725 1879
1726 // first pass: determine smooth_max 1880 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1896 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1897 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1898 self->tex [cell->tile [2]].smoothlevel));
1745 } 1899 }
1746 } 1900 }
1901
1902 glEnable (GL_BLEND);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1905
1748 for (z = 0; z <= 2; z++) 1906 for (z = 0; z <= 2; z++)
1749 { 1907 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1908 memset (smooth_level, 0, sizeof (smooth_level));
1751 1909
1764 { 1922 {
1765 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1924 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1925 int py = (y + 1) * T - tex.h;
1768 1926
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1927 if (key.texname != tex.name)
1772 { 1928 {
1773 if (!tex.name) 1929 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1775 1931
1776 glEnd (); 1932 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1933 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1934 }
1780 1935
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 { 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1943
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1952 if (cell->flags & 1)
1789 { 1953 {
1790 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1955 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1956 int py = y * T - T * 6 / 32;
1793 1957
1958 if (tex.name)
1794 glEnd (); 1959 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 1970 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 1971 }
1803 } 1972 }
1804 1973
1805 // update smooth hash 1974 // update smooth hash
1806 if (tex.smoothtile) 1975 if (tex.smoothtile)
1842 } 2011 }
1843 } 2012 }
1844 } 2013 }
1845 } 2014 }
1846 2015
2016 rc_draw (rc);
2017 rc_clear (rc);
2018
1847 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2020 // this is basically counting sort
1849 { 2021 {
1850 int w, b; 2022 int w, b;
1851 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1853 { 2027 {
1854 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1855 if (smask) 2029 if (smask)
1856 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2049 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2051 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2052 float dy = tex.t * .5f ; // 2 images/column
1879 2053
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2054 if (tex.name)
1883 { 2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
1884 if (!tex.name) 2058 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2059 {
1886
1887 glEnd (); 2060 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2062 glBegin (GL_QUADS);
1890 } 2063 }
1891 2064
1892 if (border) 2065 if (border)
1893 { 2066 {
1894 float ox = border * dx; 2067 float ox = border * dx;
1895 2068
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2073 }
1901 2074
1902 if (corner) 2075 if (corner)
1903 { 2076 {
1904 float ox = corner * dx; 2077 float ox = corner * dx;
1905 2078
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2083 }
1910 } 2084 }
1911 } 2085 }
1912 } 2086 }
1913 } 2087 }
1914 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1915 } 2093 }
1916 2094
1917 hv_clear (smooth); 2095 hv_clear (smooth);
1918 } 2096 }
1919 2097
1920 glEnd (); 2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
1921 2103
1922 glDisable (GL_TEXTURE_2D); 2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
2112 rc_draw (rc);
2113 }
2114
1923 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2116 rc_free (rc);
1924 2117
1925 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2120 if (0 <= y + my && y + my < self->rows)
1928 { 2121 {
1953 } 2146 }
1954 } 2147 }
1955} 2148}
1956 2149
1957void 2150void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2151draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2152 CODE:
1960{ 2153{
1961 static float color[16][3] = { 2154 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2015} 2208}
2016 2209
2017void 2210void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2211fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2212 PPCODE:
2020{ 2213{
2021 int x, y; 2214 int x, y;
2022 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2096} 2289}
2097 2290
2098SV * 2291SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2292get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2293 CODE:
2101{ 2294{
2102 int x, y, x1, y1; 2295 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2354 else
2162 *data++ = 0; 2355 *data++ = 0;
2163 } 2356 }
2164 } 2357 }
2165 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2166 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2168 RETVAL = data_sv; 2366 RETVAL = data_sv;
2169} 2367}
2170 OUTPUT: 2368 OUTPUT:
2171 RETVAL 2369 RETVAL
2172 2370
2173void 2371void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2373 PPCODE:
2176{ 2374{
2177 int x, y, z; 2375 int x, y, z;
2178 int w, h; 2376 int w, h;
2179 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2180 2388
2181 if (*data++ != 0) 2389 if (*data++ != 0)
2182 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2183 2391
2184 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2186 2394
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2395 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2407 {
2200 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2201 2409
2202 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2203 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2204 uint8_t flags = *data++; 2417 flags = *data++;
2205 2418
2206 if (flags) 2419 if (flags)
2207 { 2420 {
2208 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2427
2215 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2216 { 2429 {
2217 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2218 2432
2219 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2220 { 2434 {
2221 tileid t = tile [z]; 2435 tileid t = tile [z];
2222 2436
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2438 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2440 need_texid (self, t);
2227 } 2441 }
2228 2442
2229 cell->tile [z] = t; 2443 cell->tile [z] = t;
2230 } 2444 }
2232 } 2446 }
2233 } 2447 }
2234 } 2448 }
2235} 2449}
2236 2450
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2451MODULE = Deliantra::Client PACKAGE = DC::RW
2452
2453DC::RW
2454new (SV *class, SV *data_sv)
2455 CODE:
2456{
2457 STRLEN datalen;
2458 char *data = SvPVbyte (data_sv, datalen);
2459
2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2461}
2462 OUTPUT:
2463 RETVAL
2464
2465DC::RW
2466new_from_file (SV *class, const char *path, const char *mode = "rb")
2467 CODE:
2468 RETVAL = SDL_RWFromFile (path, mode);
2469 OUTPUT:
2470 RETVAL
2471
2472# fails on win32:
2473# dc.xs(2268) : error C2059: syntax error : '('
2474#void
2475#close (DC::RW self)
2476# CODE:
2477# (self->(close)) (self);
2478
2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2480
2239PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2240 2482
2241CFPlus::MixChunk 2483DC::Channel
2242new_from_file (SV *class, char *path) 2484find ()
2243 CODE: 2485 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2486{
2487 RETVAL = Mix_GroupAvailable (-1);
2488
2489 if (RETVAL < 0)
2490 {
2491 RETVAL = Mix_GroupOldest (-1);
2492
2493 if (RETVAL < 0)
2494 XSRETURN_UNDEF;
2495
2496 Mix_HaltChannel (RETVAL);
2497 }
2498
2499 Mix_UnregisterAllEffects (RETVAL);
2500 Mix_Volume (RETVAL, 128);
2501}
2245 OUTPUT: 2502 OUTPUT:
2246 RETVAL 2503 RETVAL
2247 2504
2248void 2505void
2506halt (DC::Channel self)
2507 CODE:
2508 Mix_HaltChannel (self);
2509
2510void
2511expire (DC::Channel self, int ticks = -1)
2512 CODE:
2513 Mix_ExpireChannel (self, ticks);
2514
2515void
2516fade_out (DC::Channel self, int ticks = -1)
2517 CODE:
2518 Mix_FadeOutChannel (self, ticks);
2519
2520int
2521volume (DC::Channel self, int volume)
2522 CODE:
2523 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2524 OUTPUT:
2525 RETVAL
2526
2527void
2528unregister_all_effects (DC::Channel self)
2529 CODE:
2530 Mix_UnregisterAllEffects (self);
2531
2532void
2533set_panning (DC::Channel self, int left, int right)
2534 CODE:
2535 left = CLAMP (left , 0, 255);
2536 right = CLAMP (right, 0, 255);
2537 Mix_SetPanning (self, left, right);
2538
2539void
2540set_distance (DC::Channel self, int distance)
2541 CODE:
2542 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2543
2544void
2545set_position (DC::Channel self, int angle, int distance)
2546 CODE:
2547
2548void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE:
2551{
2552 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555}
2556
2557void
2558set_reverse_stereo (DC::Channel self, int flip)
2559 CODE:
2560 Mix_SetReverseStereo (self, flip);
2561
2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2563
2564PROTOTYPES: DISABLE
2565
2566DC::MixChunk
2567new (SV *class, DC::RW rwops)
2568 CODE:
2569 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2570 OUTPUT:
2571 RETVAL
2572
2573void
2249DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2250 CODE: 2575 CODE:
2251 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2252 2577
2253int 2578int
2254volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2580 CODE:
2581 if (items > 1)
2582 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2584 OUTPUT:
2258 RETVAL 2585 RETVAL
2259 2586
2260int 2587DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2588play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2589 CODE:
2590{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2591 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2592
2593 if (RETVAL < 0)
2594 XSRETURN_UNDEF;
2595
2596 if (channel < 0)
2597 {
2598 Mix_UnregisterAllEffects (RETVAL);
2599 Mix_Volume (RETVAL, 128);
2600 }
2601}
2264 OUTPUT: 2602 OUTPUT:
2265 RETVAL 2603 RETVAL
2266 2604
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2606
2269int 2607int
2270volume (int volume = -1) 2608volume (int volume = -1)
2271 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2272 CODE: 2610 CODE:
2611 if (items > 0)
2612 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2613 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2614 OUTPUT:
2275 RETVAL 2615 RETVAL
2276 2616
2617void
2618fade_out (int ms)
2619 CODE:
2620 Mix_FadeOutMusic (ms);
2621
2622void
2623halt ()
2624 CODE:
2625 Mix_HaltMusic ();
2626
2627DC::MixMusic
2628new (SV *class, DC::RW rwops)
2629 CODE:
2630 RETVAL = Mix_LoadMUS_RW (rwops);
2631 OUTPUT:
2632 RETVAL
2633
2634void
2635DESTROY (DC::MixMusic self)
2636 CODE:
2637 Mix_FreeMusic (self);
2638
2277int 2639int
2278fade_out (int ms)
2279 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms);
2281 OUTPUT:
2282 RETVAL
2283
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void
2292DESTROY (CFPlus::MixMusic self)
2293 CODE:
2294 Mix_FreeMusic (self);
2295
2296int
2297play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2298 CODE: 2641 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2643 OUTPUT:
2301 RETVAL 2644 RETVAL
2302 2645
2303int 2646void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2648 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2650
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2652
2312PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2313 2654
2314BOOT: 2655BOOT:
2315{ 2656{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2658 static const struct {
2318 const char *name; 2659 const char *name;
2319 IV iv; 2660 IV iv;
2320 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2701 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2702 const_iv (GL_COMPRESSED_ALPHA_ARB),
2703 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2704 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2705 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2706 const_iv (GL_COMPRESSED_RGB_ARB),
2707 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2421 2769
2422 texture_av = newAV (); 2770 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2424} 2772}
2425 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2426char * 2780char *
2427gl_vendor () 2781gl_vendor ()
2428 CODE: 2782 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2784 OUTPUT:
2547 2901
2548void glTexCoord (float s, float t) 2902void glTexCoord (float s, float t)
2549 CODE: 2903 CODE:
2550 glTexCoord2f (s, t); 2904 glTexCoord2f (s, t);
2551 2905
2906void glRect (float x1, float y1, float x2, float y2)
2907 CODE:
2908 glRectf (x1, y1, x2, y2);
2909
2910void glRect_lineloop (float x1, float y1, float x2, float y2)
2911 CODE:
2912 glBegin (GL_LINE_LOOP);
2913 glVertex2f (x1, y1);
2914 glVertex2f (x2, y1);
2915 glVertex2f (x2, y2);
2916 glVertex2f (x1, y2);
2917 glEnd ();
2918
2552PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2553 2920
2554void glBegin (int mode) 2921void glBegin (int mode)
2555 2922
2556void glEnd () 2923void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 2956 CODE:
2590 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 2959
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 2961
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 2963
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 2965
2624 2991
2625void glEndList () 2992void glEndList ()
2626 2993
2627void glCallList (int list) 2994void glCallList (int list)
2628 2995
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 2997
2631PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2632 2999
2633void 3000void
2634find_widget (SV *self, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3005 XPUSHs (self);
2639} 3006}
2640 3007
2641BOOT: 3008BOOT:
2642{ 3009{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3011
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3016}
2650 3017
2651void 3018void
2652draw (SV *self) 3019draw (SV *self)
2653 CODE: 3020 CODE:
2657 NV x, y, w, h; 3024 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3025 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3026 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3027 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3028 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3029 double draw_x, draw_y;
2664 3030
2665 if (!SvROK (self)) 3031 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3033
2668 hv = (HV *)SvRV (self); 3034 hv = (HV *)SvRV (self);
2669 3035
2670 if (SvTYPE (hv) != SVt_PVHV) 3036 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3038
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3041
2676 if (!h || !w) 3042 if (!h || !w)
2696 { 3062 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3064
2699 if (svp && SvTRUE (*svp)) 3065 if (svp && SvTRUE (*svp))
2700 { 3066 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3067 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3068 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3070 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3071 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3072 glVertex2f (w, 0);
2709 glEnd (); 3075 glEnd ();
2710 glDisable (GL_BLEND); 3076 glDisable (GL_BLEND);
2711 } 3077 }
2712 } 3078 }
2713#if 0 3079#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3080 // draw borders, for debugging
2715 glPushMatrix; 3081 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3082 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3083 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3084 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3085 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3086 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3087 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3088 glVertex2f (0 , h - 1);
2723 glEnd; 3089 glEnd ();
2724 glPopMatrix; 3090 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3091#endif
2728 PUSHMARK (SP); 3092 PUSHMARK (SP);
2729 XPUSHs (self); 3093 XPUSHs (self);
2730 PUTBACK; 3094 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3095 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines