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.192 by root, Fri Apr 27 21:27:51 2007 UTC vs.
Revision 1.228 by root, Mon Aug 13 15:31:20 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
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
101 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
103} 116}
104 117
105#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
106 120
107#include "pango-font.c" 121#include "pango-font.c"
108#include "pango-fontmap.c" 122#include "pango-fontmap.c"
109#include "pango-render.c" 123#include "pango-render.c"
110 124
125typedef IV CFPlus__Channel;
126typedef SDL_RWops *CFPlus__RW;
111typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *CFPlus__MixChunk;
112typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *CFPlus__MixMusic;
113 129
114typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *CFPlus__Font;
115 131
134typedef struct cf_layout { 150typedef struct cf_layout {
135 PangoLayout *pl; 151 PangoLayout *pl;
136 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
137 int base_height; 153 int base_height;
138 CFPlus__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
139} *CFPlus__Layout; 156} *CFPlus__Layout;
140 157
141static CFPlus__Font default_font; 158static CFPlus__Font default_font;
142static PangoContext *opengl_context; 159static PangoContext *opengl_context;
143static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
186 203
187typedef uint16_t tileid; 204typedef uint16_t tileid;
188typedef uint16_t faceid; 205typedef uint16_t faceid;
189 206
190typedef struct { 207typedef struct {
191 int name; 208 GLuint name;
192 int w, h; 209 int w, h;
193 float s, t; 210 float s, t;
194 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
195 tileid smoothtile; 212 tileid smoothtile;
196 uint8_t smoothlevel; 213 uint8_t smoothlevel;
426} 443}
427 444
428/* SDL should provide this, really. */ 445/* SDL should provide this, really. */
429#define SDLK_MODIFIER_MIN 300 446#define SDLK_MODIFIER_MIN 300
430#define SDLK_MODIFIER_MAX 314 447#define SDLK_MODIFIER_MAX 314
448
449/******************************************************************************/
450
451static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
452static GV *hover_gv;
453
454static int
455within_widget (SV *widget, NV x, NV y)
456{
457 HV *self;
458 SV **svp;
459 NV wx, ww, wy, wh;
460
461 if (!SvROK (widget))
462 return 0;
463
464 self = (HV *)SvRV (widget);
465
466 if (SvTYPE (self) != SVt_PVHV)
467 return 0;
468
469 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
470 if (y < wy)
471 return 0;
472
473 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
474 if (y >= wy + wh)
475 return 0;
476
477 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
478 if (x < wx)
479 return 0;
480
481 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
482 if (x >= wx + ww)
483 return 0;
484
485 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
486 if (!svp || !SvTRUE (*svp))
487 return 0;
488
489 return 1;
490}
431 491
432MODULE = CFPlus PACKAGE = CFPlus 492MODULE = CFPlus PACKAGE = CFPlus
433 493
434PROTOTYPES: ENABLE 494PROTOTYPES: ENABLE
435 495
582 opengl_fontmap = pango_opengl_font_map_new (); 642 opengl_fontmap = pango_opengl_font_map_new ();
583 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
584 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
585} 645}
586 646
647char *
648SDL_GetError ()
649
587int 650int
588SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
589 652
590void 653void
591SDL_Quit () 654SDL_Quit ()
592 655
593void 656void
594SDL_ListModes () 657SDL_ListModes (int rgb, int alpha)
595 PPCODE: 658 PPCODE:
596{ 659{
597 SDL_Rect **m; 660 SDL_Rect **m;
598 661
599 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 662 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
600 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 663 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
601 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 664 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
602 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 665 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
603 666
604 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 667 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
605 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 668 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
606 669
607 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 670 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
608 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
609 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
610 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
611 674
612 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
613#if SDL_VERSION_ATLEAST(1,2,10) 676#if SDL_VERSION_ATLEAST(1,2,10)
614 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
615 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
616#endif 679#endif
617 680
618 SDL_EnableUNICODE (1);
619 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
620
621 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
622 682
623 if (m && m != (SDL_Rect **)-1) 683 if (m && m != (SDL_Rect **)-1)
624 while (*m) 684 while (*m)
625 { 685 {
686 if ((*m)->w >= 640 && (*m)->h >= 480)
687 {
626 AV *av = newAV (); 688 AV *av = newAV ();
627 av_push (av, newSViv ((*m)->w)); 689 av_push (av, newSViv ((*m)->w));
628 av_push (av, newSViv ((*m)->h)); 690 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb));
692 av_push (av, newSViv (alpha));
629 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 693 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
694 }
630 695
631 ++m; 696 ++m;
632 } 697 }
633} 698}
634 699
635char *
636SDL_GetError ()
637
638int 700int
639SDL_SetVideoMode (int w, int h, int fullscreen) 701SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
640 CODE: 702 CODE:
703{
704 SDL_EnableUNICODE (1);
705 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
706
707 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
708 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
709 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
710 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
711
641 RETVAL = !!SDL_SetVideoMode ( 712 RETVAL = !!SDL_SetVideoMode (
642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 713 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
643 ); 714 );
715
644 if (RETVAL) 716 if (RETVAL)
645 { 717 {
646 av_clear (texture_av); 718 av_clear (texture_av);
647 719
648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
650# include "glfunc.h" 722#include "glfunc.h"
651# undef GL_FUNC 723#undef GL_FUNC
652
653 } 724 }
725}
654 OUTPUT: 726 OUTPUT:
655 RETVAL 727 RETVAL
656 728
657void 729void
658SDL_GL_SwapBuffers () 730SDL_GL_SwapBuffers ()
659 731
660char * 732char *
661SDL_GetKeyName (int sym) 733SDL_GetKeyName (int sym)
662 734
735int
736SDL_GetAppState ()
737
663void 738void
664SDL_PollEvent () 739poll_events ()
665 PPCODE: 740 PPCODE:
666{ 741{
667 SDL_Event ev; 742 SDL_Event ev;
668 743
669 while (SDL_PollEvent (&ev)) 744 SDL_PumpEvents ();
745 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
670 { 746 {
671 HV *hv = newHV (); 747 HV *hv = newHV ();
672 hv_store (hv, "type", 4, newSViv (ev.type), 0); 748 hv_store (hv, "type", 4, newSViv (ev.type), 0);
673 749
674 switch (ev.type) 750 switch (ev.type)
686 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
687 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 763 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
688 break; 764 break;
689 765
690 case SDL_MOUSEMOTION: 766 case SDL_MOUSEMOTION:
767 {
768 int state = ev.motion.state;
769 int x = ev.motion.x;
770 int y = ev.motion.y;
771 int xrel = ev.motion.xrel;
772 int yrel = ev.motion.yrel;
773
774 /* do simplistic event compression */
775 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
776 && state == ev.motion.state)
777 {
778 xrel += ev.motion.xrel;
779 yrel += ev.motion.yrel;
780 x = ev.motion.x;
781 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 }
784
691 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
692
693 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 786 hv_store (hv, "state", 5, newSViv (state), 0);
694 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 787 hv_store (hv, "x", 1, newSViv (x), 0);
695 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 788 hv_store (hv, "y", 1, newSViv (y), 0);
696 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 789 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
697 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 790 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 }
698 break; 792 break;
699 793
700 case SDL_MOUSEBUTTONDOWN: 794 case SDL_MOUSEBUTTONDOWN:
701 case SDL_MOUSEBUTTONUP: 795 case SDL_MOUSEBUTTONUP:
702 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
717 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
718 } 812 }
719} 813}
720 814
721int 815int
722Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
723 POSTCALL: 817 POSTCALL:
724 Mix_HookMusicFinished (music_finished); 818 Mix_HookMusicFinished (music_finished);
725 Mix_ChannelFinished (channel_finished); 819 Mix_ChannelFinished (channel_finished);
726 820
727void 821void
728Mix_CloseAudio () 822Mix_CloseAudio ()
729 823
730int 824int
731Mix_AllocateChannels (int numchans = -1) 825Mix_AllocateChannels (int numchans = -1)
826
827const char *
828Mix_GetError ()
732 829
733void 830void
734lowdelay (int fd, int val = 1) 831lowdelay (int fd, int val = 1)
735 CODE: 832 CODE:
736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 833 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
778 STRLEN image_len; 875 STRLEN image_len;
779 char *image = (char *)SvPVbyte (image_, image_len); 876 char *image = (char *)SvPVbyte (image_, image_len);
780 SDL_Surface *surface, *surface2; 877 SDL_Surface *surface, *surface2;
781 SDL_PixelFormat fmt; 878 SDL_PixelFormat fmt;
782 SDL_RWops *rw = ix 879 SDL_RWops *rw = ix
783 ? SDL_RWFromFile (image, "r") 880 ? SDL_RWFromFile (image, "rb")
784 : SDL_RWFromConstMem (image, image_len); 881 : SDL_RWFromConstMem (image, image_len);
785 882
786 if (!rw) 883 if (!rw)
787 croak ("load_image: %s", SDL_GetError ()); 884 croak ("load_image: %s", SDL_GetError ());
788 885
882 ExitThread (retval); // unclean, please beam me up 979 ExitThread (retval); // unclean, please beam me up
883#else 980#else
884 _exit (retval); 981 _exit (retval);
885#endif 982#endif
886 983
984void
985debug ()
986 CODE:
987{
988#if DEBUG
989 VALGRIND_DO_LEAK_CHECK;
990#endif
991}
992
887MODULE = CFPlus PACKAGE = CFPlus::Font 993MODULE = CFPlus PACKAGE = CFPlus::Font
994
995PROTOTYPES: DISABLE
888 996
889CFPlus::Font 997CFPlus::Font
890new_from_file (SV *class, char *path, int id = 0) 998new_from_file (SV *class, char *path, int id = 0)
891 CODE: 999 CODE:
892{ 1000{
903 CODE: 1011 CODE:
904 pango_font_description_free (self); 1012 pango_font_description_free (self);
905 1013
906void 1014void
907make_default (CFPlus::Font self) 1015make_default (CFPlus::Font self)
1016 PROTOTYPE: $
908 CODE: 1017 CODE:
909 default_font = self; 1018 default_font = self;
910 1019
911MODULE = CFPlus PACKAGE = CFPlus::Layout 1020MODULE = CFPlus PACKAGE = CFPlus::Layout
912 1021
1022PROTOTYPES: DISABLE
1023
913void 1024void
914reset_glyph_cache () 1025reset_glyph_cache ()
1026 PROTOTYPE:
915 CODE: 1027 CODE:
916 tc_clear (); 1028 tc_clear ();
917 1029
918CFPlus::Layout 1030CFPlus::Layout
919new (SV *class) 1031new (SV *class)
925 RETVAL->g = 1.; 1037 RETVAL->g = 1.;
926 RETVAL->b = 1.; 1038 RETVAL->b = 1.;
927 RETVAL->a = 1.; 1039 RETVAL->a = 1.;
928 RETVAL->base_height = MIN_FONT_HEIGHT; 1040 RETVAL->base_height = MIN_FONT_HEIGHT;
929 RETVAL->font = 0; 1041 RETVAL->font = 0;
1042 RETVAL->rc = rc_alloc ();
930 1043
931 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1044 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
932 layout_update_font (RETVAL); 1045 layout_update_font (RETVAL);
933 OUTPUT: 1046 OUTPUT:
934 RETVAL 1047 RETVAL
935 1048
936void 1049void
937DESTROY (CFPlus::Layout self) 1050DESTROY (CFPlus::Layout self)
938 CODE: 1051 CODE:
939 g_object_unref (self->pl); 1052 g_object_unref (self->pl);
1053 rc_free (self->rc);
940 Safefree (self); 1054 Safefree (self);
941 1055
942void 1056void
943set_text (CFPlus::Layout self, SV *text_) 1057set_text (CFPlus::Layout self, SV *text_)
944 CODE: 1058 CODE:
1196 } 1310 }
1197} 1311}
1198 1312
1199void 1313void
1200render (CFPlus::Layout self, float x, float y, int flags = 0) 1314render (CFPlus::Layout self, float x, float y, int flags = 0)
1201 PPCODE: 1315 CODE:
1316 rc_clear (self->rc);
1202 pango_opengl_render_layout_subpixel ( 1317 pango_opengl_render_layout_subpixel (
1203 self->pl, 1318 self->pl,
1319 self->rc,
1204 x * PANGO_SCALE, y * PANGO_SCALE, 1320 x * PANGO_SCALE, y * PANGO_SCALE,
1205 self->r, self->g, self->b, self->a, 1321 self->r, self->g, self->b, self->a,
1206 flags 1322 flags
1207 ); 1323 );
1324 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl);
1327
1328void
1329draw (CFPlus::Layout self)
1330 CODE:
1331{
1332 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND);
1335 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1336 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1337 glEnable (GL_ALPHA_TEST);
1338 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1339
1340 rc_draw (self->rc);
1341
1342 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D);
1345}
1208 1346
1209MODULE = CFPlus PACKAGE = CFPlus::Texture 1347MODULE = CFPlus PACKAGE = CFPlus::Texture
1210 1348
1211void 1349PROTOTYPES: ENABLE
1212pad2pot (SV *data_, SV *w_, SV *h_)
1213 CODE:
1214{
1215 int ow = SvIV (w_);
1216 int oh = SvIV (h_);
1217 1350
1218 if (ow && oh) 1351int minpot (int n)
1352
1353void
1354pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE:
1356{
1357 if ((nw != ow || nh != oh) && SvOK (data_))
1219 { 1358 {
1220 int nw = minpot (ow);
1221 int nh = minpot (oh);
1222
1223 if (nw != ow || nh != oh)
1224 {
1225 if (SvOK (data_))
1226 {
1227 STRLEN datalen; 1359 STRLEN datalen;
1228 char *data = SvPVbyte (data_, datalen); 1360 char *data = SvPVbyte (data_, datalen);
1229 int bpp = datalen / (ow * oh); 1361 int bpp = datalen / (ow * oh);
1230 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1362 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1231 1363
1232 SvPOK_only (result_); 1364 SvPOK_only (result_);
1233 SvCUR_set (result_, nw * nh * bpp); 1365 SvCUR_set (result_, nw * nh * bpp);
1234 1366
1235 memset (SvPVX (result_), 0, nw * nh * bpp); 1367 memset (SvPVX (result_), 0, nw * nh * bpp);
1236 while (oh--) 1368 while (oh--)
1237 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1369 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1238 1370
1239 sv_setsv (data_, result_); 1371 sv_setsv (data_, result_);
1240 }
1241
1242 sv_setiv (w_, nw);
1243 sv_setiv (h_, nh);
1244 }
1245 } 1372 }
1246} 1373}
1247 1374
1248void 1375void
1249draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1376draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1255{ 1382{
1256 HV *hv = (HV *)SvRV (self); 1383 HV *hv = (HV *)SvRV (self);
1257 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1384 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1258 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1385 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1259 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1386 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1387
1388 if (name <= 0)
1389 XSRETURN_EMPTY;
1260 1390
1261 if (items < 5) 1391 if (items < 5)
1262 { 1392 {
1263 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1393 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1264 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1394 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1292 glDisable (GL_ALPHA_TEST); 1422 glDisable (GL_ALPHA_TEST);
1293 glDisable (GL_BLEND); 1423 glDisable (GL_BLEND);
1294 } 1424 }
1295} 1425}
1296 1426
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE:
1429{
1430 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1432 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1433 RETVAL = width > 0;
1434}
1435 OUTPUT:
1436 RETVAL
1437
1297MODULE = CFPlus PACKAGE = CFPlus::Map 1438MODULE = CFPlus PACKAGE = CFPlus::Map
1439
1440PROTOTYPES: DISABLE
1298 1441
1299CFPlus::Map 1442CFPlus::Map
1300new (SV *class) 1443new (SV *class)
1301 CODE: 1444 CODE:
1302 New (0, RETVAL, 1, struct map); 1445 New (0, RETVAL, 1, struct map);
1440 self->rows += MAP_EXTEND_Y; 1583 self->rows += MAP_EXTEND_Y;
1441 self->y += MAP_EXTEND_Y; 1584 self->y += MAP_EXTEND_Y;
1442 } 1585 }
1443} 1586}
1444 1587
1445void 1588SV *
1446map1a_update (CFPlus::Map self, SV *data_, int extmap) 1589map1a_update (CFPlus::Map self, SV *data_, int extmap)
1447 CODE: 1590 CODE:
1448{ 1591{
1449 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1450 uint8_t *data_end = (uint8_t *)SvEND (data_); 1593 uint8_t *data_end = (uint8_t *)SvEND (data_);
1451 mapcell *cell; 1594 mapcell *cell;
1452 int x, y, flags; 1595 int x, y, z, flags;
1596 AV *missing = newAV ();
1597 RETVAL = newRV_noinc ((SV *)missing);
1453 1598
1454 while (data < data_end - 1) 1599 while (data < data_end - 1)
1455 { 1600 {
1456 flags = (data [0] << 8) + data [1]; data += 2; 1601 flags = (data [0] << 8) + data [1]; data += 2;
1457 1602
1508 } 1653 }
1509 else 1654 else
1510 cell->darkness = *data++ + 1; 1655 cell->darkness = *data++ + 1;
1511 } 1656 }
1512 1657
1658 for (z = 0; z <= 2; ++z)
1513 if (flags & 4) 1659 if (flags & (4 >> z))
1514 { 1660 {
1515 faceid face = (data [0] << 8) + data [1]; data += 2; 1661 faceid face = (data [0] << 8) + data [1]; data += 2;
1516 need_facenum (self, face); 1662 need_facenum (self, face);
1517 cell->tile [0] = self->face2tile [face]; 1663 cell->tile [z] = self->face2tile [face];
1664
1665 if (cell->tile [z])
1666 {
1667 maptex *tex = self->tex + cell->tile [z];
1668 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z]));
1670
1671 if (tex->smoothtile)
1672 {
1673 maptex *smooth = self->tex + tex->smoothtile;
1674 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile));
1676 }
1677 }
1518 } 1678 }
1519
1520 if (flags & 2)
1521 {
1522 faceid face = (data [0] << 8) + data [1]; data += 2;
1523 need_facenum (self, face);
1524 cell->tile [1] = self->face2tile [face];
1525 }
1526
1527 if (flags & 1)
1528 {
1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [2] = self->face2tile [face];
1532 }
1533 } 1679 }
1534 else 1680 else
1535 cell->darkness = 0; 1681 cell->darkness = 0;
1536 } 1682 }
1537} 1683}
1684 OUTPUT:
1685 RETVAL
1538 1686
1539SV * 1687SV *
1540mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1541 CODE: 1689 CODE:
1542{ 1690{
1593 1741
1594void 1742void
1595draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1596 CODE: 1744 CODE:
1597{ 1745{
1746 int x, y, z;
1747
1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1600 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1750 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1601 smooth_key skey; 1751 smooth_key skey;
1602 int x, y, z; 1752
1603 int last_name; 1753 rc_t *rc = rc_alloc ();
1754 rc_key_t key;
1755 rc_array_t *arr;
1604 1756
1605 // thats current max. sorry. 1757 // thats current max. sorry.
1606 if (sw > 255) sw = 255; 1758 if (sw > 255) sw = 255;
1607 if (sh > 255) sh = 255; 1759 if (sh > 255) sh = 255;
1608 1760
1609 // clear key, in case of extra padding 1761 // clear key, in case of extra padding
1610 memset (&skey, 0, sizeof (skey)); 1762 memset (&skey, 0, sizeof (skey));
1611 1763
1612 glColor4ub (255, 255, 255, 255); 1764 memset (&key, 0, sizeof (key));
1613 1765 key.r = 255;
1614 glEnable (GL_BLEND); 1766 key.g = 255;
1615 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1767 key.b = 255;
1616 glEnable (GL_TEXTURE_2D); 1768 key.a = 255;
1617 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1769 key.mode = GL_QUADS;
1618 1770 key.format = GL_T2F_V3F;
1619 glBegin (GL_QUADS); 1771 key.texname = -1;
1620
1621 last_name = 0;
1622 1772
1623 mx += self->x; 1773 mx += self->x;
1624 my += self->y; 1774 my += self->y;
1625 1775
1626 // first pass: determine smooth_max 1776 // first pass: determine smooth_max
1642 MAX (self->tex [cell->tile [0]].smoothlevel, 1792 MAX (self->tex [cell->tile [0]].smoothlevel,
1643 MAX (self->tex [cell->tile [1]].smoothlevel, 1793 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel)); 1794 self->tex [cell->tile [2]].smoothlevel));
1645 } 1795 }
1646 } 1796 }
1797
1798 glEnable (GL_BLEND);
1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1647 1801
1648 for (z = 0; z <= 2; z++) 1802 for (z = 0; z <= 2; z++)
1649 { 1803 {
1650 memset (smooth_level, 0, sizeof (smooth_level)); 1804 memset (smooth_level, 0, sizeof (smooth_level));
1651 1805
1661 tileid tile = cell->tile [z]; 1815 tileid tile = cell->tile [z];
1662 1816
1663 if (tile) 1817 if (tile)
1664 { 1818 {
1665 maptex tex = self->tex [tile]; 1819 maptex tex = self->tex [tile];
1666 int px = (x + 1) * T - tex.w; 1820 int px, py;
1667 int py = (y + 1) * T - tex.h;
1668 1821
1669 // suppressing texture state switches here
1670 // is only moderately effective, but worth the extra effort
1671 if (last_name != tex.name) 1822 if (key.texname != tex.name)
1672 { 1823 {
1673 if (!tex.name) 1824 if (!tex.name)
1674 tex = self->tex [2]; /* missing, replace by noface */ 1825 tex = self->tex [2]; /* missing, replace by noface */
1675 1826
1676 glEnd (); 1827 key.texname = tex.name;
1677 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1828 arr = rc_array (rc, &key);
1678 glBegin (GL_QUADS);
1679 } 1829 }
1680 1830
1681 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1831 px = (x + 1) * T - tex.w;
1832 py = (y + 1) * T - tex.h;
1833
1834 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1682 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1835 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1683 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1836 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1684 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1837 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1685 1838
1686 if (cell->flags && z == 2) 1839 if (cell->flags && z == 2)
1687 { 1840 {
1841 // overlays such as the speech bubble, probably more to come
1688 if (cell->flags & 1) 1842 if (cell->flags & 1)
1689 { 1843 {
1690 maptex tex = self->tex [1]; 1844 maptex tex = self->tex [1];
1691 int px = x * T + T * 2 / 32; 1845 int px = x * T + T * 2 / 32;
1692 int py = y * T - T * 6 / 32; 1846 int py = y * T - T * 6 / 32;
1693 1847
1848 if (tex.name)
1694 glEnd (); 1849 {
1695 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1850 if (key.texname != tex.name)
1851 {
1852 key.texname = tex.name;
1853 arr = rc_array (rc, &key);
1854 }
1855
1856 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1696 glBegin (GL_QUADS); 1860 }
1697
1698 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702 } 1861 }
1703 } 1862 }
1704 1863
1705 // update smooth hash 1864 // update smooth hash
1706 if (tex.smoothtile) 1865 if (tex.smoothtile)
1742 } 1901 }
1743 } 1902 }
1744 } 1903 }
1745 } 1904 }
1746 1905
1906 rc_draw (rc);
1907 rc_clear (rc);
1908
1747 // go through all smoothlevels, lowest to highest, then draw. 1909 // go through all smoothlevels, lowest to highest, then draw.
1748 // this is basically counting sort 1910 // this is basically counting sort
1749 { 1911 {
1750 int w, b; 1912 int w, b;
1751 1913
1914 glEnable (GL_TEXTURE_2D);
1915 glBegin (GL_QUADS);
1752 for (w = 0; w < 256 / 32; ++w) 1916 for (w = 0; w < 256 / 32; ++w)
1753 { 1917 {
1754 uint32_t smask = smooth_level [w]; 1918 uint32_t smask = smooth_level [w];
1755 if (smask) 1919 if (smask)
1756 for (b = 0; b < 32; ++b) 1920 for (b = 0; b < 32; ++b)
1775 int border = bits & 15; 1939 int border = bits & 15;
1776 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1940 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777 float dx = tex.s * .0625f; // 16 images/row 1941 float dx = tex.s * .0625f; // 16 images/row
1778 float dy = tex.t * .5f ; // 2 images/column 1942 float dy = tex.t * .5f ; // 2 images/column
1779 1943
1780 // this time naively avoiding texture state changes
1781 // save gobs of state changes.
1782 if (last_name != tex.name) 1944 if (tex.name)
1783 { 1945 {
1946 // this time avoiding texture state changes
1947 // save gobs of state changes.
1784 if (!tex.name) 1948 if (key.texname != tex.name)
1785 continue; // smoothing not yet available 1949 {
1786
1787 glEnd (); 1950 glEnd ();
1788 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1951 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1789 glBegin (GL_QUADS); 1952 glBegin (GL_QUADS);
1790 } 1953 }
1791 1954
1792 if (border) 1955 if (border)
1793 { 1956 {
1794 float ox = border * dx; 1957 float ox = border * dx;
1795 1958
1796 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1959 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1797 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1960 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1798 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 1961 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1799 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 1962 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1800 } 1963 }
1801 1964
1802 if (corner) 1965 if (corner)
1803 { 1966 {
1804 float ox = corner * dx; 1967 float ox = corner * dx;
1805 1968
1806 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 1969 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1807 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 1970 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1808 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 1971 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1809 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 1972 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1973 }
1810 } 1974 }
1811 } 1975 }
1812 } 1976 }
1813 } 1977 }
1814 } 1978 }
1979
1980 glEnd ();
1981 glDisable (GL_TEXTURE_2D);
1982 key.texname = -1;
1815 } 1983 }
1816 1984
1817 hv_clear (smooth); 1985 hv_clear (smooth);
1818 } 1986 }
1819 1987
1820 glEnd ();
1821
1822 glDisable (GL_TEXTURE_2D);
1823 glDisable (GL_BLEND); 1988 glDisable (GL_BLEND);
1989 rc_free (rc);
1824 1990
1825 // top layer: overlays such as the health bar 1991 // top layer: overlays such as the health bar
1826 for (y = 0; y < sh; y++) 1992 for (y = 0; y < sh; y++)
1827 if (0 <= y + my && y + my < self->rows) 1993 if (0 <= y + my && y + my < self->rows)
1828 { 1994 {
1917void 2083void
1918fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2084fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1919 PPCODE: 2085 PPCODE:
1920{ 2086{
1921 int x, y; 2087 int x, y;
2088 int sw1 = sw + 2;
2089 int sh1 = sh + 2;
2090 int sh3 = sh * 3;
1922 int sw4 = (sw + 3) & ~3; 2091 int sw34 = (sw * 3 + 3) & ~3;
2092 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1923 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2093 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1924 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2094 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1925 2095
1926 memset (darkness, 255, sw4 * sh);
1927 SvPOK_only (darkness_sv); 2096 SvPOK_only (darkness3_sv);
1928 SvCUR_set (darkness_sv, sw4 * sh); 2097 SvCUR_set (darkness3_sv, sw34 * sh3);
1929 2098
1930 mx += self->x; 2099 mx += self->x - 1;
1931 my += self->y; 2100 my += self->y - 1;
1932 2101
2102 memset (darkness1, 255, sw1 * sh1);
2103
1933 for (y = 0; y < sh; y++) 2104 for (y = 0; y < sh1; y++)
1934 if (0 <= y + my && y + my < self->rows) 2105 if (0 <= y + my && y + my < self->rows)
1935 { 2106 {
1936 maprow *row = self->row + (y + my); 2107 maprow *row = self->row + (y + my);
1937 2108
1938 for (x = 0; x < sw; x++) 2109 for (x = 0; x < sw1; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1) 2110 if (row->c0 <= x + mx && x + mx < row->c1)
1940 { 2111 {
1941 mapcell *cell = row->col + (x + mx - row->c0); 2112 mapcell *cell = row->col + (x + mx - row->c0);
1942 2113
1943 darkness[y * sw4 + x] = cell->darkness 2114 darkness1 [y * sw1 + x] = cell->darkness
1944 ? 255 - (cell->darkness - 1) 2115 ? 255 - (cell->darkness - 1)
1945 : 255 - FOW_DARKNESS; 2116 : 255 - FOW_DARKNESS;
1946 } 2117 }
1947 } 2118 }
1948 2119
2120 for (y = 0; y < sh; ++y)
2121 for (x = 0; x < sw; ++x)
2122 {
2123 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2124 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2125 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2126 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2127 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2128 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2129 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2130 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2131 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2132
2133 uint8_t r11 = (d11 + d21 + d12) / 3;
2134 uint8_t r21 = d21;
2135 uint8_t r31 = (d21 + d31 + d32) / 3;
2136
2137 uint8_t r12 = d12;
2138 uint8_t r22 = d22;
2139 uint8_t r32 = d32;
2140
2141 uint8_t r13 = (d13 + d23 + d12) / 3;
2142 uint8_t r23 = d23;
2143 uint8_t r33 = (d23 + d33 + d32) / 3;
2144
2145 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2146 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2147 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2148 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2149 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2150 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2151 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2152 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2153 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2154 }
2155
2156 free (darkness1);
2157
1949 EXTEND (SP, 3); 2158 EXTEND (SP, 3);
1950 PUSHs (sv_2mortal (newSViv (sw4))); 2159 PUSHs (sv_2mortal (newSViv (sw34)));
1951 PUSHs (sv_2mortal (newSViv (sh))); 2160 PUSHs (sv_2mortal (newSViv (sh3)));
1952 PUSHs (darkness_sv); 2161 PUSHs (darkness3_sv);
1953} 2162}
1954 2163
1955SV * 2164SV *
1956get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2165get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1957 CODE: 2166 CODE:
2034 int x, y, z; 2243 int x, y, z;
2035 int w, h; 2244 int w, h;
2036 int x1, y1; 2245 int x1, y1;
2037 2246
2038 if (*data++ != 0) 2247 if (*data++ != 0)
2039 return; /* version mismatch */ 2248 XSRETURN_EMPTY; /* version mismatch */
2040 2249
2041 w = *data++ << 8; w |= *data++; 2250 w = *data++ << 8; w |= *data++;
2042 h = *data++ << 8; h |= *data++; 2251 h = *data++ << 8; h |= *data++;
2043 2252
2044 // we need to do this 'cause we don't keep an absolute coord system for rows 2253 // we need to do this 'cause we don't keep an absolute coord system for rows
2089 } 2298 }
2090 } 2299 }
2091 } 2300 }
2092} 2301}
2093 2302
2303MODULE = CFPlus PACKAGE = CFPlus::RW
2304
2305CFPlus::RW
2306new (SV *class, SV *data_sv)
2307 CODE:
2308{
2309 STRLEN datalen;
2310 char *data = SvPVbyte (data_sv, datalen);
2311
2312 RETVAL = SDL_RWFromConstMem (data, datalen);
2313}
2314 OUTPUT:
2315 RETVAL
2316
2317CFPlus::RW
2318new_from_file (SV *class, const char *path, const char *mode = "rb")
2319 CODE:
2320 RETVAL = SDL_RWFromFile (path, mode);
2321 OUTPUT:
2322 RETVAL
2323
2324# fails on win32:
2325# CFPlus.xs(2268) : error C2059: syntax error : '('
2326#void
2327#close (CFPlus::RW self)
2328# CODE:
2329# (self->(close)) (self);
2330
2331MODULE = CFPlus PACKAGE = CFPlus::Channel
2332
2333PROTOTYPES: DISABLE
2334
2335CFPlus::Channel
2336find ()
2337 CODE:
2338{
2339 RETVAL = Mix_GroupAvailable (-1);
2340
2341 if (RETVAL < 0)
2342 {
2343 RETVAL = Mix_GroupOldest (-1);
2344
2345 if (RETVAL < 0)
2346 XSRETURN_UNDEF;
2347
2348 Mix_HaltChannel (RETVAL);
2349 }
2350
2351 Mix_UnregisterAllEffects (RETVAL);
2352 Mix_Volume (RETVAL, 128);
2353}
2354 OUTPUT:
2355 RETVAL
2356
2357void
2358halt (CFPlus::Channel self)
2359 CODE:
2360 Mix_HaltChannel (self);
2361
2362void
2363expire (CFPlus::Channel self, int ticks = -1)
2364 CODE:
2365 Mix_ExpireChannel (self, ticks);
2366
2367void
2368fade_out (CFPlus::Channel self, int ticks = -1)
2369 CODE:
2370 Mix_FadeOutChannel (self, ticks);
2371
2372int
2373volume (CFPlus::Channel self, int volume)
2374 CODE:
2375 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376 OUTPUT:
2377 RETVAL
2378
2379void
2380unregister_all_effects (CFPlus::Channel self)
2381 CODE:
2382 Mix_UnregisterAllEffects (self);
2383
2384void
2385set_panning (CFPlus::Channel self, int left, int right)
2386 CODE:
2387 left = CLAMP (left , 0, 255);
2388 right = CLAMP (right, 0, 255);
2389 Mix_SetPanning (self, left, right);
2390
2391void
2392set_distance (CFPlus::Channel self, int distance)
2393 CODE:
2394 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395
2396void
2397set_position (CFPlus::Channel self, int angle, int distance)
2398 CODE:
2399
2400void
2401set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2402 CODE:
2403{
2404 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2406 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407}
2408
2409void
2410set_reverse_stereo (CFPlus::Channel self, int flip)
2411 CODE:
2412 Mix_SetReverseStereo (self, flip);
2413
2094MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2414MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2095 2415
2416PROTOTYPES: DISABLE
2417
2096CFPlus::MixChunk 2418CFPlus::MixChunk
2097new_from_file (SV *class, char *path) 2419new (SV *class, CFPlus::RW rwops)
2098 CODE: 2420 CODE:
2099 RETVAL = Mix_LoadWAV (path); 2421 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2100 OUTPUT: 2422 OUTPUT:
2101 RETVAL 2423 RETVAL
2102 2424
2103void 2425void
2104DESTROY (CFPlus::MixChunk self) 2426DESTROY (CFPlus::MixChunk self)
2106 Mix_FreeChunk (self); 2428 Mix_FreeChunk (self);
2107 2429
2108int 2430int
2109volume (CFPlus::MixChunk self, int volume = -1) 2431volume (CFPlus::MixChunk self, int volume = -1)
2110 CODE: 2432 CODE:
2433 if (items > 1)
2434 volume = CLAMP (volume, 0, 128);
2111 RETVAL = Mix_VolumeChunk (self, volume); 2435 RETVAL = Mix_VolumeChunk (self, volume);
2112 OUTPUT: 2436 OUTPUT:
2113 RETVAL 2437 RETVAL
2114 2438
2115int 2439CFPlus::Channel
2116play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2440play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2117 CODE: 2441 CODE:
2442{
2118 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2443 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444
2445 if (RETVAL < 0)
2446 XSRETURN_UNDEF;
2447
2448 if (channel < 0)
2449 {
2450 Mix_UnregisterAllEffects (RETVAL);
2451 Mix_Volume (RETVAL, 128);
2452 }
2453}
2119 OUTPUT: 2454 OUTPUT:
2120 RETVAL 2455 RETVAL
2121 2456
2122MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2457MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2123 2458
2124int 2459int
2125volume (int volume = -1) 2460volume (int volume = -1)
2461 PROTOTYPE: ;$
2126 CODE: 2462 CODE:
2463 if (items > 0)
2464 volume = CLAMP (volume, 0, 128);
2127 RETVAL = Mix_VolumeMusic (volume); 2465 RETVAL = Mix_VolumeMusic (volume);
2128 OUTPUT: 2466 OUTPUT:
2129 RETVAL 2467 RETVAL
2130 2468
2469void
2470fade_out (int ms)
2471 CODE:
2472 Mix_FadeOutMusic (ms);
2473
2474void
2475halt ()
2476 CODE:
2477 Mix_HaltMusic ();
2478
2131CFPlus::MixMusic 2479CFPlus::MixMusic
2132new_from_file (SV *class, char *path) 2480new (SV *class, CFPlus::RW rwops)
2133 CODE: 2481 CODE:
2134 RETVAL = Mix_LoadMUS (path); 2482 RETVAL = Mix_LoadMUS_RW (rwops);
2135 OUTPUT: 2483 OUTPUT:
2136 RETVAL 2484 RETVAL
2137 2485
2138void 2486void
2139DESTROY (CFPlus::MixMusic self) 2487DESTROY (CFPlus::MixMusic self)
2145 CODE: 2493 CODE:
2146 RETVAL = Mix_PlayMusic (self, loops); 2494 RETVAL = Mix_PlayMusic (self, loops);
2147 OUTPUT: 2495 OUTPUT:
2148 RETVAL 2496 RETVAL
2149 2497
2498void
2499fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2500 CODE:
2501 Mix_FadeInMusicPos (self, loops, ms, position);
2502
2150MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2503MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2504
2505PROTOTYPES: ENABLE
2151 2506
2152BOOT: 2507BOOT:
2153{ 2508{
2154 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2509 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2155 static const struct { 2510 static const struct {
2156 const char *name; 2511 const char *name;
2157 IV iv; 2512 IV iv;
2158 } *civ, const_iv[] = { 2513 } *civ, const_iv[] = {
2159# define const_iv(name) { # name, (IV)name } 2514# define const_iv(name) { # name, (IV)name }
2515 const_iv (GL_VENDOR),
2516 const_iv (GL_VERSION),
2517 const_iv (GL_EXTENSIONS),
2160 const_iv (GL_COLOR_MATERIAL), 2518 const_iv (GL_COLOR_MATERIAL),
2161 const_iv (GL_SMOOTH), 2519 const_iv (GL_SMOOTH),
2162 const_iv (GL_FLAT), 2520 const_iv (GL_FLAT),
2163 const_iv (GL_DITHER), 2521 const_iv (GL_DITHER),
2164 const_iv (GL_BLEND), 2522 const_iv (GL_BLEND),
2168 const_iv (GL_ALPHA_TEST), 2526 const_iv (GL_ALPHA_TEST),
2169 const_iv (GL_NORMALIZE), 2527 const_iv (GL_NORMALIZE),
2170 const_iv (GL_RESCALE_NORMAL), 2528 const_iv (GL_RESCALE_NORMAL),
2171 const_iv (GL_FRONT), 2529 const_iv (GL_FRONT),
2172 const_iv (GL_BACK), 2530 const_iv (GL_BACK),
2531 const_iv (GL_AUX0),
2173 const_iv (GL_AND), 2532 const_iv (GL_AND),
2174 const_iv (GL_ONE), 2533 const_iv (GL_ONE),
2175 const_iv (GL_ZERO), 2534 const_iv (GL_ZERO),
2176 const_iv (GL_SRC_ALPHA), 2535 const_iv (GL_SRC_ALPHA),
2177 const_iv (GL_DST_ALPHA), 2536 const_iv (GL_DST_ALPHA),
2191 const_iv (GL_LUMINANCE), 2550 const_iv (GL_LUMINANCE),
2192 const_iv (GL_LUMINANCE_ALPHA), 2551 const_iv (GL_LUMINANCE_ALPHA),
2193 const_iv (GL_FLOAT), 2552 const_iv (GL_FLOAT),
2194 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2553 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2195 const_iv (GL_COMPILE), 2554 const_iv (GL_COMPILE),
2555 const_iv (GL_PROXY_TEXTURE_1D),
2556 const_iv (GL_PROXY_TEXTURE_2D),
2196 const_iv (GL_TEXTURE_1D), 2557 const_iv (GL_TEXTURE_1D),
2197 const_iv (GL_TEXTURE_2D), 2558 const_iv (GL_TEXTURE_2D),
2198 const_iv (GL_TEXTURE_ENV), 2559 const_iv (GL_TEXTURE_ENV),
2199 const_iv (GL_TEXTURE_MAG_FILTER), 2560 const_iv (GL_TEXTURE_MAG_FILTER),
2200 const_iv (GL_TEXTURE_MIN_FILTER), 2561 const_iv (GL_TEXTURE_MIN_FILTER),
2221 const_iv (GL_COLOR_LOGIC_OP), 2582 const_iv (GL_COLOR_LOGIC_OP),
2222 const_iv (GL_SEPARABLE_2D), 2583 const_iv (GL_SEPARABLE_2D),
2223 const_iv (GL_CONVOLUTION_2D), 2584 const_iv (GL_CONVOLUTION_2D),
2224 const_iv (GL_CONVOLUTION_BORDER_MODE), 2585 const_iv (GL_CONVOLUTION_BORDER_MODE),
2225 const_iv (GL_CONSTANT_BORDER), 2586 const_iv (GL_CONSTANT_BORDER),
2587 const_iv (GL_POINTS),
2226 const_iv (GL_LINES), 2588 const_iv (GL_LINES),
2227 const_iv (GL_LINE_STRIP), 2589 const_iv (GL_LINE_STRIP),
2228 const_iv (GL_LINE_LOOP), 2590 const_iv (GL_LINE_LOOP),
2229 const_iv (GL_QUADS), 2591 const_iv (GL_QUADS),
2230 const_iv (GL_QUAD_STRIP), 2592 const_iv (GL_QUAD_STRIP),
2231 const_iv (GL_TRIANGLES), 2593 const_iv (GL_TRIANGLES),
2232 const_iv (GL_TRIANGLE_STRIP), 2594 const_iv (GL_TRIANGLE_STRIP),
2233 const_iv (GL_TRIANGLE_FAN), 2595 const_iv (GL_TRIANGLE_FAN),
2596 const_iv (GL_POLYGON),
2234 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2597 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598 const_iv (GL_POINT_SMOOTH_HINT),
2599 const_iv (GL_LINE_SMOOTH_HINT),
2600 const_iv (GL_POLYGON_SMOOTH_HINT),
2601 const_iv (GL_GENERATE_MIPMAP_HINT),
2235 const_iv (GL_FASTEST), 2602 const_iv (GL_FASTEST),
2603 const_iv (GL_DONT_CARE),
2604 const_iv (GL_NICEST),
2236 const_iv (GL_V2F), 2605 const_iv (GL_V2F),
2237 const_iv (GL_V3F), 2606 const_iv (GL_V3F),
2238 const_iv (GL_T2F_V3F), 2607 const_iv (GL_T2F_V3F),
2239 const_iv (GL_T2F_N3F_V3F), 2608 const_iv (GL_T2F_N3F_V3F),
2240# undef const_iv 2609# undef const_iv
2266 CODE: 2635 CODE:
2267 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2636 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2268 OUTPUT: 2637 OUTPUT:
2269 RETVAL 2638 RETVAL
2270 2639
2640const char *glGetString (GLenum pname)
2641
2642GLint glGetInteger (GLenum pname)
2643 CODE:
2644 glGetIntegerv (pname, &RETVAL);
2645 OUTPUT:
2646 RETVAL
2647
2648GLdouble glGetDouble (GLenum pname)
2649 CODE:
2650 glGetDoublev (pname, &RETVAL);
2651 OUTPUT:
2652 RETVAL
2653
2271int glGetError () 2654int glGetError ()
2272 2655
2273void glFinish () 2656void glFinish ()
2274 2657
2275void glClear (int mask) 2658void glClear (int mask)
2312# near_ and far_ are due to microsofts buggy "c" compiler 2695# near_ and far_ are due to microsofts buggy "c" compiler
2313void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2696void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2314 2697
2315# near_ and far_ are due to microsofts buggy "c" compiler 2698# near_ and far_ are due to microsofts buggy "c" compiler
2316void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2699void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2700
2701PROTOTYPES: DISABLE
2317 2702
2318void glViewport (int x, int y, int width, int height) 2703void glViewport (int x, int y, int width, int height)
2319 2704
2320void glScissor (int x, int y, int width, int height) 2705void glScissor (int x, int y, int width, int height)
2321 2706
2329 2714
2330void glRotate (float angle, float x, float y, float z) 2715void glRotate (float angle, float x, float y, float z)
2331 CODE: 2716 CODE:
2332 glRotatef (angle, x, y, z); 2717 glRotatef (angle, x, y, z);
2333 2718
2334void glBegin (int mode)
2335
2336void glEnd ()
2337
2338void glColor (float r, float g, float b, float a = 1.0) 2719void glColor (float r, float g, float b, float a = 1.0)
2339 PROTOTYPE: @
2340 ALIAS: 2720 ALIAS:
2341 glColor_premultiply = 1 2721 glColor_premultiply = 1
2342 CODE: 2722 CODE:
2343 if (ix) 2723 if (ix)
2344 { 2724 {
2347 b *= a; 2727 b *= a;
2348 } 2728 }
2349 // microsoft visual "c" rounds instead of truncating... 2729 // microsoft visual "c" rounds instead of truncating...
2350 glColor4f (r, g, b, a); 2730 glColor4f (r, g, b, a);
2351 2731
2352void glInterleavedArrays (int format, int stride, char *data)
2353
2354void glDrawElements (int mode, int count, int type, char *indices)
2355
2356# 1.2 void glDrawRangeElements (int mode, int start, int end
2357
2358void glRasterPos (float x, float y, float z = 0.) 2732void glRasterPos (float x, float y, float z = 0.)
2359 CODE: 2733 CODE:
2360 glRasterPos3f (0, 0, z); 2734 glRasterPos3f (0, 0, z);
2361 glBitmap (0, 0, 0, 0, x, y, 0); 2735 glBitmap (0, 0, 0, 0, x, y, 0);
2362 2736
2366 2740
2367void glTexCoord (float s, float t) 2741void glTexCoord (float s, float t)
2368 CODE: 2742 CODE:
2369 glTexCoord2f (s, t); 2743 glTexCoord2f (s, t);
2370 2744
2745void glRect (float x1, float y1, float x2, float y2)
2746 CODE:
2747 glRectf (x1, y1, x2, y2);
2748
2749PROTOTYPES: ENABLE
2750
2751void glBegin (int mode)
2752
2753void glEnd ()
2754
2755void glPointSize (GLfloat size)
2756
2757void glLineWidth (GLfloat width)
2758
2759void glInterleavedArrays (int format, int stride, char *data)
2760
2761void glDrawElements (int mode, int count, int type, char *indices)
2762
2763# 1.2 void glDrawRangeElements (int mode, int start, int end
2764
2371void glTexEnv (int target, int pname, float param) 2765void glTexEnv (int target, int pname, float param)
2372 CODE: 2766 CODE:
2373 glTexEnvf (target, pname, param); 2767 glTexEnvf (target, pname, param);
2374 2768
2375void glTexParameter (int target, int pname, float param) 2769void glTexParameter (int target, int pname, float param)
2396void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2790void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
2397 2791
2398void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2792void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2399 2793
2400void glDrawPixels (int width, int height, int format, int type, char *pixels) 2794void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795
2796void glPixelZoom (float x, float y)
2401 2797
2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2798void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2403 2799
2404int glGenTexture () 2800int glGenTexture ()
2405 CODE: 2801 CODE:
2425 2821
2426void glEndList () 2822void glEndList ()
2427 2823
2428void glCallList (int list) 2824void glCallList (int list)
2429 2825
2826MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2827
2828PROTOTYPES: DISABLE
2829
2830void
2831find_widget (SV *self, NV x, NV y)
2832 PPCODE:
2833{
2834 if (within_widget (self, x, y))
2835 XPUSHs (self);
2836}
2837
2838BOOT:
2839{
2840 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2841
2842 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2843 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2844 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2845 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2846}
2847
2848void
2849draw (SV *self)
2850 CODE:
2851{
2852 HV *hv;
2853 SV **svp;
2854 NV x, y, w, h;
2855 SV *draw_x_sv = GvSV (draw_x_gv);
2856 SV *draw_y_sv = GvSV (draw_y_gv);
2857 SV *draw_w_sv = GvSV (draw_w_gv);
2858 SV *draw_h_sv = GvSV (draw_h_gv);
2859 double draw_x, draw_y;
2860
2861 if (!SvROK (self))
2862 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2863
2864 hv = (HV *)SvRV (self);
2865
2866 if (SvTYPE (hv) != SVt_PVHV)
2867 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2868
2869 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2870 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2871
2872 if (!h || !w)
2873 XSRETURN_EMPTY;
2874
2875 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2876 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2877
2878 draw_x = SvNV (draw_x_sv) + x;
2879 draw_y = SvNV (draw_y_sv) + y;
2880
2881 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2882 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2883 XSRETURN_EMPTY;
2884
2885 sv_setnv (draw_x_sv, draw_x);
2886 sv_setnv (draw_y_sv, draw_y);
2887
2888 glPushMatrix ();
2889 glTranslated (x, y, 0);
2890
2891 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2892 {
2893 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2894
2895 if (svp && SvTRUE (*svp))
2896 {
2897 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2898 glEnable (GL_BLEND);
2899 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2900 glBegin (GL_QUADS);
2901 glVertex2f (0, 0);
2902 glVertex2f (w, 0);
2903 glVertex2f (w, h);
2904 glVertex2f (0, h);
2905 glEnd ();
2906 glDisable (GL_BLEND);
2907 }
2908 }
2909#if 0
2910 if ($ENV{CFPLUS_DEBUG} & 1) {
2911 glPushMatrix;
2912 glColor 1, 1, 0, 1;
2913 glTranslate 0.375, 0.375;
2914 glBegin GL_LINE_LOOP;
2915 glVertex 0 , 0;
2916 glVertex $self->{w} - 1, 0;
2917 glVertex $self->{w} - 1, $self->{h} - 1;
2918 glVertex 0 , $self->{h} - 1;
2919 glEnd;
2920 glPopMatrix;
2921 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2922 }
2923#endif
2924 PUSHMARK (SP);
2925 XPUSHs (self);
2926 PUTBACK;
2927 call_method ("_draw", G_VOID | G_DISCARD);
2928 SPAGAIN;
2929
2930 glPopMatrix ();
2931
2932 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2933 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2934}
2935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines