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.208 by root, Sat Jul 21 16:07:53 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/******************************************************************************/
439 478
479static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
480static GV *hover_gv;
481
440static int 482static int
441within_widget (SV *widget, NV x, NV y) 483within_widget (SV *widget, NV x, NV y)
442{ 484{
443 HV *self; 485 HV *self;
444 SV **svp; 486 SV **svp;
473 return 0; 515 return 0;
474 516
475 return 1; 517 return 1;
476} 518}
477 519
478MODULE = CFPlus PACKAGE = CFPlus 520MODULE = Deliantra::Client PACKAGE = DC
479 521
480PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
481 523
482BOOT: 524BOOT:
483{ 525{
484 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
485 static const struct { 527 static const struct {
486 const char *name; 528 const char *name;
487 IV iv; 529 IV iv;
488 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
489# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
511 553
512 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
515 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
516 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
517 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
518 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
519 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
520 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
592 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
593 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
594 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
595 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
596 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)
597# undef const_iv 670# undef const_iv
598 }; 671 };
599 672
600 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; )
601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
619 692
620NV floor (NV x) 693NV floor (NV x)
621 694
622NV ceil (NV x) 695NV ceil (NV x)
623 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
624void 701void
625pango_init () 702pango_init ()
626 CODE: 703 CODE:
627{ 704{
628 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
629 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);
630 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
631} 713}
632 714
633char *
634SDL_GetError () 715char *SDL_GetError ()
635 716
636int 717int SDL_Init (U32 flags)
637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
638 718
639void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
640SDL_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
641 733
642void 734void
643SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
644 PPCODE: 736 PPCODE:
645{ 737{
657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
660 752
661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
662#if SDL_VERSION_ATLEAST(1,2,10)
663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
666 755
667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
668 757
669 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
670 while (*m) 759 while (*m)
671 { 760 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
674 AV *av = newAV (); 761 AV *av = newAV ();
675 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
676 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
678 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
681 767
682 ++m; 768 ++m;
683 } 769 }
684} 770}
685 771
701 787
702 if (RETVAL) 788 if (RETVAL)
703 { 789 {
704 av_clear (texture_av); 790 av_clear (texture_av);
705 791
706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
707#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);
708#include "glfunc.h" 794#include "glfunc.h"
709#undef GL_FUNC 795#undef GL_FUNC
710 } 796 }
711} 797}
718char * 804char *
719SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
720 806
721int 807int
722SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
723 812
724void 813void
725poll_events () 814poll_events ()
726 PPCODE: 815 PPCODE:
727{ 816{
737 { 826 {
738 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
739 case SDL_KEYUP: 828 case SDL_KEYUP:
740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
742 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);
743 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 */
744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
745 break; 834 break;
746 835
747 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
766 x = ev.motion.x; 855 x = ev.motion.x;
767 y = ev.motion.y; 856 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 } 858 }
770 859
771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
772 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
773 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
774 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
775 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
776 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 } 866 }
778 break; 867 break;
779 868
780 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
781 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
783 872
784 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
785 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
786 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
787 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
794 break; 883 break;
795 } 884 }
796 885
797 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))));
798 } 887 }
799} 888}
800 889
801int 890int
802Mix_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)
803 POSTCALL: 892 POSTCALL:
804 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
805 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
806 895
807void 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
808Mix_CloseAudio () 913Mix_CloseAudio ()
809 914
810int 915int
811Mix_AllocateChannels (int numchans = -1) 916Mix_AllocateChannels (int numchans = -1)
917
918const char *
919Mix_GetError ()
812 920
813void 921void
814lowdelay (int fd, int val = 1) 922lowdelay (int fd, int val = 1)
815 CODE: 923 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 924 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
842 } 950 }
843 } 951 }
844#endif 952#endif
845} 953}
846 954
847void 955int
848add_font (char *file) 956add_font (char *file)
849 CODE: 957 CODE:
850 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
851 961
852void 962void
853load_image_inline (SV *image_) 963load_image_inline (SV *image_)
854 ALIAS: 964 ALIAS:
855 load_image_file = 1 965 load_image_file = 1
858 STRLEN image_len; 968 STRLEN image_len;
859 char *image = (char *)SvPVbyte (image_, image_len); 969 char *image = (char *)SvPVbyte (image_, image_len);
860 SDL_Surface *surface, *surface2; 970 SDL_Surface *surface, *surface2;
861 SDL_PixelFormat fmt; 971 SDL_PixelFormat fmt;
862 SDL_RWops *rw = ix 972 SDL_RWops *rw = ix
863 ? SDL_RWFromFile (image, "r") 973 ? SDL_RWFromFile (image, "rb")
864 : SDL_RWFromConstMem (image, image_len); 974 : SDL_RWFromConstMem (image, image_len);
865 975
866 if (!rw) 976 if (!rw)
867 croak ("load_image: %s", SDL_GetError ()); 977 croak ("load_image: %s", SDL_GetError ());
868 978
941void 1051void
942error (char *message) 1052error (char *message)
943 CODE: 1053 CODE:
944 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
945#ifdef _WIN32 1055#ifdef _WIN32
946 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
947#endif 1057#endif
948 1058
949void 1059void
950fatal (char *message) 1060fatal (char *message)
951 CODE: 1061 CODE:
952 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
953#ifdef _WIN32 1063#ifdef _WIN32
954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
955#endif 1065#endif
956 _exit (1); 1066 _exit (1);
957 1067
958void 1068void
959_exit (int retval = 0) 1069_exit (int retval = 0)
971#if DEBUG 1081#if DEBUG
972 VALGRIND_DO_LEAK_CHECK; 1082 VALGRIND_DO_LEAK_CHECK;
973#endif 1083#endif
974} 1084}
975 1085
976MODULE = CFPlus PACKAGE = CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
977 1087
978PROTOTYPES: DISABLE 1088PROTOTYPES: DISABLE
979 1089
980CFPlus::Font 1090DC::Font
981new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
982 CODE: 1092 CODE:
983{ 1093{
984 int count; 1094 int count;
985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
988} 1098}
989 OUTPUT: 1099 OUTPUT:
990 RETVAL 1100 RETVAL
991 1101
992void 1102void
993DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
994 CODE: 1104 CODE:
995 pango_font_description_free (self); 1105 pango_font_description_free (self);
996 1106
997void 1107void
998make_default (CFPlus::Font self) 1108make_default (DC::Font self)
999 PROTOTYPE: $ 1109 PROTOTYPE: $
1000 CODE: 1110 CODE:
1001 default_font = self; 1111 default_font = self;
1002 1112
1003MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
1004 1114
1005PROTOTYPES: DISABLE 1115PROTOTYPES: DISABLE
1006 1116
1007void 1117void
1008reset_glyph_cache () 1118glyph_cache_backup ()
1009 PROTOTYPE: 1119 PROTOTYPE:
1010 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
1011 tc_clear (); 1127 tc_restore ();
1012 1128
1013CFPlus::Layout 1129DC::Layout
1014new (SV *class) 1130new (SV *class)
1015 CODE: 1131 CODE:
1016 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
1017 1133
1018 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
1020 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
1021 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
1022 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
1023 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
1024 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1025 1142
1026 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1027 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
1028 OUTPUT: 1145 OUTPUT:
1029 RETVAL 1146 RETVAL
1030 1147
1031void 1148void
1032DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
1033 CODE: 1150 CODE:
1034 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
1035 Safefree (self); 1153 Safefree (self);
1036 1154
1037void 1155void
1038set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
1039 CODE: 1157 CODE:
1040{ 1158{
1041 STRLEN textlen; 1159 STRLEN textlen;
1042 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
1043 1161
1044 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
1045} 1163}
1046 1164
1047void 1165void
1048set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
1049 CODE: 1167 CODE:
1050{ 1168{
1051 STRLEN textlen; 1169 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
1053 1171
1054 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
1055} 1173}
1056 1174
1057void 1175void
1058set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
1059 CODE: 1177 CODE:
1060{ 1178{
1061 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text; 1181 const char *pos = text;
1098 if (attrs) 1216 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
1100} 1218}
1101 1219
1102void 1220void
1103get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
1104 PPCODE: 1222 PPCODE:
1105{ 1223{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107 1225
1108 do 1226 do
1109 { 1227 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1111 1229
1112 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
1113 { 1231 {
1114 PangoRectangle extents; 1232 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
1123 1241
1124 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
1125} 1243}
1126 1244
1127int 1245int
1128has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
1129 CODE: 1247 CODE:
1130{ 1248{
1131 int lines = 1; 1249 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
1133 1251
1138} 1256}
1139 OUTPUT: 1257 OUTPUT:
1140 RETVAL 1258 RETVAL
1141 1259
1142SV * 1260SV *
1143get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1144 CODE: 1262 CODE:
1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1146 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1147 OUTPUT: 1265 OUTPUT:
1148 RETVAL 1266 RETVAL
1149 1267
1150void 1268void
1151set_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.)
1152 CODE: 1270 CODE:
1153 self->r = r; 1271 self->r = r;
1154 self->g = g; 1272 self->g = g;
1155 self->b = b; 1273 self->b = b;
1156 self->a = a; 1274 self->a = a;
1157 1275
1158void 1276void
1159set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1160 CODE: 1278 CODE:
1161 if (self->font != font) 1279 if (self->font != font)
1162 { 1280 {
1163 self->font = font; 1281 self->font = font;
1164 layout_update_font (self); 1282 layout_update_font (self);
1165 } 1283 }
1166 1284
1167void 1285void
1168set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1169 CODE: 1287 CODE:
1170 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1171 { 1289 {
1172 self->base_height = base_height; 1290 self->base_height = base_height;
1173 layout_update_font (self); 1291 layout_update_font (self);
1174 } 1292 }
1175 1293
1176void 1294void
1177set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1178 CODE: 1296 CODE:
1179 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);
1180 1298
1181void 1299void
1182set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1183 CODE: 1301 CODE:
1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1185 1303
1186void 1304void
1187set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1188 CODE: 1306 CODE:
1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1190 1308
1191void 1309void
1192set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1193 CODE: 1311 CODE:
1194 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1198 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1199 ); 1317 );
1200 1318
1201void 1319void
1202set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1203 CODE: 1321 CODE:
1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1205 1323
1206void 1324void
1207size (CFPlus::Layout self) 1325size (DC::Layout self)
1208 PPCODE: 1326 PPCODE:
1209{ 1327{
1210 int w, h; 1328 int w, h;
1211 1329
1212 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1215 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1216 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1217} 1335}
1218 1336
1219int 1337int
1220descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1221 CODE: 1339 CODE:
1222{ 1340{
1223 PangoRectangle rect; 1341 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1227} 1345}
1228 OUTPUT: 1346 OUTPUT:
1229 RETVAL 1347 RETVAL
1230 1348
1231int 1349int
1232xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1233 CODE: 1351 CODE:
1234{ 1352{
1235 int index, trailing; 1353 int index, trailing;
1236 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);
1237 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1238} 1356}
1239 OUTPUT: 1357 OUTPUT:
1240 RETVAL 1358 RETVAL
1241 1359
1242void 1360void
1243cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1244 PPCODE: 1362 PPCODE:
1245{ 1363{
1246 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1248 1366
1249 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1250 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1253} 1371}
1254 1372
1255void 1373void
1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1257 PPCODE: 1375 PPCODE:
1258{ 1376{
1259 int line, x; 1377 int line, x;
1260 1378
1261 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)
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1263 1382 --line;
1383#endif
1264 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1265 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267} 1387}
1268 1388
1269void 1389void
1270line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1271 PPCODE: 1391 PPCODE:
1272{ 1392{
1273 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1274 int index, trailing; 1394 int index, trailing;
1275 1395
1276 if (line < 0) 1396 if (line < 0)
1277 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1278 1398
1279 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1281 1401
1282 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);
1283 1403
1284 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1290 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1291 } 1411 }
1292} 1412}
1293 1413
1294void 1414void
1295render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1296 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1297 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1298 self->pl, 1419 self->pl,
1420 self->rc,
1299 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1301 flags 1423 flags
1302 ); 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);
1303 1428
1304MODULE = 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
1305 1449
1306PROTOTYPES: ENABLE 1450PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309 1451
1310void 1452void
1311pad (SV *data_, int ow, int oh, int nw, int nh) 1453pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE: 1454 CODE:
1313{ 1455{
1340 HV *hv = (HV *)SvRV (self); 1482 HV *hv = (HV *)SvRV (self);
1341 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1483 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1342 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1484 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1343 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1485 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1344 1486
1487 if (name <= 0)
1488 XSRETURN_EMPTY;
1489
1345 if (items < 5) 1490 if (items < 5)
1346 { 1491 {
1347 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1492 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1348 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1493 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1349 } 1494 }
1387 RETVAL = width > 0; 1532 RETVAL = width > 0;
1388} 1533}
1389 OUTPUT: 1534 OUTPUT:
1390 RETVAL 1535 RETVAL
1391 1536
1392MODULE = CFPlus PACKAGE = CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1393 1538
1394PROTOTYPES: DISABLE 1539PROTOTYPES: DISABLE
1395 1540
1396CFPlus::Map 1541DC::Map
1397new (SV *class) 1542new (SV *class)
1398 CODE: 1543 CODE:
1399 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1400 RETVAL->x = 0; 1545 RETVAL->x = 0;
1401 RETVAL->y = 0; 1546 RETVAL->y = 0;
1409 RETVAL->row = 0; 1554 RETVAL->row = 0;
1410 OUTPUT: 1555 OUTPUT:
1411 RETVAL 1556 RETVAL
1412 1557
1413void 1558void
1414DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1415 CODE: 1560 CODE:
1416{ 1561{
1417 map_clear (self); 1562 map_clear (self);
1418 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1419 Safefree (self->tex); 1564 Safefree (self->tex);
1420 Safefree (self); 1565 Safefree (self);
1421} 1566}
1422 1567
1423void 1568void
1424resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1425 CODE: 1570 CODE:
1426 self->w = map_width; 1571 self->w = map_width;
1427 self->h = map_height; 1572 self->h = map_height;
1428 1573
1429void 1574void
1430clear (CFPlus::Map self) 1575clear (DC::Map self)
1431 CODE: 1576 CODE:
1432 map_clear (self); 1577 map_clear (self);
1433 1578
1434void 1579void
1435set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1436 CODE: 1581 CODE:
1437{ 1582{
1438 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1439 need_texid (self, tile); 1584 need_texid (self, tile);
1440} 1585}
1441 1586
1442void 1587void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level) 1588set_smooth (DC::Map self, int face, int smooth, int level)
1444 CODE: 1589 CODE:
1445{ 1590{
1446 tileid texid; 1591 tileid texid;
1447 maptex *tex; 1592 maptex *tex;
1448 1593
1461 tex->smoothtile = self->face2tile [smooth]; 1606 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level; 1607 tex->smoothlevel = level;
1463} 1608}
1464 1609
1465void 1610void
1466set_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)
1467 CODE: 1612 CODE:
1468{ 1613{
1469 need_texid (self, texid); 1614 need_texid (self, texid);
1470 1615
1471 { 1616 {
1491 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1493} 1638}
1494 1639
1495int 1640int
1496ox (CFPlus::Map self) 1641ox (DC::Map self)
1497 ALIAS: 1642 ALIAS:
1498 oy = 1 1643 oy = 1
1499 x = 2 1644 x = 2
1500 y = 3 1645 y = 3
1501 w = 4 1646 w = 4
1512 } 1657 }
1513 OUTPUT: 1658 OUTPUT:
1514 RETVAL 1659 RETVAL
1515 1660
1516void 1661void
1517scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1518 CODE: 1663 CODE:
1519{ 1664{
1520 if (dx > 0) 1665 if (dx > 0)
1521 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1522 else if (dx < 0) 1667 else if (dx < 0)
1537 self->rows += MAP_EXTEND_Y; 1682 self->rows += MAP_EXTEND_Y;
1538 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1539 } 1684 }
1540} 1685}
1541 1686
1542void 1687SV *
1543map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1544 CODE: 1689 CODE:
1545{ 1690{
1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1547 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1548 mapcell *cell; 1693 mapcell *cell;
1549 int x, y, flags; 1694 int x, y, z, flags;
1695 AV *missing = newAV ();
1696 RETVAL = newRV_noinc ((SV *)missing);
1550 1697
1551 while (data < data_end - 1) 1698 while (data < data_end - 1)
1552 { 1699 {
1553 flags = (data [0] << 8) + data [1]; data += 2; 1700 flags = (data [0] << 8) + data [1]; data += 2;
1554 1701
1574 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1575 1722
1576 do 1723 do
1577 { 1724 {
1578 ext = *data++; 1725 ext = *data++;
1579 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1580 1727
1581 if (cmd < 4) 1728 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1584 { 1731 {
1587 } 1734 }
1588 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1591 { 1738 {
1592 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1593 ; // 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);
1594 1743
1595 data += *data + 1; 1744 data += *data + 1;
1596 } 1745 }
1597 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1598 cell->flags = *data++; 1747 cell->flags = *data++;
1605 } 1754 }
1606 else 1755 else
1607 cell->darkness = *data++ + 1; 1756 cell->darkness = *data++ + 1;
1608 } 1757 }
1609 1758
1759 for (z = 0; z <= 2; ++z)
1610 if (flags & 4) 1760 if (flags & (4 >> z))
1611 { 1761 {
1612 faceid face = (data [0] << 8) + data [1]; data += 2; 1762 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face); 1763 need_facenum (self, face);
1614 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 }
1615 } 1779 }
1616
1617 if (flags & 2)
1618 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1622 }
1623
1624 if (flags & 1)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1629 }
1630 } 1780 }
1631 else 1781 else
1632 cell->darkness = 0; 1782 cell->darkness = 0;
1633 } 1783 }
1634} 1784}
1785 OUTPUT:
1786 RETVAL
1635 1787
1636SV * 1788SV *
1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1638 CODE: 1790 CODE:
1639{ 1791{
1640 int x1, x; 1792 int x1, x;
1641 int y1, y; 1793 int y1, y;
1642 int z; 1794 int z;
1687} 1839}
1688 OUTPUT: 1840 OUTPUT:
1689 RETVAL 1841 RETVAL
1690 1842
1691void 1843void
1692draw (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)
1693 CODE: 1845 CODE:
1694{ 1846{
1847 int x, y, z;
1848
1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 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
1697 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)
1698 smooth_key skey; 1852 smooth_key skey;
1699 int x, y, z; 1853 int pl_x, pl_y;
1700 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;
1701 1860
1702 // thats current max. sorry. 1861 // thats current max. sorry.
1703 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1705 1864
1706 // clear key, in case of extra padding 1865 // clear key, in case of extra padding
1707 memset (&skey, 0, sizeof (skey)); 1866 memset (&skey, 0, sizeof (skey));
1708 1867
1709 glColor4ub (255, 255, 255, 255); 1868 memset (&key, 0, sizeof (key));
1710 1869 key.r = 255;
1711 glEnable (GL_BLEND); 1870 key.g = 255;
1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1871 key.b = 255;
1713 glEnable (GL_TEXTURE_2D); 1872 key.a = 255;
1714 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1873 key.mode = GL_QUADS;
1715 1874 key.format = GL_T2F_V3F;
1716 glBegin (GL_QUADS); 1875 key.texname = -1;
1717
1718 last_name = 0;
1719 1876
1720 mx += self->x; 1877 mx += self->x;
1721 my += self->y; 1878 my += self->y;
1722 1879
1723 // first pass: determine smooth_max 1880 // first pass: determine smooth_max
1739 MAX (self->tex [cell->tile [0]].smoothlevel, 1896 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel, 1897 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel)); 1898 self->tex [cell->tile [2]].smoothlevel));
1742 } 1899 }
1743 } 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);
1744 1905
1745 for (z = 0; z <= 2; z++) 1906 for (z = 0; z <= 2; z++)
1746 { 1907 {
1747 memset (smooth_level, 0, sizeof (smooth_level)); 1908 memset (smooth_level, 0, sizeof (smooth_level));
1748 1909
1761 { 1922 {
1762 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w; 1924 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h; 1925 int py = (y + 1) * T - tex.h;
1765 1926
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name) 1927 if (key.texname != tex.name)
1769 { 1928 {
1770 if (!tex.name) 1929 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1772 1931
1773 glEnd (); 1932 key.texname = tex.name;
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1933 arr = rc_array (rc, &key);
1775 glBegin (GL_QUADS);
1776 } 1934 }
1777 1935
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782
1783 if (cell->flags && z == 2)
1784 { 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
1785 if (cell->flags & 1) 1952 if (cell->flags & 1)
1786 { 1953 {
1787 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32; 1955 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32; 1956 int py = y * T - T * 6 / 32;
1790 1957
1958 if (tex.name)
1791 glEnd (); 1959 {
1792 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);
1793 glBegin (GL_QUADS); 1970 }
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 } 1971 }
1800 } 1972 }
1801 1973
1802 // update smooth hash 1974 // update smooth hash
1803 if (tex.smoothtile) 1975 if (tex.smoothtile)
1839 } 2011 }
1840 } 2012 }
1841 } 2013 }
1842 } 2014 }
1843 2015
2016 rc_draw (rc);
2017 rc_clear (rc);
2018
1844 // go through all smoothlevels, lowest to highest, then draw. 2019 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort 2020 // this is basically counting sort
1846 { 2021 {
1847 int w, b; 2022 int w, b;
1848 2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
1849 for (w = 0; w < 256 / 32; ++w) 2026 for (w = 0; w < 256 / 32; ++w)
1850 { 2027 {
1851 uint32_t smask = smooth_level [w]; 2028 uint32_t smask = smooth_level [w];
1852 if (smask) 2029 if (smask)
1853 for (b = 0; b < 32; ++b) 2030 for (b = 0; b < 32; ++b)
1872 int border = bits & 15; 2049 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row 2051 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column 2052 float dy = tex.t * .5f ; // 2 images/column
1876 2053
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name) 2054 if (tex.name)
1880 { 2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
1881 if (!tex.name) 2058 if (key.texname != tex.name)
1882 continue; // smoothing not yet available 2059 {
1883
1884 glEnd (); 2060 glEnd ();
1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1886 glBegin (GL_QUADS); 2062 glBegin (GL_QUADS);
1887 } 2063 }
1888 2064
1889 if (border) 2065 if (border)
1890 { 2066 {
1891 float ox = border * dx; 2067 float ox = border * dx;
1892 2068
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1897 } 2073 }
1898 2074
1899 if (corner) 2075 if (corner)
1900 { 2076 {
1901 float ox = corner * dx; 2077 float ox = corner * dx;
1902 2078
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2083 }
1907 } 2084 }
1908 } 2085 }
1909 } 2086 }
1910 } 2087 }
1911 } 2088 }
2089
2090 glEnd ();
2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
1912 } 2093 }
1913 2094
1914 hv_clear (smooth); 2095 hv_clear (smooth);
1915 } 2096 }
1916 2097
1917 glEnd (); 2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
1918 2103
1919 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
1920 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2116 rc_free (rc);
1921 2117
1922 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows) 2120 if (0 <= y + my && y + my < self->rows)
1925 { 2121 {
1950 } 2146 }
1951 } 2147 }
1952} 2148}
1953 2149
1954void 2150void
1955draw_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)
1956 CODE: 2152 CODE:
1957{ 2153{
1958 static float color[16][3] = { 2154 static float color[16][3] = {
1959 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1960 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
2010 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
2011 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
2012} 2208}
2013 2209
2014void 2210void
2015fow_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)
2016 PPCODE: 2212 PPCODE:
2017{ 2213{
2018 int x, y; 2214 int x, y;
2019 int sw1 = sw + 2; 2215 int sw1 = sw + 2;
2020 int sh1 = sh + 2; 2216 int sh1 = sh + 2;
2091 PUSHs (sv_2mortal (newSViv (sh3))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
2092 PUSHs (darkness3_sv); 2288 PUSHs (darkness3_sv);
2093} 2289}
2094 2290
2095SV * 2291SV *
2096get_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)
2097 CODE: 2293 CODE:
2098{ 2294{
2099 int x, y, x1, y1; 2295 int x, y, x1, y1;
2100 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
2101 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2158 else 2354 else
2159 *data++ = 0; 2355 *data++ = 0;
2160 } 2356 }
2161 } 2357 }
2162 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 {
2163 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2164 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2165 RETVAL = data_sv; 2366 RETVAL = data_sv;
2166} 2367}
2167 OUTPUT: 2368 OUTPUT:
2168 RETVAL 2369 RETVAL
2169 2370
2170void 2371void
2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2172 PPCODE: 2373 PPCODE:
2173{ 2374{
2174 int x, y, z; 2375 int x, y, z;
2175 int w, h; 2376 int w, h;
2176 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;
2177 2388
2178 if (*data++ != 0) 2389 if (*data++ != 0)
2179 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2180 2391
2181 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
2182 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
2183 2394
2184 // 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
2196 { 2407 {
2197 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2198 2409
2199 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2200 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2201 uint8_t flags = *data++; 2417 flags = *data++;
2202 2418
2203 if (flags) 2419 if (flags)
2204 { 2420 {
2205 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2211 2427
2212 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2213 { 2429 {
2214 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2215 2432
2216 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2217 { 2434 {
2218 tileid t = tile [z]; 2435 tileid t = tile [z];
2219 2436
2220 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2221 { 2438 {
2222 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t); 2440 need_texid (self, t);
2224 } 2441 }
2225 2442
2226 cell->tile [z] = t; 2443 cell->tile [z] = t;
2227 } 2444 }
2229 } 2446 }
2230 } 2447 }
2231 } 2448 }
2232} 2449}
2233 2450
2234MODULE = 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
2235 2480
2236PROTOTYPES: DISABLE 2481PROTOTYPES: DISABLE
2237 2482
2238CFPlus::MixChunk 2483DC::Channel
2239new_from_file (SV *class, char *path) 2484find ()
2240 CODE: 2485 CODE:
2241 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}
2242 OUTPUT: 2502 OUTPUT:
2243 RETVAL 2503 RETVAL
2244 2504
2245void 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
2246DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
2247 CODE: 2575 CODE:
2248 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
2249 2577
2250int 2578int
2251volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
2252 CODE: 2580 CODE:
2581 if (items > 1)
2582 volume = CLAMP (volume, 0, 128);
2253 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
2254 OUTPUT: 2584 OUTPUT:
2255 RETVAL 2585 RETVAL
2256 2586
2257int 2587DC::Channel
2258play (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)
2259 CODE: 2589 CODE:
2590{
2260 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}
2261 OUTPUT: 2602 OUTPUT:
2262 RETVAL 2603 RETVAL
2263 2604
2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2265 2606
2266int 2607int
2267volume (int volume = -1) 2608volume (int volume = -1)
2268 PROTOTYPE: ;$ 2609 PROTOTYPE: ;$
2269 CODE: 2610 CODE:
2611 if (items > 0)
2612 volume = CLAMP (volume, 0, 128);
2270 RETVAL = Mix_VolumeMusic (volume); 2613 RETVAL = Mix_VolumeMusic (volume);
2271 OUTPUT: 2614 OUTPUT:
2272 RETVAL 2615 RETVAL
2273 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
2274int 2639int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
2281CFPlus::MixMusic
2282new_from_file (SV *class, char *path)
2283 CODE:
2284 RETVAL = Mix_LoadMUS (path);
2285 OUTPUT:
2286 RETVAL
2287
2288void
2289DESTROY (CFPlus::MixMusic self)
2290 CODE:
2291 Mix_FreeMusic (self);
2292
2293int
2294play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
2295 CODE: 2641 CODE:
2296 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
2297 OUTPUT: 2643 OUTPUT:
2298 RETVAL 2644 RETVAL
2299 2645
2300int 2646void
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2302 CODE: 2648 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2649 Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306 2650
2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2308 2652
2309PROTOTYPES: ENABLE 2653PROTOTYPES: ENABLE
2310 2654
2311BOOT: 2655BOOT:
2312{ 2656{
2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2314 static const struct { 2658 static const struct {
2315 const char *name; 2659 const char *name;
2316 IV iv; 2660 IV iv;
2317 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
2318# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2353 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
2354 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
2355 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
2356 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
2357 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),
2358 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D), 2709 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D), 2710 const_iv (GL_PROXY_TEXTURE_2D),
2361 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
2362 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT), 2752 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT), 2753 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT), 2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT), 2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2406 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE), 2758 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST), 2759 const_iv (GL_NICEST),
2409 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2410 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2418 2769
2419 texture_av = newAV (); 2770 texture_av = newAV ();
2420 AvREAL_off (texture_av); 2771 AvREAL_off (texture_av);
2421} 2772}
2422 2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2779
2423char * 2780char *
2424gl_vendor () 2781gl_vendor ()
2425 CODE: 2782 CODE:
2426 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2427 OUTPUT: 2784 OUTPUT:
2544 2901
2545void glTexCoord (float s, float t) 2902void glTexCoord (float s, float t)
2546 CODE: 2903 CODE:
2547 glTexCoord2f (s, t); 2904 glTexCoord2f (s, t);
2548 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
2549PROTOTYPES: ENABLE 2919PROTOTYPES: ENABLE
2550 2920
2551void glBegin (int mode) 2921void glBegin (int mode)
2552 2922
2553void glEnd () 2923void glEnd ()
2585void 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)
2586 CODE: 2956 CODE:
2587 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2588 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2589 2959
2590void 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)
2591 2961
2592void 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)
2593 2963
2594void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2595 2965
2621 2991
2622void glEndList () 2992void glEndList ()
2623 2993
2624void glCallList (int list) 2994void glCallList (int list)
2625 2995
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2627 2997
2628PROTOTYPES: DISABLE 2998PROTOTYPES: DISABLE
2629 2999
2630void 3000void
2631find_widget (SV *widget, NV x, NV y) 3001find_widget (SV *self, NV x, NV y)
2632 PPCODE: 3002 PPCODE:
2633{ 3003{
2634 if (within_widget (widget, x, y)) 3004 if (within_widget (self, x, y))
2635 XPUSHs (widget); 3005 XPUSHs (self);
2636} 3006}
2637 3007
3008BOOT:
3009{
3010 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3011
3012 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3013 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3014 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3015 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3016}
3017
3018void
3019draw (SV *self)
3020 CODE:
3021{
3022 HV *hv;
3023 SV **svp;
3024 NV x, y, w, h;
3025 SV *draw_x_sv = GvSV (draw_x_gv);
3026 SV *draw_y_sv = GvSV (draw_y_gv);
3027 SV *draw_w_sv = GvSV (draw_w_gv);
3028 SV *draw_h_sv = GvSV (draw_h_gv);
3029 double draw_x, draw_y;
3030
3031 if (!SvROK (self))
3032 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3033
3034 hv = (HV *)SvRV (self);
3035
3036 if (SvTYPE (hv) != SVt_PVHV)
3037 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3038
3039 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3040 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3041
3042 if (!h || !w)
3043 XSRETURN_EMPTY;
3044
3045 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3046 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3047
3048 draw_x = SvNV (draw_x_sv) + x;
3049 draw_y = SvNV (draw_y_sv) + y;
3050
3051 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3052 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3053 XSRETURN_EMPTY;
3054
3055 sv_setnv (draw_x_sv, draw_x);
3056 sv_setnv (draw_y_sv, draw_y);
3057
3058 glPushMatrix ();
3059 glTranslated (x, y, 0);
3060
3061 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3062 {
3063 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3064
3065 if (svp && SvTRUE (*svp))
3066 {
3067 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3068 glEnable (GL_BLEND);
3069 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3070 glBegin (GL_QUADS);
3071 glVertex2f (0, 0);
3072 glVertex2f (w, 0);
3073 glVertex2f (w, h);
3074 glVertex2f (0, h);
3075 glEnd ();
3076 glDisable (GL_BLEND);
3077 }
3078 }
3079#if 0
3080 // draw borders, for debugging
3081 glPushMatrix ();
3082 glColor4f (1., 1., 0., 1.);
3083 glTranslatef (.5, .5, 0.);
3084 glBegin (GL_LINE_LOOP);
3085 glVertex2f (0 , 0);
3086 glVertex2f (w - 1, 0);
3087 glVertex2f (w - 1, h - 1);
3088 glVertex2f (0 , h - 1);
3089 glEnd ();
3090 glPopMatrix ();
3091#endif
3092 PUSHMARK (SP);
3093 XPUSHs (self);
3094 PUTBACK;
3095 call_method ("_draw", G_VOID | G_DISCARD);
3096 SPAGAIN;
3097
3098 glPopMatrix ();
3099
3100 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3101 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3102}
3103

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines