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.174 by root, Fri Apr 6 07:45:34 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# 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
17#endif 27#endif
18 28
19#include <assert.h> 29#include <assert.h>
20#include <math.h> 30#include <math.h>
21#include <string.h> 31#include <string.h>
22#include <stdio.h> 32#include <stdio.h>
23#include <stdlib.h> 33#include <stdlib.h>
24 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
25#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
26#include <SDL_endian.h> 39#include <SDL_endian.h>
27#include <SDL_image.h> 40#include <SDL_image.h>
28#include <SDL_mixer.h> 41#include <SDL_mixer.h>
29#include <SDL_opengl.h> 42#include <SDL_opengl.h>
30 43
32#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
33 46
34#include <glib/gmacros.h> 47#include <glib/gmacros.h>
35 48
36#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
37 61
38#ifndef _WIN32 62#ifndef _WIN32
39# include <sys/types.h> 63# include <sys/types.h>
40# include <sys/socket.h> 64# include <sys/socket.h>
41# include <netinet/in.h> 65# include <netinet/in.h>
42# include <netinet/tcp.h> 66# include <netinet/tcp.h>
43# include <inttypes.h> 67# include <inttypes.h>
44#endif 68#endif
45 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
46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
47 80
48#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
49 82
50#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
51#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
52 85
53#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
54 87
55#if 0 88/* mask out modifiers we are not interested in */
56# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
57#else 90
58# define PARACHUTE 0 91static AV *texture_av;
59#endif
60 92
61static struct 93static struct
62{ 94{
63#define GL_FUNC(ptr,name) ptr name; 95#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 96#include "glfunc.h"
65#undef GL_FUNC 97#undef GL_FUNC
66} gl; 98} gl;
67 99
100static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 101gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 102{
70 if (gl.BlendFuncSeparate) 103 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 104 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 105 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 106 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 107 else
75 glBlendFunc (sa, da); 108 glBlendFunc (sa, da);
76} 109}
77 110
111static GLuint
112gen_texture ()
113{
114 GLuint name;
115
116 if (AvFILL (texture_av) >= 0)
117 name = (GLuint)(size_t)av_pop (texture_av);
118 else
119 glGenTextures (1, &name);
120
121 return name;
122}
123
124static void
125del_texture (GLuint name)
126{
127 /* make a half-assed attempt at returning the memory used by the texture */
128 /* textures are frequently being reused by cfplus anyway */
129 /*glBindTexture (GL_TEXTURE_2D, name);*/
130 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
131 av_push (texture_av, (SV *)(size_t)name);
132 glDeleteTextures (1, &name);
133}
134
78#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
79 137
80#include "pango-font.c" 138#include "pango-font.c"
81#include "pango-fontmap.c" 139#include "pango-fontmap.c"
82#include "pango-render.c" 140#include "pango-render.c"
83 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
84typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
85typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
86 146
87typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
88 148
89static int 149static int
90shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
91{ 151{
92 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
106 166
107typedef struct cf_layout { 167typedef struct cf_layout {
108 PangoLayout *pl; 168 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
110 int base_height; 170 int base_height;
111 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
112} *CFPlus__Layout; 173} *DC__Layout;
113 174
114static CFPlus__Font default_font; 175static DC__Font default_font;
115static PangoContext *opengl_context; 176static PangoContext *opengl_context;
116static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
117 178
118static void 179static void
119substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
124#endif 185#endif
125 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
126} 187}
127 188
128static void 189static void
129layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
130{ 191{
131 /* 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
132 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
133 */ 194 */
134 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
135 196
136 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
137 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
138 199
139 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
140} 201}
141 202
142static void 203static void
143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
144{ 205{
145 PangoRectangle rect; 206 PangoRectangle rect;
146 207
147 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
148 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
159 220
160typedef uint16_t tileid; 221typedef uint16_t tileid;
161typedef uint16_t faceid; 222typedef uint16_t faceid;
162 223
163typedef struct { 224typedef struct {
164 int name; 225 GLuint name;
165 int w, h; 226 int w, h;
166 float s, t; 227 float s, t;
167 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
229 tileid smoothtile;
230 uint8_t smoothlevel;
168} maptex; 231} maptex;
169 232
170typedef struct { 233typedef struct {
171 uint32_t player; 234 uint32_t player;
172 tileid tile[3]; 235 tileid tile[3];
173 uint16_t darkness; 236 uint16_t darkness;
174 uint8_t stat_width, stat_hp, flags; 237 uint8_t stat_width, stat_hp, flags, smoothmax;
175} mapcell; 238} mapcell;
176 239
177typedef struct { 240typedef struct {
178 int32_t c0, c1; 241 int32_t c0, c1;
179 mapcell *col; 242 mapcell *col;
185 int faces; tileid *face2tile; // [faceid] 248 int faces; tileid *face2tile; // [faceid]
186 int texs; maptex *tex; // [tileid] 249 int texs; maptex *tex; // [tileid]
187 250
188 int32_t rows; 251 int32_t rows;
189 maprow *row; 252 maprow *row;
190} *CFPlus__Map; 253} *DC__Map;
191 254
192static char * 255static char *
193prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
194{ 257{
195 char *p; 258 char *p;
233 self->texs *= 2; 296 self->texs *= 2;
234 } 297 }
235} 298}
236 299
237static maprow * 300static maprow *
238map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
239{ 302{
240 if (0 > y) 303 if (0 > y)
241 { 304 {
242 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
243 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
281 344
282 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
283} 346}
284 347
285static mapcell * 348static mapcell *
286map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
287{ 350{
288 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
289} 352}
290 353
291static void 354static void
292map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
293{ 356{
294 int r; 357 int r;
295 358
296 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
297 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
305 self->row = 0; 368 self->row = 0;
306 self->rows = 0; 369 self->rows = 0;
307} 370}
308 371
309static void 372static void
310map_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)
311{ 374{
312 int x, y; 375 int x, y;
313 maprow *row; 376 maprow *row;
314 mapcell *cell; 377 mapcell *cell;
315 378
335 cell->player = 0; 398 cell->player = 0;
336 } 399 }
337 } 400 }
338} 401}
339 402
403typedef struct {
404 tileid tile;
405 uint8_t x, y, level;
406} smooth_key;
407
408static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits)
410{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
412
413 if (SvIOK (*sv))
414 SvIV_set (*sv, SvIVX (*sv) | bits);
415 else
416 sv_setiv (*sv, bits);
417}
418
340static void 419static void
341music_finished (void) 420music_finished (void)
342{ 421{
343 SDL_UserEvent ev; 422 SDL_UserEvent ev;
344 423
378 n |= n >> 16; 457 n |= n >> 16;
379 458
380 return n + 1; 459 return n + 1;
381} 460}
382 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
383/* SDL should provide this, really. */ 473/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300 474#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314 475#define SDLK_MODIFIER_MAX 314
386 476
387MODULE = CFPlus PACKAGE = CFPlus 477/******************************************************************************/
478
479static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
480static GV *hover_gv;
481
482static int
483within_widget (SV *widget, NV x, NV y)
484{
485 HV *self;
486 SV **svp;
487 NV wx, ww, wy, wh;
488
489 if (!SvROK (widget))
490 return 0;
491
492 self = (HV *)SvRV (widget);
493
494 if (SvTYPE (self) != SVt_PVHV)
495 return 0;
496
497 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
498 if (y < wy)
499 return 0;
500
501 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
502 if (y >= wy + wh)
503 return 0;
504
505 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
506 if (x < wx)
507 return 0;
508
509 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
510 if (x >= wx + ww)
511 return 0;
512
513 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
514 if (!svp || !SvTRUE (*svp))
515 return 0;
516
517 return 1;
518}
519
520MODULE = Deliantra::Client PACKAGE = DC
388 521
389PROTOTYPES: ENABLE 522PROTOTYPES: ENABLE
390 523
391BOOT: 524BOOT:
392{ 525{
393 HV *stash = gv_stashpv ("CFPlus", 1); 526 HV *stash = gv_stashpv ("DC", 1);
394 static const struct { 527 static const struct {
395 const char *name; 528 const char *name;
396 IV iv; 529 IV iv;
397 } *civ, const_iv[] = { 530 } *civ, const_iv[] = {
398# define const_iv(name) { # name, (IV)name } 531# define const_iv(name) { # name, (IV)name }
420 553
421 const_iv (SDL_APPINPUTFOCUS), 554 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS), 555 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE), 556 const_iv (SDL_APPACTIVE),
424 557
558 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST),
425 const_iv (SDLK_KP0), 560 const_iv (SDLK_KP0),
426 const_iv (SDLK_KP1), 561 const_iv (SDLK_KP1),
427 const_iv (SDLK_KP2), 562 const_iv (SDLK_KP2),
428 const_iv (SDLK_KP3), 563 const_iv (SDLK_KP3),
429 const_iv (SDLK_KP4), 564 const_iv (SDLK_KP4),
501 const_iv (KMOD_LMETA), 636 const_iv (KMOD_LMETA),
502 const_iv (KMOD_RMETA), 637 const_iv (KMOD_RMETA),
503 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
504 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
505 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)
506# undef const_iv 670# undef const_iv
507 }; 671 };
508 672
509 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; )
510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
528 692
529NV floor (NV x) 693NV floor (NV x)
530 694
531NV ceil (NV x) 695NV ceil (NV x)
532 696
697IV minpot (UV n)
698
699IV popcount (UV n)
700
533void 701void
534pango_init () 702pango_init ()
535 CODE: 703 CODE:
536{ 704{
537 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
538 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);
539 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
540} 713}
541 714
542int 715char *SDL_GetError ()
543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
544 716
545void 717int SDL_Init (U32 flags)
718
719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
546SDL_Quit () 723void SDL_Quit ()
547 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
733
548void 734void
549SDL_ListModes () 735SDL_ListModes (int rgb, int alpha)
550 PPCODE: 736 PPCODE:
551{ 737{
552 SDL_Rect **m; 738 SDL_Rect **m;
553 739
554 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 740 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 741 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 742 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 743 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558 744
559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 745 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 746 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561 747
562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 748 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566 752
567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
572
573 SDL_EnableUNICODE (1);
574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
575 755
576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
577 757
578 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
579 while (*m) 759 while (*m)
580 { 760 {
581 AV *av = newAV (); 761 AV *av = newAV ();
582 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
583 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha));
584 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
585 767
586 ++m; 768 ++m;
587 } 769 }
588} 770}
589 771
590char *
591SDL_GetError ()
592
593int 772int
594SDL_SetVideoMode (int w, int h, int fullscreen) 773SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595 CODE: 774 CODE:
775{
776 SDL_EnableUNICODE (1);
777 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
778
779 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
780 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
781 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
782 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
783
596 RETVAL = !!SDL_SetVideoMode ( 784 RETVAL = !!SDL_SetVideoMode (
597 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 785 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
598 ); 786 );
787
599 if (RETVAL) 788 if (RETVAL)
600 { 789 {
601 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 790 av_clear (texture_av);
791
792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
602# 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);
603# include "glfunc.h" 794#include "glfunc.h"
604# undef GL_FUNC 795#undef GL_FUNC
605 } 796 }
797}
606 OUTPUT: 798 OUTPUT:
607 RETVAL 799 RETVAL
608 800
609void 801void
610SDL_GL_SwapBuffers () 802SDL_GL_SwapBuffers ()
611 803
612char * 804char *
613SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
614 806
807int
808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
812
615void 813void
616SDL_PollEvent () 814poll_events ()
617 PPCODE: 815 PPCODE:
618{ 816{
619 SDL_Event ev; 817 SDL_Event ev;
620 818
621 while (SDL_PollEvent (&ev)) 819 SDL_PumpEvents ();
820 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622 { 821 {
623 HV *hv = newHV (); 822 HV *hv = newHV ();
624 hv_store (hv, "type", 4, newSViv (ev.type), 0); 823 hv_store (hv, "type", 4, newSViv (ev.type), 0);
625 824
626 switch (ev.type) 825 switch (ev.type)
627 { 826 {
628 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
629 case SDL_KEYUP: 828 case SDL_KEYUP:
630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
632 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);
633 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 */
634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
635 break; 834 break;
636 835
637 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 838 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640 break; 839 break;
641 840
642 case SDL_MOUSEMOTION: 841 case SDL_MOUSEMOTION:
842 {
843 int state = ev.motion.state;
844 int x = ev.motion.x;
845 int y = ev.motion.y;
846 int xrel = ev.motion.xrel;
847 int yrel = ev.motion.yrel;
848
849 /* do simplistic event compression */
850 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
851 && state == ev.motion.state)
852 {
853 xrel += ev.motion.xrel;
854 yrel += ev.motion.yrel;
855 x = ev.motion.x;
856 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 }
859
643 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
644
645 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
646 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
647 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
648 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
866 }
650 break; 867 break;
651 868
652 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
653 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
654 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
655 872
656 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
657 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
658 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
659 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 881 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 882 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
666 break; 883 break;
667 } 884 }
668 885
669 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))));
670 } 887 }
671} 888}
672 889
673int 890int
674Mix_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)
675 POSTCALL: 892 POSTCALL:
676 Mix_HookMusicFinished (music_finished); 893 Mix_HookMusicFinished (music_finished);
677 Mix_ChannelFinished (channel_finished); 894 Mix_ChannelFinished (channel_finished);
678 895
679void 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
680Mix_CloseAudio () 913Mix_CloseAudio ()
681 914
682int 915int
683Mix_AllocateChannels (int numchans = -1) 916Mix_AllocateChannels (int numchans = -1)
684 917
918const char *
919Mix_GetError ()
920
685void 921void
686lowdelay (int fd, int val = 1) 922lowdelay (int fd, int val = 1)
687 CODE: 923 CODE:
688#ifndef _WIN32
689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 924 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690#endif
691 925
692void 926void
693win32_proxy_info () 927win32_proxy_info ()
694 PPCODE: 928 PPCODE:
695{ 929{
716 } 950 }
717 } 951 }
718#endif 952#endif
719} 953}
720 954
721void 955int
722add_font (char *file) 956add_font (char *file)
723 CODE: 957 CODE:
724 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
725 961
726void 962void
727load_image_inline (SV *image_) 963load_image_inline (SV *image_)
728 ALIAS: 964 ALIAS:
729 load_image_file = 1 965 load_image_file = 1
732 STRLEN image_len; 968 STRLEN image_len;
733 char *image = (char *)SvPVbyte (image_, image_len); 969 char *image = (char *)SvPVbyte (image_, image_len);
734 SDL_Surface *surface, *surface2; 970 SDL_Surface *surface, *surface2;
735 SDL_PixelFormat fmt; 971 SDL_PixelFormat fmt;
736 SDL_RWops *rw = ix 972 SDL_RWops *rw = ix
737 ? SDL_RWFromFile (image, "r") 973 ? SDL_RWFromFile (image, "rb")
738 : SDL_RWFromConstMem (image, image_len); 974 : SDL_RWFromConstMem (image, image_len);
739 975
740 if (!rw) 976 if (!rw)
741 croak ("load_image: %s", SDL_GetError ()); 977 croak ("load_image: %s", SDL_GetError ());
742 978
815void 1051void
816error (char *message) 1052error (char *message)
817 CODE: 1053 CODE:
818 fprintf (stderr, "ERROR: %s\n", message); 1054 fprintf (stderr, "ERROR: %s\n", message);
819#ifdef _WIN32 1055#ifdef _WIN32
820 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1056 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
821#endif 1057#endif
822 1058
823void 1059void
824fatal (char *message) 1060fatal (char *message)
825 CODE: 1061 CODE:
826 fprintf (stderr, "FATAL: %s\n", message); 1062 fprintf (stderr, "FATAL: %s\n", message);
827#ifdef _WIN32 1063#ifdef _WIN32
828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1064 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
829#endif 1065#endif
830 _exit (1); 1066 _exit (1);
831 1067
832void 1068void
833_exit (int retval = 0) 1069_exit (int retval = 0)
836 ExitThread (retval); // unclean, please beam me up 1072 ExitThread (retval); // unclean, please beam me up
837#else 1073#else
838 _exit (retval); 1074 _exit (retval);
839#endif 1075#endif
840 1076
841MODULE = CFPlus PACKAGE = CFPlus::Font 1077void
1078debug ()
1079 CODE:
1080{
1081#if DEBUG
1082 VALGRIND_DO_LEAK_CHECK;
1083#endif
1084}
842 1085
843CFPlus::Font 1086MODULE = Deliantra::Client PACKAGE = DC::Font
1087
1088PROTOTYPES: DISABLE
1089
1090DC::Font
844new_from_file (SV *class, char *path, int id = 0) 1091new_from_file (SV *class, char *path, int id = 0)
845 CODE: 1092 CODE:
846{ 1093{
847 int count; 1094 int count;
848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
851} 1098}
852 OUTPUT: 1099 OUTPUT:
853 RETVAL 1100 RETVAL
854 1101
855void 1102void
856DESTROY (CFPlus::Font self) 1103DESTROY (DC::Font self)
857 CODE: 1104 CODE:
858 pango_font_description_free (self); 1105 pango_font_description_free (self);
859 1106
860void 1107void
861make_default (CFPlus::Font self) 1108make_default (DC::Font self)
1109 PROTOTYPE: $
862 CODE: 1110 CODE:
863 default_font = self; 1111 default_font = self;
864 1112
865MODULE = CFPlus PACKAGE = CFPlus::Layout 1113MODULE = Deliantra::Client PACKAGE = DC::Layout
866 1114
1115PROTOTYPES: DISABLE
1116
867void 1117void
868reset_glyph_cache () 1118glyph_cache_backup ()
1119 PROTOTYPE:
869 CODE: 1120 CODE:
1121 tc_backup ();
1122
1123void
1124glyph_cache_restore ()
1125 PROTOTYPE:
1126 CODE:
870 tc_clear (); 1127 tc_restore ();
871 1128
872CFPlus::Layout 1129DC::Layout
873new (SV *class) 1130new (SV *class)
874 CODE: 1131 CODE:
875 New (0, RETVAL, 1, struct cf_layout); 1132 New (0, RETVAL, 1, struct cf_layout);
876 1133
877 RETVAL->pl = pango_layout_new (opengl_context); 1134 RETVAL->pl = pango_layout_new (opengl_context);
879 RETVAL->g = 1.; 1136 RETVAL->g = 1.;
880 RETVAL->b = 1.; 1137 RETVAL->b = 1.;
881 RETVAL->a = 1.; 1138 RETVAL->a = 1.;
882 RETVAL->base_height = MIN_FONT_HEIGHT; 1139 RETVAL->base_height = MIN_FONT_HEIGHT;
883 RETVAL->font = 0; 1140 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
884 1142
885 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
886 layout_update_font (RETVAL); 1144 layout_update_font (RETVAL);
887 OUTPUT: 1145 OUTPUT:
888 RETVAL 1146 RETVAL
889 1147
890void 1148void
891DESTROY (CFPlus::Layout self) 1149DESTROY (DC::Layout self)
892 CODE: 1150 CODE:
893 g_object_unref (self->pl); 1151 g_object_unref (self->pl);
1152 rc_free (self->rc);
894 Safefree (self); 1153 Safefree (self);
895 1154
896void 1155void
897set_text (CFPlus::Layout self, SV *text_) 1156set_text (DC::Layout self, SV *text_)
898 CODE: 1157 CODE:
899{ 1158{
900 STRLEN textlen; 1159 STRLEN textlen;
901 char *text = SvPVutf8 (text_, textlen); 1160 char *text = SvPVutf8 (text_, textlen);
902 1161
903 pango_layout_set_text (self->pl, text, textlen); 1162 pango_layout_set_text (self->pl, text, textlen);
904} 1163}
905 1164
906void 1165void
907set_markup (CFPlus::Layout self, SV *text_) 1166set_markup (DC::Layout self, SV *text_)
908 CODE: 1167 CODE:
909{ 1168{
910 STRLEN textlen; 1169 STRLEN textlen;
911 char *text = SvPVutf8 (text_, textlen); 1170 char *text = SvPVutf8 (text_, textlen);
912 1171
913 pango_layout_set_markup (self->pl, text, textlen); 1172 pango_layout_set_markup (self->pl, text, textlen);
914} 1173}
915 1174
916void 1175void
917set_shapes (CFPlus::Layout self, ...) 1176set_shapes (DC::Layout self, ...)
918 CODE: 1177 CODE:
919{ 1178{
920 PangoAttrList *attrs = 0; 1179 PangoAttrList *attrs = 0;
921 const char *text = pango_layout_get_text (self->pl); 1180 const char *text = pango_layout_get_text (self->pl);
922 const char *pos = text; 1181 const char *pos = text;
957 if (attrs) 1216 if (attrs)
958 pango_layout_set_attributes (self->pl, attrs); 1217 pango_layout_set_attributes (self->pl, attrs);
959} 1218}
960 1219
961void 1220void
962get_shapes (CFPlus::Layout self) 1221get_shapes (DC::Layout self)
963 PPCODE: 1222 PPCODE:
964{ 1223{
965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1224 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
966 1225
967 do 1226 do
968 { 1227 {
969 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1228 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
970 1229
971 if (run && shape_attr_p (run)) 1230 if (run && shape_attr_p (run))
972 { 1231 {
973 PangoRectangle extents; 1232 PangoRectangle extents;
974 pango_layout_iter_get_run_extents (iter, 0, &extents); 1233 pango_layout_iter_get_run_extents (iter, 0, &extents);
982 1241
983 pango_layout_iter_free (iter); 1242 pango_layout_iter_free (iter);
984} 1243}
985 1244
986int 1245int
987has_wrapped (CFPlus::Layout self) 1246has_wrapped (DC::Layout self)
988 CODE: 1247 CODE:
989{ 1248{
990 int lines = 1; 1249 int lines = 1;
991 const char *text = pango_layout_get_text (self->pl); 1250 const char *text = pango_layout_get_text (self->pl);
992 1251
997} 1256}
998 OUTPUT: 1257 OUTPUT:
999 RETVAL 1258 RETVAL
1000 1259
1001SV * 1260SV *
1002get_text (CFPlus::Layout self) 1261get_text (DC::Layout self)
1003 CODE: 1262 CODE:
1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1263 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1005 sv_utf8_decode (RETVAL); 1264 sv_utf8_decode (RETVAL);
1006 OUTPUT: 1265 OUTPUT:
1007 RETVAL 1266 RETVAL
1008 1267
1009void 1268void
1010set_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.)
1011 CODE: 1270 CODE:
1012 self->r = r; 1271 self->r = r;
1013 self->g = g; 1272 self->g = g;
1014 self->b = b; 1273 self->b = b;
1015 self->a = a; 1274 self->a = a;
1016 1275
1017void 1276void
1018set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1277set_font (DC::Layout self, DC::Font font = 0)
1019 CODE: 1278 CODE:
1020 if (self->font != font) 1279 if (self->font != font)
1021 { 1280 {
1022 self->font = font; 1281 self->font = font;
1023 layout_update_font (self); 1282 layout_update_font (self);
1024 } 1283 }
1025 1284
1026void 1285void
1027set_height (CFPlus::Layout self, int base_height) 1286set_height (DC::Layout self, int base_height)
1028 CODE: 1287 CODE:
1029 if (self->base_height != base_height) 1288 if (self->base_height != base_height)
1030 { 1289 {
1031 self->base_height = base_height; 1290 self->base_height = base_height;
1032 layout_update_font (self); 1291 layout_update_font (self);
1033 } 1292 }
1034 1293
1035void 1294void
1036set_width (CFPlus::Layout self, int max_width = -1) 1295set_width (DC::Layout self, int max_width = -1)
1037 CODE: 1296 CODE:
1038 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);
1039 1298
1040void 1299void
1041set_indent (CFPlus::Layout self, int indent) 1300set_indent (DC::Layout self, int indent)
1042 CODE: 1301 CODE:
1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1302 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1044 1303
1045void 1304void
1046set_spacing (CFPlus::Layout self, int spacing) 1305set_spacing (DC::Layout self, int spacing)
1047 CODE: 1306 CODE:
1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1307 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1049 1308
1050void 1309void
1051set_ellipsise (CFPlus::Layout self, int ellipsise) 1310set_ellipsise (DC::Layout self, int ellipsise)
1052 CODE: 1311 CODE:
1053 pango_layout_set_ellipsize (self->pl, 1312 pango_layout_set_ellipsize (self->pl,
1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1313 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1314 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1315 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1057 : PANGO_ELLIPSIZE_NONE 1316 : PANGO_ELLIPSIZE_NONE
1058 ); 1317 );
1059 1318
1060void 1319void
1061set_single_paragraph_mode (CFPlus::Layout self, int spm) 1320set_single_paragraph_mode (DC::Layout self, int spm)
1062 CODE: 1321 CODE:
1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1322 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1064 1323
1065void 1324void
1066size (CFPlus::Layout self) 1325size (DC::Layout self)
1067 PPCODE: 1326 PPCODE:
1068{ 1327{
1069 int w, h; 1328 int w, h;
1070 1329
1071 layout_get_pixel_size (self, &w, &h); 1330 layout_get_pixel_size (self, &w, &h);
1074 PUSHs (sv_2mortal (newSViv (w))); 1333 PUSHs (sv_2mortal (newSViv (w)));
1075 PUSHs (sv_2mortal (newSViv (h))); 1334 PUSHs (sv_2mortal (newSViv (h)));
1076} 1335}
1077 1336
1078int 1337int
1079descent (CFPlus::Layout self) 1338descent (DC::Layout self)
1080 CODE: 1339 CODE:
1081{ 1340{
1082 PangoRectangle rect; 1341 PangoRectangle rect;
1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1342 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1084 pango_layout_line_get_pixel_extents (line, 0, &rect); 1343 pango_layout_line_get_pixel_extents (line, 0, &rect);
1085 RETVAL = PANGO_DESCENT (rect); 1344 RETVAL = PANGO_DESCENT (rect);
1086} 1345}
1087 OUTPUT: 1346 OUTPUT:
1088 RETVAL 1347 RETVAL
1089 1348
1090int 1349int
1091xy_to_index (CFPlus::Layout self, int x, int y) 1350xy_to_index (DC::Layout self, int x, int y)
1092 CODE: 1351 CODE:
1093{ 1352{
1094 int index, trailing; 1353 int index, trailing;
1095 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);
1096 RETVAL = index + trailing; 1355 RETVAL = index + trailing;
1097} 1356}
1098 OUTPUT: 1357 OUTPUT:
1099 RETVAL 1358 RETVAL
1100 1359
1101void 1360void
1102cursor_pos (CFPlus::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1103 PPCODE: 1362 PPCODE:
1104{ 1363{
1105 PangoRectangle strong_pos; 1364 PangoRectangle pos;
1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1107 1366
1108 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1109 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1112} 1371}
1113 1372
1114void 1373void
1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1374index_to_line_x (DC::Layout self, int index, int trailing = 0)
1116 PPCODE: 1375 PPCODE:
1117{ 1376{
1118 int line, x; 1377 int line, x;
1119 1378
1120 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)
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1122 1382 --line;
1383#endif
1123 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1124 PUSHs (sv_2mortal (newSViv (line - 1))); 1385 PUSHs (sv_2mortal (newSViv (line)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126} 1387}
1127 1388
1128void 1389void
1129line_x_to_index (CFPlus::Layout self, int line, int x) 1390line_x_to_index (DC::Layout self, int line, int x)
1130 PPCODE: 1391 PPCODE:
1131{ 1392{
1132 PangoLayoutLine *lp; 1393 PangoLayoutLine *lp;
1133 int index, trailing; 1394 int index, trailing;
1134 1395
1135 if (line < 0) 1396 if (line < 0)
1136 XSRETURN_EMPTY; 1397 XSRETURN_EMPTY;
1137 1398
1138 if (!(lp = pango_layout_get_line (self->pl, line))) 1399 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */ 1400 XSRETURN_EMPTY; /* do better */
1140 1401
1141 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);
1142 1403
1143 EXTEND (SP, 2); 1404 EXTEND (SP, 2);
1149 PUSHs (sv_2mortal (newSViv (trailing))); 1410 PUSHs (sv_2mortal (newSViv (trailing)));
1150 } 1411 }
1151} 1412}
1152 1413
1153void 1414void
1154render (CFPlus::Layout self, float x, float y, int flags = 0) 1415render (DC::Layout self, float x, float y, int flags = 0)
1155 PPCODE: 1416 CODE:
1417 rc_clear (self->rc);
1156 pango_opengl_render_layout_subpixel ( 1418 pango_opengl_render_layout_subpixel (
1157 self->pl, 1419 self->pl,
1420 self->rc,
1158 x * PANGO_SCALE, y * PANGO_SCALE, 1421 x * PANGO_SCALE, y * PANGO_SCALE,
1159 self->r, self->g, self->b, self->a, 1422 self->r, self->g, self->b, self->a,
1160 flags 1423 flags
1161 ); 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);
1162 1428
1163MODULE = CFPlus PACKAGE = CFPlus::Texture
1164
1165void 1429void
1166pad2pot (SV *data_, SV *w_, SV *h_) 1430draw (DC::Layout self)
1167 CODE: 1431 CODE:
1168{ 1432{
1169 int ow = SvIV (w_); 1433 glEnable (GL_TEXTURE_2D);
1170 int oh = SvIV (h_); 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);
1171 1440
1172 if (ow && oh) 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
1449
1450PROTOTYPES: ENABLE
1451
1452void
1453pad (SV *data_, int ow, int oh, int nw, int nh)
1454 CODE:
1455{
1456 if ((nw != ow || nh != oh) && SvOK (data_))
1173 { 1457 {
1174 int nw = minpot (ow);
1175 int nh = minpot (oh);
1176
1177 if (nw != ow || nh != oh)
1178 {
1179 if (SvOK (data_))
1180 {
1181 STRLEN datalen; 1458 STRLEN datalen;
1182 char *data = SvPVbyte (data_, datalen); 1459 char *data = SvPVbyte (data_, datalen);
1183 int bpp = datalen / (ow * oh); 1460 int bpp = datalen / (ow * oh);
1184 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1461 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1185 1462
1186 SvPOK_only (result_); 1463 SvPOK_only (result_);
1187 SvCUR_set (result_, nw * nh * bpp); 1464 SvCUR_set (result_, nw * nh * bpp);
1188 1465
1189 memset (SvPVX (result_), 0, nw * nh * bpp); 1466 memset (SvPVX (result_), 0, nw * nh * bpp);
1190 while (oh--) 1467 while (oh--)
1191 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1468 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192 1469
1193 sv_setsv (data_, result_); 1470 sv_setsv (data_, result_);
1194 }
1195
1196 sv_setiv (w_, nw);
1197 sv_setiv (h_, nh);
1198 }
1199 } 1471 }
1200} 1472}
1201 1473
1202void 1474void
1203draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1475draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1209{ 1481{
1210 HV *hv = (HV *)SvRV (self); 1482 HV *hv = (HV *)SvRV (self);
1211 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1483 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1212 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1484 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1213 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1485 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1486
1487 if (name <= 0)
1488 XSRETURN_EMPTY;
1214 1489
1215 if (items < 5) 1490 if (items < 5)
1216 { 1491 {
1217 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1492 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1218 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1493 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1246 glDisable (GL_ALPHA_TEST); 1521 glDisable (GL_ALPHA_TEST);
1247 glDisable (GL_BLEND); 1522 glDisable (GL_BLEND);
1248 } 1523 }
1249} 1524}
1250 1525
1251MODULE = CFPlus PACKAGE = CFPlus::Map 1526IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1527 CODE:
1528{
1529 GLint width;
1530 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1531 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1532 RETVAL = width > 0;
1533}
1534 OUTPUT:
1535 RETVAL
1252 1536
1253CFPlus::Map 1537MODULE = Deliantra::Client PACKAGE = DC::Map
1538
1539PROTOTYPES: DISABLE
1540
1541DC::Map
1254new (SV *class) 1542new (SV *class)
1255 CODE: 1543 CODE:
1256 New (0, RETVAL, 1, struct map); 1544 New (0, RETVAL, 1, struct map);
1257 RETVAL->x = 0; 1545 RETVAL->x = 0;
1258 RETVAL->y = 0; 1546 RETVAL->y = 0;
1266 RETVAL->row = 0; 1554 RETVAL->row = 0;
1267 OUTPUT: 1555 OUTPUT:
1268 RETVAL 1556 RETVAL
1269 1557
1270void 1558void
1271DESTROY (CFPlus::Map self) 1559DESTROY (DC::Map self)
1272 CODE: 1560 CODE:
1273{ 1561{
1274 map_clear (self); 1562 map_clear (self);
1275 Safefree (self->face2tile); 1563 Safefree (self->face2tile);
1276 Safefree (self->tex); 1564 Safefree (self->tex);
1277 Safefree (self); 1565 Safefree (self);
1278} 1566}
1279 1567
1280void 1568void
1281resize (CFPlus::Map self, int map_width, int map_height) 1569resize (DC::Map self, int map_width, int map_height)
1282 CODE: 1570 CODE:
1283 self->w = map_width; 1571 self->w = map_width;
1284 self->h = map_height; 1572 self->h = map_height;
1285 1573
1286void 1574void
1287clear (CFPlus::Map self) 1575clear (DC::Map self)
1288 CODE: 1576 CODE:
1289 map_clear (self); 1577 map_clear (self);
1290 1578
1291void 1579void
1292set_tileid (CFPlus::Map self, int face, int tile) 1580set_tileid (DC::Map self, int face, int tile)
1293 CODE: 1581 CODE:
1294{ 1582{
1295 need_facenum (self, face); self->face2tile [face] = tile; 1583 need_facenum (self, face); self->face2tile [face] = tile;
1296 need_texid (self, tile); 1584 need_texid (self, tile);
1297} 1585}
1298 1586
1299void 1587void
1588set_smooth (DC::Map self, int face, int smooth, int level)
1589 CODE:
1590{
1591 tileid texid;
1592 maptex *tex;
1593
1594 if (face < 0 || face >= self->faces)
1595 return;
1596
1597 if (smooth < 0 || smooth >= self->faces)
1598 return;
1599
1600 texid = self->face2tile [face];
1601
1602 if (!texid)
1603 return;
1604
1605 tex = self->tex + texid;
1606 tex->smoothtile = self->face2tile [smooth];
1607 tex->smoothlevel = level;
1608}
1609
1610void
1300set_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)
1301 CODE: 1612 CODE:
1302{ 1613{
1303 need_texid (self, texid); 1614 need_texid (self, texid);
1304 1615
1305 { 1616 {
1325 // from transparent color bleeding and ugly wrapping effects. 1636 // from transparent color bleeding and ugly wrapping effects.
1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1327} 1638}
1328 1639
1329int 1640int
1330ox (CFPlus::Map self) 1641ox (DC::Map self)
1331 ALIAS: 1642 ALIAS:
1332 oy = 1 1643 oy = 1
1333 x = 2 1644 x = 2
1334 y = 3 1645 y = 3
1335 w = 4 1646 w = 4
1346 } 1657 }
1347 OUTPUT: 1658 OUTPUT:
1348 RETVAL 1659 RETVAL
1349 1660
1350void 1661void
1351scroll (CFPlus::Map self, int dx, int dy) 1662scroll (DC::Map self, int dx, int dy)
1352 CODE: 1663 CODE:
1353{ 1664{
1354 if (dx > 0) 1665 if (dx > 0)
1355 map_blank (self, self->x, self->y, dx, self->h); 1666 map_blank (self, self->x, self->y, dx, self->h);
1356 else if (dx < 0) 1667 else if (dx < 0)
1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1668 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358 1669
1359 if (dy > 0) 1670 if (dy > 0)
1360 map_blank (self, self->x, self->y, self->w, dy); 1671 map_blank (self, self->x, self->y, self->w, dy);
1361 else if (dy < 0) 1672 else if (dy < 0)
1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1673 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363 1674
1364 self->ox += dx; self->x += dx; 1675 self->ox += dx; self->x += dx;
1365 self->oy += dy; self->y += dy; 1676 self->oy += dy; self->y += dy;
1366 1677
1367 while (self->y < 0) 1678 while (self->y < 0)
1371 self->rows += MAP_EXTEND_Y; 1682 self->rows += MAP_EXTEND_Y;
1372 self->y += MAP_EXTEND_Y; 1683 self->y += MAP_EXTEND_Y;
1373 } 1684 }
1374} 1685}
1375 1686
1376void 1687SV *
1377map1a_update (CFPlus::Map self, SV *data_, int extmap) 1688map1a_update (DC::Map self, SV *data_, int extmap)
1378 CODE: 1689 CODE:
1379{ 1690{
1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1381 uint8_t *data_end = (uint8_t *)SvEND (data_); 1692 uint8_t *data_end = (uint8_t *)SvEND (data_);
1382 mapcell *cell; 1693 mapcell *cell;
1383 int x, y, flags; 1694 int x, y, z, flags;
1695 AV *missing = newAV ();
1696 RETVAL = newRV_noinc ((SV *)missing);
1384 1697
1385 while (data < data_end - 1) 1698 while (data < data_end - 1)
1386 { 1699 {
1387 flags = (data [0] << 8) + data [1]; data += 2; 1700 flags = (data [0] << 8) + data [1]; data += 2;
1388 1701
1408 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1409 1722
1410 do 1723 do
1411 { 1724 {
1412 ext = *data++; 1725 ext = *data++;
1413 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1414 1727
1415 if (cmd < 4) 1728 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1418 { 1731 {
1421 } 1734 }
1422 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1425 { 1738 {
1426 if (*data == 8) 1739 if (*data == 1) cell->player = data [1];
1427 ; // decode player uuid 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);
1428 1743
1429 data += *data + 1; 1744 data += *data + 1;
1430 } 1745 }
1431 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1432 cell->flags = *data++; 1747 cell->flags = *data++;
1439 } 1754 }
1440 else 1755 else
1441 cell->darkness = *data++ + 1; 1756 cell->darkness = *data++ + 1;
1442 } 1757 }
1443 1758
1759 for (z = 0; z <= 2; ++z)
1444 if (flags & 4) 1760 if (flags & (4 >> z))
1445 { 1761 {
1446 faceid face = (data [0] << 8) + data [1]; data += 2; 1762 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face); 1763 need_facenum (self, face);
1448 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 }
1449 } 1779 }
1450
1451 if (flags & 2)
1452 {
1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
1456 }
1457
1458 if (flags & 1)
1459 {
1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
1463 }
1464 } 1780 }
1465 else 1781 else
1466 cell->darkness = 0; 1782 cell->darkness = 0;
1467 } 1783 }
1468} 1784}
1785 OUTPUT:
1786 RETVAL
1469 1787
1470SV * 1788SV *
1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1789mapmap (DC::Map self, int x0, int y0, int w, int h)
1472 CODE: 1790 CODE:
1473{ 1791{
1474 int x1, x; 1792 int x1, x;
1475 int y1, y; 1793 int y1, y;
1476 int z; 1794 int z;
1521} 1839}
1522 OUTPUT: 1840 OUTPUT:
1523 RETVAL 1841 RETVAL
1524 1842
1525void 1843void
1526draw (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)
1527 CODE: 1845 CODE:
1528{ 1846{
1529 int x, y, z; 1847 int x, y, z;
1530 int last_name;
1531 1848
1532 glColor4ub (255, 255, 255, 255); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1852 smooth_key skey;
1853 int pl_x, pl_y;
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;
1860
1861 // thats current max. sorry.
1862 if (sw > 255) sw = 255;
1863 if (sh > 255) sh = 255;
1864
1865 // clear key, in case of extra padding
1866 memset (&skey, 0, sizeof (skey));
1867
1868 memset (&key, 0, sizeof (key));
1869 key.r = 255;
1870 key.g = 255;
1871 key.b = 255;
1872 key.a = 255;
1873 key.mode = GL_QUADS;
1874 key.format = GL_T2F_V3F;
1875 key.texname = -1;
1876
1877 mx += self->x;
1878 my += self->y;
1879
1880 // first pass: determine smooth_max
1881 // rather ugly, if you ask me
1882 // could also be stored inside mapcell and updated on change
1883 memset (smooth_max, 0, sizeof (smooth_max));
1884
1885 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows)
1887 {
1888 maprow *row = self->row + (y + my);
1889
1890 for (x = 0; x < sw; x++)
1891 if (row->c0 <= x + mx && x + mx < row->c1)
1892 {
1893 mapcell *cell = row->col + (x + mx - row->c0);
1894
1895 smooth_max[x + 1][y + 1] =
1896 MAX (self->tex [cell->tile [0]].smoothlevel,
1897 MAX (self->tex [cell->tile [1]].smoothlevel,
1898 self->tex [cell->tile [2]].smoothlevel));
1899 }
1900 }
1533 1901
1534 glEnable (GL_BLEND); 1902 glEnable (GL_BLEND);
1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1536 glEnable (GL_TEXTURE_2D);
1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1538 1905
1539 glBegin (GL_QUADS);
1540
1541 last_name = 0;
1542
1543 mx += self->x;
1544 my += self->y;
1545
1546 for (z = 0; z < 3; z++) 1906 for (z = 0; z <= 2; z++)
1907 {
1908 memset (smooth_level, 0, sizeof (smooth_level));
1909
1547 for (y = 0; y < sh; y++) 1910 for (y = 0; y < sh; y++)
1548 if (0 <= y + my && y + my < self->rows) 1911 if (0 <= y + my && y + my < self->rows)
1549 { 1912 {
1550 maprow *row = self->row + (y + my); 1913 maprow *row = self->row + (y + my);
1551 1914
1552 for (x = 0; x < sw; x++) 1915 for (x = 0; x < sw; x++)
1553 if (row->c0 <= x + mx && x + mx < row->c1) 1916 if (row->c0 <= x + mx && x + mx < row->c1)
1554 { 1917 {
1555 mapcell *cell = row->col + (x + mx - row->c0); 1918 mapcell *cell = row->col + (x + mx - row->c0);
1556 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1920
1921 if (tile)
1922 {
1923 maptex tex = self->tex [tile];
1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1926
1927 if (key.texname != tex.name)
1928 {
1929 if (!tex.name)
1930 tex = self->tex [2]; /* missing, replace by noface */
1931
1932 key.texname = tex.name;
1933 arr = rc_array (rc, &key);
1934 }
1935
1936 if (expect_false (cell->player == player) && expect_false (z == 2))
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
1952 if (cell->flags & 1)
1953 {
1954 maptex tex = self->tex [1];
1955 int px = x * T + T * 2 / 32;
1956 int py = y * T - T * 6 / 32;
1957
1958 if (tex.name)
1959 {
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);
1970 }
1971 }
1972 }
1973
1974 // update smooth hash
1975 if (tex.smoothtile)
1976 {
1977 skey.tile = tex.smoothtile;
1978 skey.level = tex.smoothlevel;
1979
1980 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1981
1982 // add bits to current tile and all neighbours. skey.x|y is
1983 // shifted +1|+1 so we always stay positive.
1984
1985 // bits is ___n cccc CCCC bbbb
1986 // n do not draw borders&corners
1987 // c draw these corners, but...
1988 // C ... not these
1989 // b draw these borders
1990
1991 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1992 // ┃· ·· ·┃ ━━
1993
1994 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1995 // ·· ·· ·┏ ┓·
1996
1997 // full tile
1998 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1999
2000 // borders
2001 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2002 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2003 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2004 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2005
2006 // corners
2007 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2008 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2009 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2010 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2011 }
2012 }
1557 2013 }
2014 }
2015
2016 rc_draw (rc);
2017 rc_clear (rc);
2018
2019 // go through all smoothlevels, lowest to highest, then draw.
2020 // this is basically counting sort
2021 {
2022 int w, b;
2023
2024 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS);
2026 for (w = 0; w < 256 / 32; ++w)
2027 {
2028 uint32_t smask = smooth_level [w];
1558 if (tile) 2029 if (smask)
2030 for (b = 0; b < 32; ++b)
2031 if (smask & (((uint32_t)1) << b))
1559 { 2032 {
1560 maptex tex = self->tex [tile]; 2033 int level = (w << 5) | b;
1561 int px = (x + 1) * T - tex.w; 2034 HE *he;
1562 int py = (y + 1) * T - tex.h;
1563 2035
1564 if (last_name != tex.name) 2036 hv_iterinit (smooth);
2037 while ((he = hv_iternext (smooth)))
1565 { 2038 {
2039 smooth_key *skey = (smooth_key *)HeKEY (he);
2040 IV bits = SvIVX (HeVAL (he));
2041
1566 if (!tex.name) 2042 if (!(bits & 0x1000)
1567 tex = self->tex [2]; /* missing, replace by noface */ 2043 && skey->level == level
1568 2044 && level > smooth_max [skey->x][skey->y])
1569 glEnd ();
1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1571 glBegin (GL_QUADS);
1572 }
1573
1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 { 2045 {
1583 maptex tex = self->tex [1]; 2046 maptex tex = self->tex [skey->tile];
1584 int px = x * T + T * 2 / 32; 2047 int px = (((int)skey->x) - 1) * T;
1585 int py = y * T - T * 6 / 32; 2048 int py = (((int)skey->y) - 1) * T;
2049 int border = bits & 15;
2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2051 float dx = tex.s * .0625f; // 16 images/row
2052 float dy = tex.t * .5f ; // 2 images/column
1586 2053
2054 if (tex.name)
2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
2058 if (key.texname != tex.name)
2059 {
1587 glEnd (); 2060 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1589 glBegin (GL_QUADS); 2062 glBegin (GL_QUADS);
2063 }
1590 2064
2065 if (border)
2066 {
2067 float ox = border * dx;
2068
2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2073 }
2074
2075 if (corner)
2076 {
2077 float ox = corner * dx;
2078
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2079 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T); 2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T); 2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py ); 2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2083 }
2084 }
1595 } 2085 }
1596 } 2086 }
1597 } 2087 }
1598 }
1599 } 2088 }
1600 2089
1601 glEnd (); 2090 glEnd ();
1602
1603 glDisable (GL_TEXTURE_2D); 2091 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1;
2093 }
2094
2095 hv_clear (smooth);
2096 }
2097
2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
2103
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
1604 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2116 rc_free (rc);
1605 2117
1606 // top layer: overlays such as the health bar 2118 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++) 2119 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows) 2120 if (0 <= y + my && y + my < self->rows)
1609 { 2121 {
1634 } 2146 }
1635 } 2147 }
1636} 2148}
1637 2149
1638void 2150void
1639draw_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)
1640 CODE: 2152 CODE:
1641{ 2153{
1642 static float color[16][3] = { 2154 static float color[16][3] = {
1643 { 0.00F, 0.00F, 0.00F }, 2155 { 0.00F, 0.00F, 0.00F },
1644 { 1.00F, 1.00F, 1.00F }, 2156 { 1.00F, 1.00F, 1.00F },
1694 glDisable (GL_BLEND); 2206 glDisable (GL_BLEND);
1695 glDisable (GL_TEXTURE_2D); 2207 glDisable (GL_TEXTURE_2D);
1696} 2208}
1697 2209
1698void 2210void
1699fow_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)
1700 PPCODE: 2212 PPCODE:
1701{ 2213{
1702 int x, y; 2214 int x, y;
2215 int sw1 = sw + 2;
2216 int sh1 = sh + 2;
2217 int sh3 = sh * 3;
1703 int sw4 = (sw + 3) & ~3; 2218 int sw34 = (sw * 3 + 3) & ~3;
2219 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2220 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2221 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1706 2222
1707 memset (darkness, 255, sw4 * sh);
1708 SvPOK_only (darkness_sv); 2223 SvPOK_only (darkness3_sv);
1709 SvCUR_set (darkness_sv, sw4 * sh); 2224 SvCUR_set (darkness3_sv, sw34 * sh3);
1710 2225
1711 mx += self->x; 2226 mx += self->x - 1;
1712 my += self->y; 2227 my += self->y - 1;
1713 2228
2229 memset (darkness1, 255, sw1 * sh1);
2230
1714 for (y = 0; y < sh; y++) 2231 for (y = 0; y < sh1; y++)
1715 if (0 <= y + my && y + my < self->rows) 2232 if (0 <= y + my && y + my < self->rows)
1716 { 2233 {
1717 maprow *row = self->row + (y + my); 2234 maprow *row = self->row + (y + my);
1718 2235
1719 for (x = 0; x < sw; x++) 2236 for (x = 0; x < sw1; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1) 2237 if (row->c0 <= x + mx && x + mx < row->c1)
1721 { 2238 {
1722 mapcell *cell = row->col + (x + mx - row->c0); 2239 mapcell *cell = row->col + (x + mx - row->c0);
1723 2240
1724 darkness[y * sw4 + x] = cell->darkness 2241 darkness1 [y * sw1 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1) 2242 ? 255 - (cell->darkness - 1)
1726 : 255 - FOW_DARKNESS; 2243 : 255 - FOW_DARKNESS;
1727 } 2244 }
1728 } 2245 }
1729 2246
2247 for (y = 0; y < sh; ++y)
2248 for (x = 0; x < sw; ++x)
2249 {
2250 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2251 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2252 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2253 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2254 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2255 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2256 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2257 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2258 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2259
2260 uint8_t r11 = (d11 + d21 + d12) / 3;
2261 uint8_t r21 = d21;
2262 uint8_t r31 = (d21 + d31 + d32) / 3;
2263
2264 uint8_t r12 = d12;
2265 uint8_t r22 = d22;
2266 uint8_t r32 = d32;
2267
2268 uint8_t r13 = (d13 + d23 + d12) / 3;
2269 uint8_t r23 = d23;
2270 uint8_t r33 = (d23 + d33 + d32) / 3;
2271
2272 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2273 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2274 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2275 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2276 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2277 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2278 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2279 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2280 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2281 }
2282
2283 free (darkness1);
2284
1730 EXTEND (SP, 3); 2285 EXTEND (SP, 3);
1731 PUSHs (sv_2mortal (newSViv (sw4))); 2286 PUSHs (sv_2mortal (newSViv (sw34)));
1732 PUSHs (sv_2mortal (newSViv (sh))); 2287 PUSHs (sv_2mortal (newSViv (sh3)));
1733 PUSHs (darkness_sv); 2288 PUSHs (darkness3_sv);
1734} 2289}
1735 2290
1736SV * 2291SV *
1737get_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)
1738 CODE: 2293 CODE:
1739{ 2294{
1740 int x, y, x1, y1; 2295 int x, y, x1, y1;
1741 SV *data_sv = newSV (w * h * 7 + 5); 2296 SV *data_sv = newSV (w * h * 7 + 5);
1742 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2297 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1799 else 2354 else
1800 *data++ = 0; 2355 *data++ = 0;
1801 } 2356 }
1802 } 2357 }
1803 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 {
1804 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
1805 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
1806 RETVAL = data_sv; 2366 RETVAL = data_sv;
1807} 2367}
1808 OUTPUT: 2368 OUTPUT:
1809 RETVAL 2369 RETVAL
1810 2370
1811void 2371void
1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1813 PPCODE: 2373 PPCODE:
1814{ 2374{
1815 int x, y, z; 2375 int x, y, z;
1816 int w, h; 2376 int w, h;
1817 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;
1818 2388
1819 if (*data++ != 0) 2389 if (*data++ != 0)
1820 return; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
1821 2391
1822 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
1823 h = *data++ << 8; h |= *data++; 2393 h = *data++ << 8; h |= *data++;
1824 2394
1825 // 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
1837 { 2407 {
1838 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
1839 2409
1840 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
1841 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
1842 uint8_t flags = *data++; 2417 flags = *data++;
1843 2418
1844 if (flags) 2419 if (flags)
1845 { 2420 {
1846 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1852 2427
1853 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
1854 { 2429 {
1855 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
1856 2432
1857 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
1858 { 2434 {
1859 tileid t = tile [z]; 2435 tileid t = tile [z];
1860 2436
1861 if (t >= self->texs || !self->tex [t].name) 2437 if (t >= self->texs || (t && !self->tex [t].name))
1862 { 2438 {
1863 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t); 2440 need_texid (self, t);
1865 } 2441 }
1866 2442
1867 cell->tile [z] = t; 2443 cell->tile [z] = t;
1868 } 2444 }
1870 } 2446 }
1871 } 2447 }
1872 } 2448 }
1873} 2449}
1874 2450
1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2451MODULE = Deliantra::Client PACKAGE = DC::RW
1876 2452
1877CFPlus::MixChunk 2453DC::RW
1878new_from_file (SV *class, char *path) 2454new (SV *class, SV *data_sv)
1879 CODE: 2455 CODE:
1880 RETVAL = Mix_LoadWAV (path); 2456{
2457 STRLEN datalen;
2458 char *data = SvPVbyte (data_sv, datalen);
2459
2460 RETVAL = SDL_RWFromConstMem (data, datalen);
2461}
1881 OUTPUT: 2462 OUTPUT:
1882 RETVAL 2463 RETVAL
1883 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 : '('
1884void 2474#void
2475#close (DC::RW self)
2476# CODE:
2477# (self->(close)) (self);
2478
2479MODULE = Deliantra::Client PACKAGE = DC::Channel
2480
2481PROTOTYPES: DISABLE
2482
2483DC::Channel
2484find ()
2485 CODE:
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}
2502 OUTPUT:
2503 RETVAL
2504
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
1885DESTROY (CFPlus::MixChunk self) 2574DESTROY (DC::MixChunk self)
1886 CODE: 2575 CODE:
1887 Mix_FreeChunk (self); 2576 Mix_FreeChunk (self);
1888 2577
1889int 2578int
1890volume (CFPlus::MixChunk self, int volume = -1) 2579volume (DC::MixChunk self, int volume = -1)
1891 CODE: 2580 CODE:
2581 if (items > 1)
2582 volume = CLAMP (volume, 0, 128);
1892 RETVAL = Mix_VolumeChunk (self, volume); 2583 RETVAL = Mix_VolumeChunk (self, volume);
1893 OUTPUT: 2584 OUTPUT:
1894 RETVAL 2585 RETVAL
1895 2586
1896int 2587DC::Channel
1897play (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)
1898 CODE: 2589 CODE:
2590{
1899 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}
1900 OUTPUT: 2602 OUTPUT:
1901 RETVAL 2603 RETVAL
1902 2604
1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1904 2606
1905int 2607int
1906volume (int volume = -1) 2608volume (int volume = -1)
2609 PROTOTYPE: ;$
1907 CODE: 2610 CODE:
2611 if (items > 0)
2612 volume = CLAMP (volume, 0, 128);
1908 RETVAL = Mix_VolumeMusic (volume); 2613 RETVAL = Mix_VolumeMusic (volume);
1909 OUTPUT: 2614 OUTPUT:
1910 RETVAL 2615 RETVAL
1911 2616
2617void
2618fade_out (int ms)
2619 CODE:
2620 Mix_FadeOutMusic (ms);
2621
2622void
2623halt ()
2624 CODE:
2625 Mix_HaltMusic ();
2626
1912CFPlus::MixMusic 2627DC::MixMusic
1913new_from_file (SV *class, char *path) 2628new (SV *class, DC::RW rwops)
1914 CODE: 2629 CODE:
1915 RETVAL = Mix_LoadMUS (path); 2630 RETVAL = Mix_LoadMUS_RW (rwops);
1916 OUTPUT: 2631 OUTPUT:
1917 RETVAL 2632 RETVAL
1918 2633
1919void 2634void
1920DESTROY (CFPlus::MixMusic self) 2635DESTROY (DC::MixMusic self)
1921 CODE: 2636 CODE:
1922 Mix_FreeMusic (self); 2637 Mix_FreeMusic (self);
1923 2638
1924int 2639int
1925play (CFPlus::MixMusic self, int loops = -1) 2640play (DC::MixMusic self, int loops = -1)
1926 CODE: 2641 CODE:
1927 RETVAL = Mix_PlayMusic (self, loops); 2642 RETVAL = Mix_PlayMusic (self, loops);
1928 OUTPUT: 2643 OUTPUT:
1929 RETVAL 2644 RETVAL
1930 2645
1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2646void
2647fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2648 CODE:
2649 Mix_FadeInMusicPos (self, loops, ms, position);
2650
2651MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2652
2653PROTOTYPES: ENABLE
1932 2654
1933BOOT: 2655BOOT:
1934{ 2656{
1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2657 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1936 static const struct { 2658 static const struct {
1937 const char *name; 2659 const char *name;
1938 IV iv; 2660 IV iv;
1939 } *civ, const_iv[] = { 2661 } *civ, const_iv[] = {
1940# define const_iv(name) { # name, (IV)name } 2662# define const_iv(name) { # name, (IV)name }
2663 const_iv (GL_VENDOR),
2664 const_iv (GL_VERSION),
2665 const_iv (GL_EXTENSIONS),
1941 const_iv (GL_COLOR_MATERIAL), 2666 const_iv (GL_COLOR_MATERIAL),
1942 const_iv (GL_SMOOTH), 2667 const_iv (GL_SMOOTH),
1943 const_iv (GL_FLAT), 2668 const_iv (GL_FLAT),
1944 const_iv (GL_DITHER), 2669 const_iv (GL_DITHER),
1945 const_iv (GL_BLEND), 2670 const_iv (GL_BLEND),
1949 const_iv (GL_ALPHA_TEST), 2674 const_iv (GL_ALPHA_TEST),
1950 const_iv (GL_NORMALIZE), 2675 const_iv (GL_NORMALIZE),
1951 const_iv (GL_RESCALE_NORMAL), 2676 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT), 2677 const_iv (GL_FRONT),
1953 const_iv (GL_BACK), 2678 const_iv (GL_BACK),
2679 const_iv (GL_AUX0),
1954 const_iv (GL_AND), 2680 const_iv (GL_AND),
1955 const_iv (GL_ONE), 2681 const_iv (GL_ONE),
1956 const_iv (GL_ZERO), 2682 const_iv (GL_ZERO),
1957 const_iv (GL_SRC_ALPHA), 2683 const_iv (GL_SRC_ALPHA),
1958 const_iv (GL_DST_ALPHA), 2684 const_iv (GL_DST_ALPHA),
1971 const_iv (GL_INTENSITY), 2697 const_iv (GL_INTENSITY),
1972 const_iv (GL_LUMINANCE), 2698 const_iv (GL_LUMINANCE),
1973 const_iv (GL_LUMINANCE_ALPHA), 2699 const_iv (GL_LUMINANCE_ALPHA),
1974 const_iv (GL_FLOAT), 2700 const_iv (GL_FLOAT),
1975 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),
1976 const_iv (GL_COMPILE), 2708 const_iv (GL_COMPILE),
2709 const_iv (GL_PROXY_TEXTURE_1D),
2710 const_iv (GL_PROXY_TEXTURE_2D),
1977 const_iv (GL_TEXTURE_1D), 2711 const_iv (GL_TEXTURE_1D),
1978 const_iv (GL_TEXTURE_2D), 2712 const_iv (GL_TEXTURE_2D),
1979 const_iv (GL_TEXTURE_ENV), 2713 const_iv (GL_TEXTURE_ENV),
1980 const_iv (GL_TEXTURE_MAG_FILTER), 2714 const_iv (GL_TEXTURE_MAG_FILTER),
1981 const_iv (GL_TEXTURE_MIN_FILTER), 2715 const_iv (GL_TEXTURE_MIN_FILTER),
2002 const_iv (GL_COLOR_LOGIC_OP), 2736 const_iv (GL_COLOR_LOGIC_OP),
2003 const_iv (GL_SEPARABLE_2D), 2737 const_iv (GL_SEPARABLE_2D),
2004 const_iv (GL_CONVOLUTION_2D), 2738 const_iv (GL_CONVOLUTION_2D),
2005 const_iv (GL_CONVOLUTION_BORDER_MODE), 2739 const_iv (GL_CONVOLUTION_BORDER_MODE),
2006 const_iv (GL_CONSTANT_BORDER), 2740 const_iv (GL_CONSTANT_BORDER),
2741 const_iv (GL_POINTS),
2007 const_iv (GL_LINES), 2742 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP), 2743 const_iv (GL_LINE_STRIP),
2009 const_iv (GL_LINE_LOOP), 2744 const_iv (GL_LINE_LOOP),
2010 const_iv (GL_QUADS), 2745 const_iv (GL_QUADS),
2011 const_iv (GL_QUAD_STRIP), 2746 const_iv (GL_QUAD_STRIP),
2012 const_iv (GL_TRIANGLES), 2747 const_iv (GL_TRIANGLES),
2013 const_iv (GL_TRIANGLE_STRIP), 2748 const_iv (GL_TRIANGLE_STRIP),
2014 const_iv (GL_TRIANGLE_FAN), 2749 const_iv (GL_TRIANGLE_FAN),
2750 const_iv (GL_POLYGON),
2015 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2751 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2752 const_iv (GL_POINT_SMOOTH_HINT),
2753 const_iv (GL_LINE_SMOOTH_HINT),
2754 const_iv (GL_POLYGON_SMOOTH_HINT),
2755 const_iv (GL_GENERATE_MIPMAP_HINT),
2756 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2016 const_iv (GL_FASTEST), 2757 const_iv (GL_FASTEST),
2758 const_iv (GL_DONT_CARE),
2759 const_iv (GL_NICEST),
2017 const_iv (GL_V2F), 2760 const_iv (GL_V2F),
2018 const_iv (GL_V3F), 2761 const_iv (GL_V3F),
2019 const_iv (GL_T2F_V3F), 2762 const_iv (GL_T2F_V3F),
2020 const_iv (GL_T2F_N3F_V3F), 2763 const_iv (GL_T2F_N3F_V3F),
2021# undef const_iv 2764# undef const_iv
2022 }; 2765 };
2023 2766
2024 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2767 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2769
2770 texture_av = newAV ();
2771 AvREAL_off (texture_av);
2026} 2772}
2773
2774void
2775disable_GL_EXT_blend_func_separate ()
2776 CODE:
2777 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0;
2027 2779
2028char * 2780char *
2029gl_vendor () 2781gl_vendor ()
2030 CODE: 2782 CODE:
2031 RETVAL = (char *)glGetString (GL_VENDOR); 2783 RETVAL = (char *)glGetString (GL_VENDOR);
2044 CODE: 2796 CODE:
2045 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2797 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2046 OUTPUT: 2798 OUTPUT:
2047 RETVAL 2799 RETVAL
2048 2800
2801const char *glGetString (GLenum pname)
2802
2803GLint glGetInteger (GLenum pname)
2804 CODE:
2805 glGetIntegerv (pname, &RETVAL);
2806 OUTPUT:
2807 RETVAL
2808
2809GLdouble glGetDouble (GLenum pname)
2810 CODE:
2811 glGetDoublev (pname, &RETVAL);
2812 OUTPUT:
2813 RETVAL
2814
2049int glGetError () 2815int glGetError ()
2050 2816
2051void glFinish () 2817void glFinish ()
2052 2818
2053void glClear (int mask) 2819void glClear (int mask)
2090# near_ and far_ are due to microsofts buggy "c" compiler 2856# near_ and far_ are due to microsofts buggy "c" compiler
2091void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2857void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2092 2858
2093# near_ and far_ are due to microsofts buggy "c" compiler 2859# near_ and far_ are due to microsofts buggy "c" compiler
2094void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2860void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2861
2862PROTOTYPES: DISABLE
2095 2863
2096void glViewport (int x, int y, int width, int height) 2864void glViewport (int x, int y, int width, int height)
2097 2865
2098void glScissor (int x, int y, int width, int height) 2866void glScissor (int x, int y, int width, int height)
2099 2867
2107 2875
2108void glRotate (float angle, float x, float y, float z) 2876void glRotate (float angle, float x, float y, float z)
2109 CODE: 2877 CODE:
2110 glRotatef (angle, x, y, z); 2878 glRotatef (angle, x, y, z);
2111 2879
2112void glBegin (int mode)
2113
2114void glEnd ()
2115
2116void glColor (float r, float g, float b, float a = 1.0) 2880void glColor (float r, float g, float b, float a = 1.0)
2117 PROTOTYPE: @
2118 ALIAS: 2881 ALIAS:
2119 glColor_premultiply = 1 2882 glColor_premultiply = 1
2120 CODE: 2883 CODE:
2121 if (ix) 2884 if (ix)
2122 { 2885 {
2125 b *= a; 2888 b *= a;
2126 } 2889 }
2127 // microsoft visual "c" rounds instead of truncating... 2890 // microsoft visual "c" rounds instead of truncating...
2128 glColor4f (r, g, b, a); 2891 glColor4f (r, g, b, a);
2129 2892
2130void glInterleavedArrays (int format, int stride, char *data)
2131
2132void glDrawElements (int mode, int count, int type, char *indices)
2133
2134# 1.2 void glDrawRangeElements (int mode, int start, int end
2135
2136void glRasterPos (float x, float y, float z = 0.) 2893void glRasterPos (float x, float y, float z = 0.)
2137 CODE: 2894 CODE:
2138 glRasterPos3f (0, 0, z); 2895 glRasterPos3f (0, 0, z);
2139 glBitmap (0, 0, 0, 0, x, y, 0); 2896 glBitmap (0, 0, 0, 0, x, y, 0);
2140 2897
2144 2901
2145void glTexCoord (float s, float t) 2902void glTexCoord (float s, float t)
2146 CODE: 2903 CODE:
2147 glTexCoord2f (s, t); 2904 glTexCoord2f (s, t);
2148 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
2919PROTOTYPES: ENABLE
2920
2921void glBegin (int mode)
2922
2923void glEnd ()
2924
2925void glPointSize (GLfloat size)
2926
2927void glLineWidth (GLfloat width)
2928
2929void glInterleavedArrays (int format, int stride, char *data)
2930
2931void glDrawElements (int mode, int count, int type, char *indices)
2932
2933# 1.2 void glDrawRangeElements (int mode, int start, int end
2934
2149void glTexEnv (int target, int pname, float param) 2935void glTexEnv (int target, int pname, float param)
2150 CODE: 2936 CODE:
2151 glTexEnvf (target, pname, param); 2937 glTexEnvf (target, pname, param);
2152 2938
2153void glTexParameter (int target, int pname, float param) 2939void glTexParameter (int target, int pname, float param)
2169void 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)
2170 CODE: 2956 CODE:
2171 if (gl.SeparableFilter2D) 2957 if (gl.SeparableFilter2D)
2172 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2173 2959
2174void 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)
2175 2961
2176void 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)
2177 2963
2178void glDrawPixels (int width, int height, int format, int type, char *pixels) 2964void glDrawPixels (int width, int height, int format, int type, char *pixels)
2965
2966void glPixelZoom (float x, float y)
2179 2967
2180void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2968void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181 2969
2182int glGenTexture () 2970int glGenTexture ()
2183 CODE: 2971 CODE:
2184{ 2972 RETVAL = gen_texture ();
2185 GLuint name;
2186 glGenTextures (1, &name);
2187 RETVAL = name;
2188}
2189 OUTPUT: 2973 OUTPUT:
2190 RETVAL 2974 RETVAL
2191 2975
2192void glDeleteTexture (int name) 2976void glDeleteTexture (int name)
2193 CODE: 2977 CODE:
2194{
2195 GLuint name_ = name;
2196 glDeleteTextures (1, &name_); 2978 del_texture (name);
2197} 2979
2198
2199int glGenList () 2980int glGenList ()
2200 CODE: 2981 CODE:
2201 RETVAL = glGenLists (1); 2982 RETVAL = glGenLists (1);
2202 OUTPUT: 2983 OUTPUT:
2203 RETVAL 2984 RETVAL
2210 2991
2211void glEndList () 2992void glEndList ()
2212 2993
2213void glCallList (int list) 2994void glCallList (int list)
2214 2995
2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997
2998PROTOTYPES: DISABLE
2999
3000void
3001find_widget (SV *self, NV x, NV y)
3002 PPCODE:
3003{
3004 if (within_widget (self, x, y))
3005 XPUSHs (self);
3006}
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