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.266 by root, Sun Jul 20 02:51:40 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) 761 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 762 {
677 AV *av = newAV (); 763 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 764 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 765 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 766 av_push (av, newSViv (rgb));
704 790
705 if (RETVAL) 791 if (RETVAL)
706 { 792 {
707 av_clear (texture_av); 793 av_clear (texture_av);
708 794
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 795 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 796#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 797#include "glfunc.h"
712#undef GL_FUNC 798#undef GL_FUNC
713 } 799 }
714} 800}
721char * 807char *
722SDL_GetKeyName (int sym) 808SDL_GetKeyName (int sym)
723 809
724int 810int
725SDL_GetAppState () 811SDL_GetAppState ()
812
813int
814SDL_GetModState ()
726 815
727void 816void
728poll_events () 817poll_events ()
729 PPCODE: 818 PPCODE:
730{ 819{
740 { 829 {
741 case SDL_KEYDOWN: 830 case SDL_KEYDOWN:
742 case SDL_KEYUP: 831 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 834 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 */ 835 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); 836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 837 break;
749 838
750 case SDL_ACTIVEEVENT: 839 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 858 x = ev.motion.x;
770 y = ev.motion.y; 859 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 861 }
773 862
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 864 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 865 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 866 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 867 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 868 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 869 }
781 break; 870 break;
782 871
783 case SDL_MOUSEBUTTONDOWN: 872 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 873 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 874 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 875
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 876 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 877 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 878 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 879 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 884 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 885 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 886 break;
798 } 887 }
799 888
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 889 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 890 }
802} 891}
803 892
804int 893int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 894Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 895 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 896 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 897 Mix_ChannelFinished (channel_finished);
809 898
810void 899void
900Mix_QuerySpec ()
901 PPCODE:
902{
903 int freq, channels;
904 Uint16 format;
905
906 if (Mix_QuerySpec (&freq, &format, &channels))
907 {
908 EXTEND (SP, 3);
909 PUSHs (sv_2mortal (newSViv (freq)));
910 PUSHs (sv_2mortal (newSViv (format)));
911 PUSHs (sv_2mortal (newSViv (channels)));
912 }
913}
914
915void
811Mix_CloseAudio () 916Mix_CloseAudio ()
812 917
813int 918int
814Mix_AllocateChannels (int numchans = -1) 919Mix_AllocateChannels (int numchans = -1)
920
921const char *
922Mix_GetError ()
815 923
816void 924void
817lowdelay (int fd, int val = 1) 925lowdelay (int fd, int val = 1)
818 CODE: 926 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 927 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 953 }
846 } 954 }
847#endif 955#endif
848} 956}
849 957
850void 958int
851add_font (char *file) 959add_font (char *file)
852 CODE: 960 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 961 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
962 OUTPUT:
963 RETVAL
854 964
855void 965void
856load_image_inline (SV *image_) 966load_image_inline (SV *image_)
857 ALIAS: 967 ALIAS:
858 load_image_file = 1 968 load_image_file = 1
861 STRLEN image_len; 971 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 972 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 973 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 974 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 975 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 976 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 977 : SDL_RWFromConstMem (image, image_len);
868 978
869 if (!rw) 979 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 980 croak ("load_image: %s", SDL_GetError ());
871 981
944void 1054void
945error (char *message) 1055error (char *message)
946 CODE: 1056 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1057 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1058#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1059 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1060#endif
951 1061
952void 1062void
953fatal (char *message) 1063fatal (char *message)
954 CODE: 1064 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1065 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1066#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1067 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1068#endif
959 _exit (1); 1069 _exit (1);
960 1070
961void 1071void
962_exit (int retval = 0) 1072_exit (int retval = 0)
974#if DEBUG 1084#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1085 VALGRIND_DO_LEAK_CHECK;
976#endif 1086#endif
977} 1087}
978 1088
979MODULE = CFPlus PACKAGE = CFPlus::Font 1089MODULE = Deliantra::Client PACKAGE = DC::Font
980 1090
981PROTOTYPES: DISABLE 1091PROTOTYPES: DISABLE
982 1092
983CFPlus::Font 1093DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1094new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1095 CODE:
986{ 1096{
987 int count; 1097 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1098 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1101}
992 OUTPUT: 1102 OUTPUT:
993 RETVAL 1103 RETVAL
994 1104
995void 1105void
996DESTROY (CFPlus::Font self) 1106DESTROY (DC::Font self)
997 CODE: 1107 CODE:
998 pango_font_description_free (self); 1108 pango_font_description_free (self);
999 1109
1000void 1110void
1001make_default (CFPlus::Font self) 1111make_default (DC::Font self)
1002 PROTOTYPE: $ 1112 PROTOTYPE: $
1003 CODE: 1113 CODE:
1004 default_font = self; 1114 default_font = self;
1005 1115
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1116MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1117
1008PROTOTYPES: DISABLE 1118PROTOTYPES: DISABLE
1009 1119
1010void 1120void
1011reset_glyph_cache () 1121glyph_cache_backup ()
1012 PROTOTYPE: 1122 PROTOTYPE:
1013 CODE: 1123 CODE:
1124 tc_backup ();
1125
1126void
1127glyph_cache_restore ()
1128 PROTOTYPE:
1129 CODE:
1014 tc_clear (); 1130 tc_restore ();
1015 1131
1016CFPlus::Layout 1132DC::Layout
1017new (SV *class) 1133new (SV *class)
1018 CODE: 1134 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1135 New (0, RETVAL, 1, struct cf_layout);
1020 1136
1021 RETVAL->pl = pango_layout_new (opengl_context); 1137 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1139 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1140 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1141 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1142 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1143 RETVAL->font = 0;
1144 RETVAL->rc = rc_alloc ();
1028 1145
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1146 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1147 layout_update_font (RETVAL);
1031 OUTPUT: 1148 OUTPUT:
1032 RETVAL 1149 RETVAL
1033 1150
1034void 1151void
1035DESTROY (CFPlus::Layout self) 1152DESTROY (DC::Layout self)
1036 CODE: 1153 CODE:
1037 g_object_unref (self->pl); 1154 g_object_unref (self->pl);
1155 rc_free (self->rc);
1038 Safefree (self); 1156 Safefree (self);
1039 1157
1040void 1158void
1041set_text (CFPlus::Layout self, SV *text_) 1159set_text (DC::Layout self, SV *text_)
1042 CODE: 1160 CODE:
1043{ 1161{
1044 STRLEN textlen; 1162 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1163 char *text = SvPVutf8 (text_, textlen);
1046 1164
1047 pango_layout_set_text (self->pl, text, textlen); 1165 pango_layout_set_text (self->pl, text, textlen);
1048} 1166}
1049 1167
1050void 1168void
1051set_markup (CFPlus::Layout self, SV *text_) 1169set_markup (DC::Layout self, SV *text_)
1052 CODE: 1170 CODE:
1053{ 1171{
1054 STRLEN textlen; 1172 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1173 char *text = SvPVutf8 (text_, textlen);
1056 1174
1057 pango_layout_set_markup (self->pl, text, textlen); 1175 pango_layout_set_markup (self->pl, text, textlen);
1058} 1176}
1059 1177
1060void 1178void
1061set_shapes (CFPlus::Layout self, ...) 1179set_shapes (DC::Layout self, ...)
1062 CODE: 1180 CODE:
1063{ 1181{
1064 PangoAttrList *attrs = 0; 1182 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1183 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1184 const char *pos = text;
1101 if (attrs) 1219 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1220 pango_layout_set_attributes (self->pl, attrs);
1103} 1221}
1104 1222
1105void 1223void
1106get_shapes (CFPlus::Layout self) 1224get_shapes (DC::Layout self)
1107 PPCODE: 1225 PPCODE:
1108{ 1226{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1227 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1228
1111 do 1229 do
1112 { 1230 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1231 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1232
1115 if (run && shape_attr_p (run)) 1233 if (run && shape_attr_p (run))
1116 { 1234 {
1117 PangoRectangle extents; 1235 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1236 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1244
1127 pango_layout_iter_free (iter); 1245 pango_layout_iter_free (iter);
1128} 1246}
1129 1247
1130int 1248int
1131has_wrapped (CFPlus::Layout self) 1249has_wrapped (DC::Layout self)
1132 CODE: 1250 CODE:
1133{ 1251{
1134 int lines = 1; 1252 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1253 const char *text = pango_layout_get_text (self->pl);
1136 1254
1141} 1259}
1142 OUTPUT: 1260 OUTPUT:
1143 RETVAL 1261 RETVAL
1144 1262
1145SV * 1263SV *
1146get_text (CFPlus::Layout self) 1264get_text (DC::Layout self)
1147 CODE: 1265 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1266 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1267 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1268 OUTPUT:
1151 RETVAL 1269 RETVAL
1152 1270
1153void 1271void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1272set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1273 CODE:
1156 self->r = r; 1274 self->r = r;
1157 self->g = g; 1275 self->g = g;
1158 self->b = b; 1276 self->b = b;
1159 self->a = a; 1277 self->a = a;
1160 1278
1161void 1279void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1280set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1281 CODE:
1164 if (self->font != font) 1282 if (self->font != font)
1165 { 1283 {
1166 self->font = font; 1284 self->font = font;
1167 layout_update_font (self); 1285 layout_update_font (self);
1168 } 1286 }
1169 1287
1170void 1288void
1171set_height (CFPlus::Layout self, int base_height) 1289set_height (DC::Layout self, int base_height)
1172 CODE: 1290 CODE:
1173 if (self->base_height != base_height) 1291 if (self->base_height != base_height)
1174 { 1292 {
1175 self->base_height = base_height; 1293 self->base_height = base_height;
1176 layout_update_font (self); 1294 layout_update_font (self);
1177 } 1295 }
1178 1296
1179void 1297void
1180set_width (CFPlus::Layout self, int max_width = -1) 1298set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1299 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1300 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1301
1184void 1302void
1185set_indent (CFPlus::Layout self, int indent) 1303set_indent (DC::Layout self, int indent)
1186 CODE: 1304 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1305 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1306
1189void 1307void
1190set_spacing (CFPlus::Layout self, int spacing) 1308set_spacing (DC::Layout self, int spacing)
1191 CODE: 1309 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1310 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1311
1194void 1312void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1313set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1314 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1315 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1316 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1317 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1318 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1319 : PANGO_ELLIPSIZE_NONE
1202 ); 1320 );
1203 1321
1204void 1322void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1323set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1324 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1325 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1326
1209void 1327void
1210size (CFPlus::Layout self) 1328size (DC::Layout self)
1211 PPCODE: 1329 PPCODE:
1212{ 1330{
1213 int w, h; 1331 int w, h;
1214 1332
1215 layout_get_pixel_size (self, &w, &h); 1333 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1336 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1337 PUSHs (sv_2mortal (newSViv (h)));
1220} 1338}
1221 1339
1222int 1340int
1223descent (CFPlus::Layout self) 1341descent (DC::Layout self)
1224 CODE: 1342 CODE:
1225{ 1343{
1226 PangoRectangle rect; 1344 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1345 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1346 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1347 RETVAL = PANGO_DESCENT (rect);
1230} 1348}
1231 OUTPUT: 1349 OUTPUT:
1232 RETVAL 1350 RETVAL
1233 1351
1234int 1352int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1353xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1354 CODE:
1237{ 1355{
1238 int index, trailing; 1356 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1357 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1358 RETVAL = index + trailing;
1241} 1359}
1242 OUTPUT: 1360 OUTPUT:
1243 RETVAL 1361 RETVAL
1244 1362
1245void 1363void
1246cursor_pos (CFPlus::Layout self, int index) 1364cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1365 PPCODE:
1248{ 1366{
1249 PangoRectangle strong_pos; 1367 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1368 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1369
1252 EXTEND (SP, 3); 1370 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1371 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1372 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1373 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1374}
1257 1375
1258void 1376void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1377index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1378 PPCODE:
1261{ 1379{
1262 int line, x; 1380 int line, x;
1263 1381
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1382 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1383#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1384 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1385 --line;
1386#endif
1267 EXTEND (SP, 2); 1387 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1388 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1389 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1390}
1271 1391
1272void 1392void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1393line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1394 PPCODE:
1275{ 1395{
1276 PangoLayoutLine *lp; 1396 PangoLayoutLine *lp;
1277 int index, trailing; 1397 int index, trailing;
1278 1398
1279 if (line < 0) 1399 if (line < 0)
1280 XSRETURN_EMPTY; 1400 XSRETURN_EMPTY;
1281 1401
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1402 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1403 XSRETURN_EMPTY; /* do better */
1284 1404
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1405 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1406
1287 EXTEND (SP, 2); 1407 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1413 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1414 }
1295} 1415}
1296 1416
1297void 1417void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1418render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1419 CODE:
1420 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1421 pango_opengl_render_layout_subpixel (
1301 self->pl, 1422 self->pl,
1423 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1424 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1425 self->r, self->g, self->b, self->a,
1304 flags 1426 flags
1305 ); 1427 );
1428 // we assume that context_change actually clears/frees stuff
1429 // and does not do any recomputation...
1430 pango_layout_context_changed (self->pl);
1306 1431
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1432void
1433draw (DC::Layout self)
1434 CODE:
1435{
1436 glEnable (GL_TEXTURE_2D);
1437 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1438 glEnable (GL_BLEND);
1439 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1440 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1441 glEnable (GL_ALPHA_TEST);
1442 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1443
1444 rc_draw (self->rc);
1445
1446 glDisable (GL_ALPHA_TEST);
1447 glDisable (GL_BLEND);
1448 glDisable (GL_TEXTURE_2D);
1449}
1450
1451MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1452
1309PROTOTYPES: ENABLE 1453PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1454
1313void 1455void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1456pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1457 CODE:
1316{ 1458{
1343 HV *hv = (HV *)SvRV (self); 1485 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1486 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1487 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1488 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1489
1490 if (name <= 0)
1491 XSRETURN_EMPTY;
1492
1348 if (items < 5) 1493 if (items < 5)
1349 { 1494 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1495 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1496 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1497 }
1390 RETVAL = width > 0; 1535 RETVAL = width > 0;
1391} 1536}
1392 OUTPUT: 1537 OUTPUT:
1393 RETVAL 1538 RETVAL
1394 1539
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1540MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1541
1397PROTOTYPES: DISABLE 1542PROTOTYPES: DISABLE
1398 1543
1399CFPlus::Map 1544DC::Map
1400new (SV *class) 1545new (SV *class)
1401 CODE: 1546 CODE:
1402 New (0, RETVAL, 1, struct map); 1547 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1548 RETVAL->x = 0;
1404 RETVAL->y = 0; 1549 RETVAL->y = 0;
1412 RETVAL->row = 0; 1557 RETVAL->row = 0;
1413 OUTPUT: 1558 OUTPUT:
1414 RETVAL 1559 RETVAL
1415 1560
1416void 1561void
1417DESTROY (CFPlus::Map self) 1562DESTROY (DC::Map self)
1418 CODE: 1563 CODE:
1419{ 1564{
1420 map_clear (self); 1565 map_clear (self);
1421 Safefree (self->face2tile); 1566 Safefree (self->face2tile);
1422 Safefree (self->tex); 1567 Safefree (self->tex);
1423 Safefree (self); 1568 Safefree (self);
1424} 1569}
1425 1570
1426void 1571void
1427resize (CFPlus::Map self, int map_width, int map_height) 1572resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1573 CODE:
1429 self->w = map_width; 1574 self->w = map_width;
1430 self->h = map_height; 1575 self->h = map_height;
1431 1576
1432void 1577void
1433clear (CFPlus::Map self) 1578clear (DC::Map self)
1434 CODE: 1579 CODE:
1435 map_clear (self); 1580 map_clear (self);
1436 1581
1437void 1582void
1438set_tileid (CFPlus::Map self, int face, int tile) 1583set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1584 CODE:
1440{ 1585{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1586 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1587 need_texid (self, tile);
1443} 1588}
1444 1589
1445void 1590void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1591set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1592 CODE:
1448{ 1593{
1449 tileid texid; 1594 tileid texid;
1450 maptex *tex; 1595 maptex *tex;
1451 1596
1464 tex->smoothtile = self->face2tile [smooth]; 1609 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1610 tex->smoothlevel = level;
1466} 1611}
1467 1612
1468void 1613void
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) 1614set_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: 1615 CODE:
1471{ 1616{
1472 need_texid (self, texid); 1617 need_texid (self, texid);
1473 1618
1474 { 1619 {
1494 // from transparent color bleeding and ugly wrapping effects. 1639 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1641}
1497 1642
1498int 1643int
1499ox (CFPlus::Map self) 1644ox (DC::Map self)
1500 ALIAS: 1645 ALIAS:
1501 oy = 1 1646 oy = 1
1502 x = 2 1647 x = 2
1503 y = 3 1648 y = 3
1504 w = 4 1649 w = 4
1515 } 1660 }
1516 OUTPUT: 1661 OUTPUT:
1517 RETVAL 1662 RETVAL
1518 1663
1519void 1664void
1520scroll (CFPlus::Map self, int dx, int dy) 1665scroll (DC::Map self, int dx, int dy)
1521 CODE: 1666 CODE:
1522{ 1667{
1523 if (dx > 0) 1668 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1669 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1670 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1685 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1686 self->y += MAP_EXTEND_Y;
1542 } 1687 }
1543} 1688}
1544 1689
1545void 1690SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1691map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1692 CODE:
1548{ 1693{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1694 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1695 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1696 mapcell *cell;
1552 int x, y, flags; 1697 int x, y, z, flags;
1698 AV *missing = newAV ();
1699 RETVAL = newRV_noinc ((SV *)missing);
1553 1700
1554 while (data < data_end - 1) 1701 while (data < data_end - 1)
1555 { 1702 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1703 flags = (data [0] << 8) + data [1]; data += 2;
1557 1704
1577 uint8_t ext, cmd; 1724 uint8_t ext, cmd;
1578 1725
1579 do 1726 do
1580 { 1727 {
1581 ext = *data++; 1728 ext = *data++;
1582 cmd = ext & 0x3f; 1729 cmd = ext & 0x7f;
1583 1730
1584 if (cmd < 4) 1731 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1732 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1733 else if (cmd == 5) // health
1587 { 1734 {
1590 } 1737 }
1591 else if (cmd == 6) // monster width 1738 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1739 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1740 else if (cmd == 0x47)
1594 { 1741 {
1595 if (*data == 4) 1742 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1743 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1744 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1745 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1746
1598 data += *data + 1; 1747 data += *data + 1;
1599 } 1748 }
1600 else if (cmd == 8) // cell flags 1749 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1750 cell->flags = *data++;
1608 } 1757 }
1609 else 1758 else
1610 cell->darkness = *data++ + 1; 1759 cell->darkness = *data++ + 1;
1611 } 1760 }
1612 1761
1762 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1763 if (flags & (4 >> z))
1614 { 1764 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1765 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1766 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1767 cell->tile [z] = self->face2tile [face];
1768
1769 if (cell->tile [z])
1770 {
1771 maptex *tex = self->tex + cell->tile [z];
1772 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z]));
1774
1775 if (tex->smoothtile)
1776 {
1777 maptex *smooth = self->tex + tex->smoothtile;
1778 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile));
1780 }
1781 }
1618 } 1782 }
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 } 1783 }
1634 else 1784 else
1785 {
1635 cell->darkness = 0; 1786 cell->darkness = 0;
1787 cell->stat_hp = 0;
1788 cell->flags = 0;
1789 cell->player = 0;
1790 }
1636 } 1791 }
1637} 1792}
1793 OUTPUT:
1794 RETVAL
1638 1795
1639SV * 1796SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1797mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1798 CODE:
1642{ 1799{
1643 int x1, x; 1800 int x1, x;
1644 int y1, y; 1801 int y1, y;
1645 int z; 1802 int z;
1690} 1847}
1691 OUTPUT: 1848 OUTPUT:
1692 RETVAL 1849 RETVAL
1693 1850
1694void 1851void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 1853 CODE:
1697{ 1854{
1855 int x, y, z;
1856
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 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) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1860 smooth_key skey;
1702 int x, y, z; 1861 int pl_x, pl_y;
1703 int last_name; 1862 maptex pl_tex;
1863 rc_t *rc = rc_alloc ();
1864 rc_key_t key;
1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1704 1868
1705 // thats current max. sorry. 1869 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1708 1872
1709 // clear key, in case of extra padding 1873 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1874 memset (&skey, 0, sizeof (skey));
1711 1875
1712 glColor4ub (255, 255, 255, 255); 1876 memset (&key, 0, sizeof (key));
1713 1877 key.r = 255;
1714 glEnable (GL_BLEND); 1878 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1879 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1880 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1881 key.mode = GL_QUADS;
1718 1882 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1883 key.texname = -1;
1720
1721 last_name = 0;
1722 1884
1723 mx += self->x; 1885 mx += self->x;
1724 my += self->y; 1886 my += self->y;
1725 1887
1726 // first pass: determine smooth_max 1888 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1904 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1905 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1906 self->tex [cell->tile [2]].smoothlevel));
1745 } 1907 }
1746 } 1908 }
1909
1910 glEnable (GL_BLEND);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1913
1748 for (z = 0; z <= 2; z++) 1914 for (z = 0; z <= 2; z++)
1749 { 1915 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1916 memset (smooth_level, 0, sizeof (smooth_level));
1751 1917
1764 { 1930 {
1765 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1932 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h; 1933 int py = (y + 1) * T - tex.h;
1768 1934
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1935 if (key.texname != tex.name)
1772 { 1936 {
1773 if (!tex.name) 1937 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1775 1939
1776 glEnd (); 1940 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1941 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1942 }
1780 1943
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1944 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 { 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1951
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1960 if (cell->flags & 1)
1789 { 1961 {
1790 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1963 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1964 int py = y * T - T * 6 / 32;
1793 1965
1966 if (tex.name)
1794 glEnd (); 1967 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 1978 }
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 } 1979 }
1803 } 1980 }
1804 1981
1805 // update smooth hash 1982 // update smooth hash
1806 if (tex.smoothtile) 1983 if (tex.smoothtile)
1842 } 2019 }
1843 } 2020 }
1844 } 2021 }
1845 } 2022 }
1846 2023
2024 rc_draw (rc);
2025 rc_clear (rc);
2026
1847 // go through all smoothlevels, lowest to highest, then draw. 2027 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2028 // this is basically counting sort
1849 { 2029 {
1850 int w, b; 2030 int w, b;
1851 2031
2032 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2034 for (w = 0; w < 256 / 32; ++w)
1853 { 2035 {
1854 uint32_t smask = smooth_level [w]; 2036 uint32_t smask = smooth_level [w];
1855 if (smask) 2037 if (smask)
1856 for (b = 0; b < 32; ++b) 2038 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2057 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2059 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2060 float dy = tex.t * .5f ; // 2 images/column
1879 2061
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2062 if (tex.name)
1883 { 2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
1884 if (!tex.name) 2066 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2067 {
1886
1887 glEnd (); 2068 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2070 glBegin (GL_QUADS);
1890 } 2071 }
1891 2072
1892 if (border) 2073 if (border)
1893 { 2074 {
1894 float ox = border * dx; 2075 float ox = border * dx;
1895 2076
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2081 }
1901 2082
1902 if (corner) 2083 if (corner)
1903 { 2084 {
1904 float ox = corner * dx; 2085 float ox = corner * dx;
1905 2086
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2087 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2091 }
1910 } 2092 }
1911 } 2093 }
1912 } 2094 }
1913 } 2095 }
1914 } 2096 }
2097
2098 glEnd ();
2099 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1;
1915 } 2101 }
1916 2102
1917 hv_clear (smooth); 2103 hv_clear (smooth);
1918 } 2104 }
1919 2105
1920 glEnd (); 2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
1921 2111
1922 glDisable (GL_TEXTURE_2D); 2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2121 }
2122
1923 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2124 rc_free (rc);
1924 2125
1925 // top layer: overlays such as the health bar 2126 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2127 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2128 if (0 <= y + my && y + my < self->rows)
1928 { 2129 {
1953 } 2154 }
1954 } 2155 }
1955} 2156}
1956 2157
1957void 2158void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2160 CODE:
1960{ 2161{
1961 static float color[16][3] = { 2162 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2163 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2164 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2214 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2215 glDisable (GL_TEXTURE_2D);
2015} 2216}
2016 2217
2017void 2218void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2219fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2220 PPCODE:
2020{ 2221{
2021 int x, y; 2222 int x, y;
2022 int sw1 = sw + 2; 2223 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2224 int sh1 = sh + 2;
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2295 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2296 PUSHs (darkness3_sv);
2096} 2297}
2097 2298
2098SV * 2299SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2300get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2301 CODE:
2101{ 2302{
2102 int x, y, x1, y1; 2303 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2304 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2305 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2362 else
2162 *data++ = 0; 2363 *data++ = 0;
2163 } 2364 }
2164 } 2365 }
2165 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2166 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2168 RETVAL = data_sv; 2374 RETVAL = data_sv;
2169} 2375}
2170 OUTPUT: 2376 OUTPUT:
2171 RETVAL 2377 RETVAL
2172 2378
2173void 2379void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2381 PPCODE:
2176{ 2382{
2177 int x, y, z; 2383 int x, y, z;
2178 int w, h; 2384 int w, h;
2179 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2180 2396
2181 if (*data++ != 0) 2397 if (*data++ != 0)
2182 return; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2183 2399
2184 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2401 h = *data++ << 8; h |= *data++;
2186 2402
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2403 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2415 {
2200 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2201 2417
2202 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2203 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2204 uint8_t flags = *data++; 2425 flags = *data++;
2205 2426
2206 if (flags) 2427 if (flags)
2207 { 2428 {
2208 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2435
2215 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2216 { 2437 {
2217 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2218 2440
2219 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2220 { 2442 {
2221 tileid t = tile [z]; 2443 tileid t = tile [z];
2222 2444
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2446 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2448 need_texid (self, t);
2227 } 2449 }
2228 2450
2229 cell->tile [z] = t; 2451 cell->tile [z] = t;
2230 } 2452 }
2232 } 2454 }
2233 } 2455 }
2234 } 2456 }
2235} 2457}
2236 2458
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2459MODULE = Deliantra::Client PACKAGE = DC::RW
2460
2461DC::RW
2462new (SV *class, SV *data_sv)
2463 CODE:
2464{
2465 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen);
2467
2468 RETVAL = SDL_RWFromConstMem (data, datalen);
2469}
2470 OUTPUT:
2471 RETVAL
2472
2473DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb")
2475 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT:
2478 RETVAL
2479
2480# fails on win32:
2481# dc.xs(2268) : error C2059: syntax error : '('
2482#void
2483#close (DC::RW self)
2484# CODE:
2485# (self->(close)) (self);
2486
2487MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2488
2239PROTOTYPES: DISABLE 2489PROTOTYPES: DISABLE
2240 2490
2241CFPlus::MixChunk 2491DC::Channel
2242new_from_file (SV *class, char *path) 2492find ()
2243 CODE: 2493 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2494{
2495 RETVAL = Mix_GroupAvailable (-1);
2496
2497 if (RETVAL < 0)
2498 {
2499 RETVAL = Mix_GroupOldest (-1);
2500
2501 if (RETVAL < 0)
2502 XSRETURN_UNDEF;
2503
2504 Mix_HaltChannel (RETVAL);
2505 }
2506
2507 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128);
2509}
2245 OUTPUT: 2510 OUTPUT:
2246 RETVAL 2511 RETVAL
2247 2512
2248void 2513void
2514halt (DC::Channel self)
2515 CODE:
2516 Mix_HaltChannel (self);
2517
2518void
2519expire (DC::Channel self, int ticks = -1)
2520 CODE:
2521 Mix_ExpireChannel (self, ticks);
2522
2523void
2524fade_out (DC::Channel self, int ticks = -1)
2525 CODE:
2526 Mix_FadeOutChannel (self, ticks);
2527
2528int
2529volume (DC::Channel self, int volume)
2530 CODE:
2531 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2532 OUTPUT:
2533 RETVAL
2534
2535void
2536unregister_all_effects (DC::Channel self)
2537 CODE:
2538 Mix_UnregisterAllEffects (self);
2539
2540void
2541set_panning (DC::Channel self, int left, int right)
2542 CODE:
2543 left = CLAMP (left , 0, 255);
2544 right = CLAMP (right, 0, 255);
2545 Mix_SetPanning (self, left, right);
2546
2547void
2548set_distance (DC::Channel self, int distance)
2549 CODE:
2550 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2551
2552void
2553set_position (DC::Channel self, int angle, int distance)
2554 CODE:
2555
2556void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE:
2559{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563}
2564
2565void
2566set_reverse_stereo (DC::Channel self, int flip)
2567 CODE:
2568 Mix_SetReverseStereo (self, flip);
2569
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571
2572PROTOTYPES: DISABLE
2573
2574DC::MixChunk
2575new (SV *class, DC::RW rwops)
2576 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT:
2579 RETVAL
2580
2581void
2249DESTROY (CFPlus::MixChunk self) 2582DESTROY (DC::MixChunk self)
2250 CODE: 2583 CODE:
2251 Mix_FreeChunk (self); 2584 Mix_FreeChunk (self);
2252 2585
2253int 2586int
2254volume (CFPlus::MixChunk self, int volume = -1) 2587volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2588 CODE:
2589 if (items > 1)
2590 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2591 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2592 OUTPUT:
2258 RETVAL 2593 RETVAL
2259 2594
2260int 2595DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2596play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2597 CODE:
2598{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2599 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2600
2601 if (RETVAL < 0)
2602 XSRETURN_UNDEF;
2603
2604 if (channel < 0)
2605 {
2606 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128);
2608 }
2609}
2264 OUTPUT: 2610 OUTPUT:
2265 RETVAL 2611 RETVAL
2266 2612
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2614
2269int 2615int
2270volume (int volume = -1) 2616volume (int volume = -1)
2271 PROTOTYPE: ;$ 2617 PROTOTYPE: ;$
2272 CODE: 2618 CODE:
2619 if (items > 0)
2620 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2621 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2622 OUTPUT:
2275 RETVAL 2623 RETVAL
2276 2624
2625void
2626fade_out (int ms)
2627 CODE:
2628 Mix_FadeOutMusic (ms);
2629
2630void
2631halt ()
2632 CODE:
2633 Mix_HaltMusic ();
2634
2635DC::MixMusic
2636new (SV *class, DC::RW rwops)
2637 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT:
2640 RETVAL
2641
2642void
2643DESTROY (DC::MixMusic self)
2644 CODE:
2645 Mix_FreeMusic (self);
2646
2277int 2647int
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) 2648play (DC::MixMusic self, int loops = -1)
2298 CODE: 2649 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2650 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2651 OUTPUT:
2301 RETVAL 2652 RETVAL
2302 2653
2303int 2654void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2655fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2656 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2657 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2658
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2659MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2660
2312PROTOTYPES: ENABLE 2661PROTOTYPES: ENABLE
2313 2662
2314BOOT: 2663BOOT:
2315{ 2664{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2665 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2666 static const struct {
2318 const char *name; 2667 const char *name;
2319 IV iv; 2668 IV iv;
2320 } *civ, const_iv[] = { 2669 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2670# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2705 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2706 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2707 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2708 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2709 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2710 const_iv (GL_COMPRESSED_ALPHA_ARB),
2711 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2712 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2713 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2714 const_iv (GL_COMPRESSED_RGB_ARB),
2715 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2716 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2717 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2718 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2719 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2720 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2759 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2760 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2761 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2762 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2763 const_iv (GL_GENERATE_MIPMAP_HINT),
2764 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2765 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2766 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2767 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2768 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2769 const_iv (GL_V3F),
2421 2777
2422 texture_av = newAV (); 2778 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2779 AvREAL_off (texture_av);
2424} 2780}
2425 2781
2782void
2783disable_GL_EXT_blend_func_separate ()
2784 CODE:
2785 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0;
2787
2426char * 2788char *
2427gl_vendor () 2789gl_vendor ()
2428 CODE: 2790 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2791 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2792 OUTPUT:
2547 2909
2548void glTexCoord (float s, float t) 2910void glTexCoord (float s, float t)
2549 CODE: 2911 CODE:
2550 glTexCoord2f (s, t); 2912 glTexCoord2f (s, t);
2551 2913
2914void glRect (float x1, float y1, float x2, float y2)
2915 CODE:
2916 glRectf (x1, y1, x2, y2);
2917
2918void glRect_lineloop (float x1, float y1, float x2, float y2)
2919 CODE:
2920 glBegin (GL_LINE_LOOP);
2921 glVertex2f (x1, y1);
2922 glVertex2f (x2, y1);
2923 glVertex2f (x2, y2);
2924 glVertex2f (x1, y2);
2925 glEnd ();
2926
2552PROTOTYPES: ENABLE 2927PROTOTYPES: ENABLE
2553 2928
2554void glBegin (int mode) 2929void glBegin (int mode)
2555 2930
2556void glEnd () 2931void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2963void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 2964 CODE:
2590 if (gl.SeparableFilter2D) 2965 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2966 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 2967
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2968void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 2969
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 2971
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 2972void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 2973
2624 2999
2625void glEndList () 3000void glEndList ()
2626 3001
2627void glCallList (int list) 3002void glCallList (int list)
2628 3003
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 3005
2631PROTOTYPES: DISABLE 3006PROTOTYPES: DISABLE
2632 3007
2633void 3008void
2634find_widget (SV *self, NV x, NV y) 3009find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 3013 XPUSHs (self);
2639} 3014}
2640 3015
2641BOOT: 3016BOOT:
2642{ 3017{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3018 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 3019
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3020 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); 3021 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); 3022 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); 3023 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 3024}
2650 3025
2651void 3026void
2652draw (SV *self) 3027draw (SV *self)
2653 CODE: 3028 CODE:
2657 NV x, y, w, h; 3032 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 3033 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 3034 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 3035 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 3036 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 3037 double draw_x, draw_y;
2664 3038
2665 if (!SvROK (self)) 3039 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3040 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 3041
2668 hv = (HV *)SvRV (self); 3042 hv = (HV *)SvRV (self);
2669 3043
2670 if (SvTYPE (hv) != SVt_PVHV) 3044 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3045 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 3046
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3047 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.; 3048 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 3049
2676 if (!h || !w) 3050 if (!h || !w)
2696 { 3070 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3071 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 3072
2699 if (svp && SvTRUE (*svp)) 3073 if (svp && SvTRUE (*svp))
2700 { 3074 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3075 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 3076 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3077 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 3078 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 3079 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 3080 glVertex2f (w, 0);
2709 glEnd (); 3083 glEnd ();
2710 glDisable (GL_BLEND); 3084 glDisable (GL_BLEND);
2711 } 3085 }
2712 } 3086 }
2713#if 0 3087#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 3088 // draw borders, for debugging
2715 glPushMatrix; 3089 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 3090 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 3091 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 3092 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 3093 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 3094 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 3095 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 3096 glVertex2f (0 , h - 1);
2723 glEnd; 3097 glEnd ();
2724 glPopMatrix; 3098 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 3099#endif
2728 PUSHMARK (SP); 3100 PUSHMARK (SP);
2729 XPUSHs (self); 3101 XPUSHs (self);
2730 PUTBACK; 3102 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 3103 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines