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.179 by root, Wed Apr 11 04:32:51 2007 UTC vs.
Revision 1.208 by root, Sat Jul 21 16:07:53 2007 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
21#include <string.h> 26#include <string.h>
22#include <stdio.h> 27#include <stdio.h>
23#include <stdlib.h> 28#include <stdlib.h>
24 29
25#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
26#include <SDL_endian.h> 32#include <SDL_endian.h>
27#include <SDL_image.h> 33#include <SDL_image.h>
28#include <SDL_mixer.h> 34#include <SDL_mixer.h>
29#include <SDL_opengl.h> 35#include <SDL_opengl.h>
30 36
56# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else 63#else
58# define PARACHUTE 0 64# define PARACHUTE 0
59#endif 65#endif
60 66
67static AV *texture_av;
68
61static struct 69static struct
62{ 70{
63#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h" 72#include "glfunc.h"
65#undef GL_FUNC 73#undef GL_FUNC
66} gl; 74} gl;
67 75
76static void
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{ 78{
70 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else 83 else
75 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
85}
86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
76} 109}
77 110
78#include "texcache.c" 111#include "texcache.c"
79 112
80#include "pango-font.c" 113#include "pango-font.c"
345} smooth_key; 378} smooth_key;
346 379
347static void 380static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits) 381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{ 382{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1); 383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351 384
352 if (SvIOK (*sv)) 385 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits); 386 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else 387 else
355 sv_setiv (*sv, bits); 388 sv_setiv (*sv, bits);
399} 432}
400 433
401/* SDL should provide this, really. */ 434/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300 435#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314 436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static int
441within_widget (SV *widget, NV x, NV y)
442{
443 HV *self;
444 SV **svp;
445 NV wx, ww, wy, wh;
446
447 if (!SvROK (widget))
448 return 0;
449
450 self = (HV *)SvRV (widget);
451
452 if (SvTYPE (self) != SVt_PVHV)
453 return 0;
454
455 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
456 if (y < wy)
457 return 0;
458
459 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
460 if (y >= wy + wh)
461 return 0;
462
463 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
464 if (x < wx)
465 return 0;
466
467 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
468 if (x >= wx + ww)
469 return 0;
470
471 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
472 if (!svp || !SvTRUE (*svp))
473 return 0;
474
475 return 1;
476}
404 477
405MODULE = CFPlus PACKAGE = CFPlus 478MODULE = CFPlus PACKAGE = CFPlus
406 479
407PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
408 481
555 opengl_fontmap = pango_opengl_font_map_new (); 628 opengl_fontmap = pango_opengl_font_map_new ();
556 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
558} 631}
559 632
633char *
634SDL_GetError ()
635
560int 636int
561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
562 638
563void 639void
564SDL_Quit () 640SDL_Quit ()
565 641
566void 642void
567SDL_ListModes () 643SDL_ListModes (int rgb, int alpha)
568 PPCODE: 644 PPCODE:
569{ 645{
570 SDL_Rect **m; 646 SDL_Rect **m;
571 647
572 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 648 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 649 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 650 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 651 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576 652
577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 653 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 654 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579 655
580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 656 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584 660
585 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586#if SDL_VERSION_ATLEAST(1,2,10) 662#if SDL_VERSION_ATLEAST(1,2,10)
587 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589#endif 665#endif
590 666
591 SDL_EnableUNICODE (1);
592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593
594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
595 668
596 if (m && m != (SDL_Rect **)-1) 669 if (m && m != (SDL_Rect **)-1)
597 while (*m) 670 while (*m)
598 { 671 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
599 AV *av = newAV (); 674 AV *av = newAV ();
600 av_push (av, newSViv ((*m)->w)); 675 av_push (av, newSViv ((*m)->w));
601 av_push (av, newSViv ((*m)->h)); 676 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb));
678 av_push (av, newSViv (alpha));
602 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
603 681
604 ++m; 682 ++m;
605 } 683 }
606} 684}
607 685
608char *
609SDL_GetError ()
610
611int 686int
612SDL_SetVideoMode (int w, int h, int fullscreen) 687SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613 CODE: 688 CODE:
689{
690 SDL_EnableUNICODE (1);
691 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
692
693 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
694 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
695 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
696 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
697
614 RETVAL = !!SDL_SetVideoMode ( 698 RETVAL = !!SDL_SetVideoMode (
615 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 699 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
616 ); 700 );
701
617 if (RETVAL) 702 if (RETVAL)
618 { 703 {
704 av_clear (texture_av);
705
619 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621# include "glfunc.h" 708#include "glfunc.h"
622# undef GL_FUNC 709#undef GL_FUNC
623 } 710 }
711}
624 OUTPUT: 712 OUTPUT:
625 RETVAL 713 RETVAL
626 714
627void 715void
628SDL_GL_SwapBuffers () 716SDL_GL_SwapBuffers ()
629 717
630char * 718char *
631SDL_GetKeyName (int sym) 719SDL_GetKeyName (int sym)
632 720
721int
722SDL_GetAppState ()
723
633void 724void
634SDL_PollEvent () 725poll_events ()
635 PPCODE: 726 PPCODE:
636{ 727{
637 SDL_Event ev; 728 SDL_Event ev;
638 729
639 while (SDL_PollEvent (&ev)) 730 SDL_PumpEvents ();
731 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640 { 732 {
641 HV *hv = newHV (); 733 HV *hv = newHV ();
642 hv_store (hv, "type", 4, newSViv (ev.type), 0); 734 hv_store (hv, "type", 4, newSViv (ev.type), 0);
643 735
644 switch (ev.type) 736 switch (ev.type)
656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 749 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658 break; 750 break;
659 751
660 case SDL_MOUSEMOTION: 752 case SDL_MOUSEMOTION:
753 {
754 int state = ev.motion.state;
755 int x = ev.motion.x;
756 int y = ev.motion.y;
757 int xrel = ev.motion.xrel;
758 int yrel = ev.motion.yrel;
759
760 /* do simplistic event compression */
761 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
762 && state == ev.motion.state)
763 {
764 xrel += ev.motion.xrel;
765 yrel += ev.motion.yrel;
766 x = ev.motion.x;
767 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 }
770
661 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 772 hv_store (hv, "state", 5, newSViv (state), 0);
664 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 773 hv_store (hv, "x", 1, newSViv (x), 0);
665 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 774 hv_store (hv, "y", 1, newSViv (y), 0);
666 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 775 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 776 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 }
668 break; 778 break;
669 779
670 case SDL_MOUSEBUTTONDOWN: 780 case SDL_MOUSEBUTTONDOWN:
671 case SDL_MOUSEBUTTONUP: 781 case SDL_MOUSEBUTTONUP:
672 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
852 ExitThread (retval); // unclean, please beam me up 962 ExitThread (retval); // unclean, please beam me up
853#else 963#else
854 _exit (retval); 964 _exit (retval);
855#endif 965#endif
856 966
967void
968debug ()
969 CODE:
970{
971#if DEBUG
972 VALGRIND_DO_LEAK_CHECK;
973#endif
974}
975
857MODULE = CFPlus PACKAGE = CFPlus::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
977
978PROTOTYPES: DISABLE
858 979
859CFPlus::Font 980CFPlus::Font
860new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
861 CODE: 982 CODE:
862{ 983{
873 CODE: 994 CODE:
874 pango_font_description_free (self); 995 pango_font_description_free (self);
875 996
876void 997void
877make_default (CFPlus::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
878 CODE: 1000 CODE:
879 default_font = self; 1001 default_font = self;
880 1002
881MODULE = CFPlus PACKAGE = CFPlus::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
882 1004
1005PROTOTYPES: DISABLE
1006
883void 1007void
884reset_glyph_cache () 1008reset_glyph_cache ()
1009 PROTOTYPE:
885 CODE: 1010 CODE:
886 tc_clear (); 1011 tc_clear ();
887 1012
888CFPlus::Layout 1013CFPlus::Layout
889new (SV *class) 1014new (SV *class)
1176 flags 1301 flags
1177 ); 1302 );
1178 1303
1179MODULE = CFPlus PACKAGE = CFPlus::Texture 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1180 1305
1181void 1306PROTOTYPES: ENABLE
1182pad2pot (SV *data_, SV *w_, SV *h_)
1183 CODE:
1184{
1185 int ow = SvIV (w_);
1186 int oh = SvIV (h_);
1187 1307
1188 if (ow && oh) 1308int minpot (int n)
1309
1310void
1311pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE:
1313{
1314 if ((nw != ow || nh != oh) && SvOK (data_))
1189 { 1315 {
1190 int nw = minpot (ow);
1191 int nh = minpot (oh);
1192
1193 if (nw != ow || nh != oh)
1194 {
1195 if (SvOK (data_))
1196 {
1197 STRLEN datalen; 1316 STRLEN datalen;
1198 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1199 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1200 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1201 1320
1202 SvPOK_only (result_); 1321 SvPOK_only (result_);
1203 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1204 1323
1205 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1206 while (oh--) 1325 while (oh--)
1207 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1208 1327
1209 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1210 }
1211
1212 sv_setiv (w_, nw);
1213 sv_setiv (h_, nh);
1214 }
1215 } 1329 }
1216} 1330}
1217 1331
1218void 1332void
1219draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1333draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1262 glDisable (GL_ALPHA_TEST); 1376 glDisable (GL_ALPHA_TEST);
1263 glDisable (GL_BLEND); 1377 glDisable (GL_BLEND);
1264 } 1378 }
1265} 1379}
1266 1380
1381IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1382 CODE:
1383{
1384 GLint width;
1385 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1386 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1387 RETVAL = width > 0;
1388}
1389 OUTPUT:
1390 RETVAL
1391
1267MODULE = CFPlus PACKAGE = CFPlus::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1393
1394PROTOTYPES: DISABLE
1268 1395
1269CFPlus::Map 1396CFPlus::Map
1270new (SV *class) 1397new (SV *class)
1271 CODE: 1398 CODE:
1272 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
1391 CODE: 1518 CODE:
1392{ 1519{
1393 if (dx > 0) 1520 if (dx > 0)
1394 map_blank (self, self->x, self->y, dx, self->h); 1521 map_blank (self, self->x, self->y, dx, self->h);
1395 else if (dx < 0) 1522 else if (dx < 0)
1396 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1523 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397 1524
1398 if (dy > 0) 1525 if (dy > 0)
1399 map_blank (self, self->x, self->y, self->w, dy); 1526 map_blank (self, self->x, self->y, self->w, dy);
1400 else if (dy < 0) 1527 else if (dy < 0)
1401 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1528 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402 1529
1403 self->ox += dx; self->x += dx; 1530 self->ox += dx; self->x += dx;
1404 self->oy += dy; self->y += dy; 1531 self->oy += dy; self->y += dy;
1405 1532
1406 while (self->y < 0) 1533 while (self->y < 0)
1460 } 1587 }
1461 else if (cmd == 6) // monster width 1588 else if (cmd == 6) // monster width
1462 cell->stat_width = *data++ + 1; 1589 cell->stat_width = *data++ + 1;
1463 else if (cmd == 0x47) 1590 else if (cmd == 0x47)
1464 { 1591 {
1465 if (*data == 8) 1592 if (*data == 4)
1466 ; // decode player uuid 1593 ; // decode player count
1467 1594
1468 data += *data + 1; 1595 data += *data + 1;
1469 } 1596 }
1470 else if (cmd == 8) // cell flags 1597 else if (cmd == 8) // cell flags
1471 cell->flags = *data++; 1598 cell->flags = *data++;
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 1808 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682 1809
1683 // add bits to current tile and all neighbours. skey.x|y is 1810 // add bits to current tile and all neighbours. skey.x|y is
1684 // shifted +1|+1 so we always stay positive. 1811 // shifted +1|+1 so we always stay positive.
1685 1812
1813 // bits is ___n cccc CCCC bbbb
1814 // n do not draw borders&corners
1815 // c draw these corners, but...
1816 // C ... not these
1817 // b draw these borders
1818
1819 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1820 // ┃· ·· ·┃ ━━
1821
1822 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1823 // ·· ·· ·┏ ┓·
1824
1686 // full tile 1825 // full tile
1687 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 1826 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1688 1827
1689 // borders 1828 // borders
1690 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031); 1829 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1691 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092); 1830 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1692 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 1831 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1693 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 1832 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1694 1833
1695 // corners 1834 // corners
1696 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 1835 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1700 } 1839 }
1701 } 1840 }
1702 } 1841 }
1703 } 1842 }
1704 1843
1705 // go through all smoothlevels, lowest to highest, then draw 1844 // go through all smoothlevels, lowest to highest, then draw.
1706 // this is basically counting sort 1845 // this is basically counting sort
1707 { 1846 {
1708 int w, b; 1847 int w, b;
1709 1848
1710 for (w = 0; w < 256 / 32; ++w) 1849 for (w = 0; w < 256 / 32; ++w)
1721 while ((he = hv_iternext (smooth))) 1860 while ((he = hv_iternext (smooth)))
1722 { 1861 {
1723 smooth_key *skey = (smooth_key *)HeKEY (he); 1862 smooth_key *skey = (smooth_key *)HeKEY (he);
1724 IV bits = SvIVX (HeVAL (he)); 1863 IV bits = SvIVX (HeVAL (he));
1725 1864
1726 // bits is ___n cccc CCCC bbbb
1727 // n do not draw borders&corners
1728 // c draw these corners, but...
1729 // C ... not these
1730 // b draw these borders
1731
1732 if (!(bits & 0x1000) 1865 if (!(bits & 0x1000)
1733 && skey->level == level 1866 && skey->level == level
1734 && level >= smooth_max [skey->x][skey->y]) 1867 && level > smooth_max [skey->x][skey->y])
1735 { 1868 {
1736 maptex tex = self->tex [skey->tile]; 1869 maptex tex = self->tex [skey->tile];
1737 int px = (((int)skey->x) - 1) * T; 1870 int px = (((int)skey->x) - 1) * T;
1738 int py = (((int)skey->y) - 1) * T; 1871 int py = (((int)skey->y) - 1) * T;
1739 int border = bits & 15; 1872 int border = bits & 15;
1881void 2014void
1882fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1883 PPCODE: 2016 PPCODE:
1884{ 2017{
1885 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1886 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1887 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1888 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1889 2026
1890 memset (darkness, 255, sw4 * sh);
1891 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1892 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1893 2029
1894 mx += self->x; 2030 mx += self->x - 1;
1895 my += self->y; 2031 my += self->y - 1;
1896 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1897 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1898 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1899 { 2037 {
1900 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1901 2039
1902 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
1903 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1904 { 2042 {
1905 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1906 2044
1907 darkness[y * sw4 + x] = cell->darkness 2045 darkness1 [y * sw1 + x] = cell->darkness
1908 ? 255 - (cell->darkness - 1) 2046 ? 255 - (cell->darkness - 1)
1909 : 255 - FOW_DARKNESS; 2047 : 255 - FOW_DARKNESS;
1910 } 2048 }
1911 } 2049 }
1912 2050
2051 for (y = 0; y < sh; ++y)
2052 for (x = 0; x < sw; ++x)
2053 {
2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2056 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2057 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2058 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2059 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2060 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2061 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2062 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2063
2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2065 uint8_t r21 = d21;
2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2067
2068 uint8_t r12 = d12;
2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2071
2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2075
2076 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2077 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2078 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2079 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2080 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2081 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2082 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2083 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2084 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2085 }
2086
2087 free (darkness1);
2088
1913 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
1914 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
1915 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
1916 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
1917} 2093}
1918 2094
1919SV * 2095SV *
1920get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1921 CODE: 2097 CODE:
2055 } 2231 }
2056} 2232}
2057 2233
2058MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2059 2235
2236PROTOTYPES: DISABLE
2237
2060CFPlus::MixChunk 2238CFPlus::MixChunk
2061new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
2062 CODE: 2240 CODE:
2063 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
2064 OUTPUT: 2242 OUTPUT:
2085 2263
2086MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2087 2265
2088int 2266int
2089volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
2090 CODE: 2269 CODE:
2091 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
2092 OUTPUT: 2271 OUTPUT:
2093 RETVAL 2272 RETVAL
2094 2273
2274int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
2095CFPlus::MixMusic 2281CFPlus::MixMusic
2096new_from_file (SV *class, char *path) 2282new_from_file (SV *class, char *path)
2097 CODE: 2283 CODE:
2098 RETVAL = Mix_LoadMUS (path); 2284 RETVAL = Mix_LoadMUS (path);
2099 OUTPUT: 2285 OUTPUT:
2109 CODE: 2295 CODE:
2110 RETVAL = Mix_PlayMusic (self, loops); 2296 RETVAL = Mix_PlayMusic (self, loops);
2111 OUTPUT: 2297 OUTPUT:
2112 RETVAL 2298 RETVAL
2113 2299
2300int
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306
2114MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
2115 2310
2116BOOT: 2311BOOT:
2117{ 2312{
2118 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2119 static const struct { 2314 static const struct {
2120 const char *name; 2315 const char *name;
2121 IV iv; 2316 IV iv;
2122 } *civ, const_iv[] = { 2317 } *civ, const_iv[] = {
2123# define const_iv(name) { # name, (IV)name } 2318# define const_iv(name) { # name, (IV)name }
2319 const_iv (GL_VENDOR),
2320 const_iv (GL_VERSION),
2321 const_iv (GL_EXTENSIONS),
2124 const_iv (GL_COLOR_MATERIAL), 2322 const_iv (GL_COLOR_MATERIAL),
2125 const_iv (GL_SMOOTH), 2323 const_iv (GL_SMOOTH),
2126 const_iv (GL_FLAT), 2324 const_iv (GL_FLAT),
2127 const_iv (GL_DITHER), 2325 const_iv (GL_DITHER),
2128 const_iv (GL_BLEND), 2326 const_iv (GL_BLEND),
2132 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
2133 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
2134 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
2135 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
2136 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
2137 const_iv (GL_AND), 2336 const_iv (GL_AND),
2138 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
2139 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
2140 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
2141 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
2155 const_iv (GL_LUMINANCE), 2354 const_iv (GL_LUMINANCE),
2156 const_iv (GL_LUMINANCE_ALPHA), 2355 const_iv (GL_LUMINANCE_ALPHA),
2157 const_iv (GL_FLOAT), 2356 const_iv (GL_FLOAT),
2158 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2159 const_iv (GL_COMPILE), 2358 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D),
2160 const_iv (GL_TEXTURE_1D), 2361 const_iv (GL_TEXTURE_1D),
2161 const_iv (GL_TEXTURE_2D), 2362 const_iv (GL_TEXTURE_2D),
2162 const_iv (GL_TEXTURE_ENV), 2363 const_iv (GL_TEXTURE_ENV),
2163 const_iv (GL_TEXTURE_MAG_FILTER), 2364 const_iv (GL_TEXTURE_MAG_FILTER),
2164 const_iv (GL_TEXTURE_MIN_FILTER), 2365 const_iv (GL_TEXTURE_MIN_FILTER),
2185 const_iv (GL_COLOR_LOGIC_OP), 2386 const_iv (GL_COLOR_LOGIC_OP),
2186 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
2187 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
2188 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
2189 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
2391 const_iv (GL_POINTS),
2190 const_iv (GL_LINES), 2392 const_iv (GL_LINES),
2191 const_iv (GL_LINE_STRIP), 2393 const_iv (GL_LINE_STRIP),
2192 const_iv (GL_LINE_LOOP), 2394 const_iv (GL_LINE_LOOP),
2193 const_iv (GL_QUADS), 2395 const_iv (GL_QUADS),
2194 const_iv (GL_QUAD_STRIP), 2396 const_iv (GL_QUAD_STRIP),
2195 const_iv (GL_TRIANGLES), 2397 const_iv (GL_TRIANGLES),
2196 const_iv (GL_TRIANGLE_STRIP), 2398 const_iv (GL_TRIANGLE_STRIP),
2197 const_iv (GL_TRIANGLE_FAN), 2399 const_iv (GL_TRIANGLE_FAN),
2400 const_iv (GL_POLYGON),
2198 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT),
2199 const_iv (GL_FASTEST), 2406 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST),
2200 const_iv (GL_V2F), 2409 const_iv (GL_V2F),
2201 const_iv (GL_V3F), 2410 const_iv (GL_V3F),
2202 const_iv (GL_T2F_V3F), 2411 const_iv (GL_T2F_V3F),
2203 const_iv (GL_T2F_N3F_V3F), 2412 const_iv (GL_T2F_N3F_V3F),
2204# undef const_iv 2413# undef const_iv
2205 }; 2414 };
2206 2415
2207 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2416 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2208 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2418
2419 texture_av = newAV ();
2420 AvREAL_off (texture_av);
2209} 2421}
2210 2422
2211char * 2423char *
2212gl_vendor () 2424gl_vendor ()
2213 CODE: 2425 CODE:
2227 CODE: 2439 CODE:
2228 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2440 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2229 OUTPUT: 2441 OUTPUT:
2230 RETVAL 2442 RETVAL
2231 2443
2444const char *glGetString (GLenum pname)
2445
2446GLint glGetInteger (GLenum pname)
2447 CODE:
2448 glGetIntegerv (pname, &RETVAL);
2449 OUTPUT:
2450 RETVAL
2451
2452GLdouble glGetDouble (GLenum pname)
2453 CODE:
2454 glGetDoublev (pname, &RETVAL);
2455 OUTPUT:
2456 RETVAL
2457
2232int glGetError () 2458int glGetError ()
2233 2459
2234void glFinish () 2460void glFinish ()
2235 2461
2236void glClear (int mask) 2462void glClear (int mask)
2273# near_ and far_ are due to microsofts buggy "c" compiler 2499# near_ and far_ are due to microsofts buggy "c" compiler
2274void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2500void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2275 2501
2276# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
2277void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2503void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2504
2505PROTOTYPES: DISABLE
2278 2506
2279void glViewport (int x, int y, int width, int height) 2507void glViewport (int x, int y, int width, int height)
2280 2508
2281void glScissor (int x, int y, int width, int height) 2509void glScissor (int x, int y, int width, int height)
2282 2510
2290 2518
2291void glRotate (float angle, float x, float y, float z) 2519void glRotate (float angle, float x, float y, float z)
2292 CODE: 2520 CODE:
2293 glRotatef (angle, x, y, z); 2521 glRotatef (angle, x, y, z);
2294 2522
2295void glBegin (int mode)
2296
2297void glEnd ()
2298
2299void glColor (float r, float g, float b, float a = 1.0) 2523void glColor (float r, float g, float b, float a = 1.0)
2300 PROTOTYPE: @
2301 ALIAS: 2524 ALIAS:
2302 glColor_premultiply = 1 2525 glColor_premultiply = 1
2303 CODE: 2526 CODE:
2304 if (ix) 2527 if (ix)
2305 { 2528 {
2308 b *= a; 2531 b *= a;
2309 } 2532 }
2310 // microsoft visual "c" rounds instead of truncating... 2533 // microsoft visual "c" rounds instead of truncating...
2311 glColor4f (r, g, b, a); 2534 glColor4f (r, g, b, a);
2312 2535
2313void glInterleavedArrays (int format, int stride, char *data)
2314
2315void glDrawElements (int mode, int count, int type, char *indices)
2316
2317# 1.2 void glDrawRangeElements (int mode, int start, int end
2318
2319void glRasterPos (float x, float y, float z = 0.) 2536void glRasterPos (float x, float y, float z = 0.)
2320 CODE: 2537 CODE:
2321 glRasterPos3f (0, 0, z); 2538 glRasterPos3f (0, 0, z);
2322 glBitmap (0, 0, 0, 0, x, y, 0); 2539 glBitmap (0, 0, 0, 0, x, y, 0);
2323 2540
2327 2544
2328void glTexCoord (float s, float t) 2545void glTexCoord (float s, float t)
2329 CODE: 2546 CODE:
2330 glTexCoord2f (s, t); 2547 glTexCoord2f (s, t);
2331 2548
2549PROTOTYPES: ENABLE
2550
2551void glBegin (int mode)
2552
2553void glEnd ()
2554
2555void glPointSize (GLfloat size)
2556
2557void glLineWidth (GLfloat width)
2558
2559void glInterleavedArrays (int format, int stride, char *data)
2560
2561void glDrawElements (int mode, int count, int type, char *indices)
2562
2563# 1.2 void glDrawRangeElements (int mode, int start, int end
2564
2332void glTexEnv (int target, int pname, float param) 2565void glTexEnv (int target, int pname, float param)
2333 CODE: 2566 CODE:
2334 glTexEnvf (target, pname, param); 2567 glTexEnvf (target, pname, param);
2335 2568
2336void glTexParameter (int target, int pname, float param) 2569void glTexParameter (int target, int pname, float param)
2358 2591
2359void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2592void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2360 2593
2361void glDrawPixels (int width, int height, int format, int type, char *pixels) 2594void glDrawPixels (int width, int height, int format, int type, char *pixels)
2362 2595
2596void glPixelZoom (float x, float y)
2597
2363void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2598void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2364 2599
2365int glGenTexture () 2600int glGenTexture ()
2366 CODE: 2601 CODE:
2367{ 2602 RETVAL = gen_texture ();
2368 GLuint name;
2369 glGenTextures (1, &name);
2370 RETVAL = name;
2371}
2372 OUTPUT: 2603 OUTPUT:
2373 RETVAL 2604 RETVAL
2374 2605
2375void glDeleteTexture (int name) 2606void glDeleteTexture (int name)
2376 CODE: 2607 CODE:
2377{
2378 GLuint name_ = name;
2379 glDeleteTextures (1, &name_); 2608 del_texture (name);
2380} 2609
2381
2382int glGenList () 2610int glGenList ()
2383 CODE: 2611 CODE:
2384 RETVAL = glGenLists (1); 2612 RETVAL = glGenLists (1);
2385 OUTPUT: 2613 OUTPUT:
2386 RETVAL 2614 RETVAL
2393 2621
2394void glEndList () 2622void glEndList ()
2395 2623
2396void glCallList (int list) 2624void glCallList (int list)
2397 2625
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2627
2628PROTOTYPES: DISABLE
2629
2630void
2631find_widget (SV *widget, NV x, NV y)
2632 PPCODE:
2633{
2634 if (within_widget (widget, x, y))
2635 XPUSHs (widget);
2636}
2637

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines