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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
40#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
41 46
42#include <glib/gmacros.h> 47#include <glib/gmacros.h>
43 48
44#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
45 61
46#ifndef _WIN32 62#ifndef _WIN32
47# include <sys/types.h> 63# include <sys/types.h>
48# include <sys/socket.h> 64# include <sys/socket.h>
49# include <netinet/in.h> 65# include <netinet/in.h>
50# include <netinet/tcp.h> 66# include <netinet/tcp.h>
51# include <inttypes.h> 67# include <inttypes.h>
52#endif 68#endif
53 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
54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55 80
56#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
57 82
58#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
60 85
61#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
62 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
63#if 0 91#if 1
64# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
65#else 93#else
66# define PARACHUTE 0 94# define PARACHUTE 0
67#endif 95#endif
68 96
109 av_push (texture_av, (SV *)(size_t)name); 137 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 138 glDeleteTextures (1, &name);
111} 139}
112 140
113#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
114 143
115#include "pango-font.c" 144#include "pango-font.c"
116#include "pango-fontmap.c" 145#include "pango-fontmap.c"
117#include "pango-render.c" 146#include "pango-render.c"
118 147
119typedef IV CFPlus__Channel; 148typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 149typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
123 152
124typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
125 154
126static int 155static int
127shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
128{ 157{
129 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
143 172
144typedef struct cf_layout { 173typedef struct cf_layout {
145 PangoLayout *pl; 174 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
147 int base_height; 176 int base_height;
148 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
149} *CFPlus__Layout; 179} *DC__Layout;
150 180
151static CFPlus__Font default_font; 181static DC__Font default_font;
152static PangoContext *opengl_context; 182static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
154 184
155static void 185static void
156substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
161#endif 191#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 193}
164 194
165static void 195static void
166layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
167{ 197{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 198 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
170 */ 200 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
172 202
173 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
174 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175 205
176 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
177} 207}
178 208
179static void 209static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 211{
182 PangoRectangle rect; 212 PangoRectangle rect;
183 213
184 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
196 226
197typedef uint16_t tileid; 227typedef uint16_t tileid;
198typedef uint16_t faceid; 228typedef uint16_t faceid;
199 229
200typedef struct { 230typedef struct {
201 int name; 231 GLuint name;
202 int w, h; 232 int w, h;
203 float s, t; 233 float s, t;
204 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
205 tileid smoothtile; 235 tileid smoothtile;
206 uint8_t smoothlevel; 236 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
226 256
227 int32_t rows; 257 int32_t rows;
228 maprow *row; 258 maprow *row;
229} *CFPlus__Map; 259} *DC__Map;
230 260
231static char * 261static char *
232prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
233{ 263{
234 char *p; 264 char *p;
272 self->texs *= 2; 302 self->texs *= 2;
273 } 303 }
274} 304}
275 305
276static maprow * 306static maprow *
277map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
278{ 308{
279 if (0 > y) 309 if (0 > y)
280 { 310 {
281 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
320 350
321 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
322} 352}
323 353
324static mapcell * 354static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
326{ 356{
327 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
328} 358}
329 359
330static void 360static void
331map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
332{ 362{
333 int r; 363 int r;
334 364
335 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
344 self->row = 0; 374 self->row = 0;
345 self->rows = 0; 375 self->rows = 0;
346} 376}
347 377
348static void 378static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 379map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 380{
351 int x, y; 381 int x, y;
352 maprow *row; 382 maprow *row;
353 mapcell *cell; 383 mapcell *cell;
354 384
433 n |= n >> 16; 463 n |= n >> 16;
434 464
435 return n + 1; 465 return n + 1;
436} 466}
437 467
468static unsigned int
469popcount (unsigned int n)
470{
471 n -= (n >> 1) & 0x55555555U;
472 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
473 n = ((n >> 4) + n) & 0x0f0f0f0fU;
474 n *= 0x01010101U;
475
476 return n >> 24;
477}
478
438/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
441 482
442/******************************************************************************/ 483/******************************************************************************/
480 return 0; 521 return 0;
481 522
482 return 1; 523 return 1;
483} 524}
484 525
485MODULE = CFPlus PACKAGE = CFPlus 526MODULE = Deliantra::Client PACKAGE = DC
486 527
487PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
488 529
489BOOT: 530BOOT:
490{ 531{
491 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 533 static const struct {
493 const char *name; 534 const char *name;
494 IV iv; 535 IV iv;
495 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
518 559
519 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
522 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 649# undef const_iv
605 }; 650 };
606 651
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 671
627NV floor (NV x) 672NV floor (NV x)
628 673
629NV ceil (NV x) 674NV ceil (NV x)
630 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
631void 680void
632pango_init () 681pango_init ()
633 CODE: 682 CODE:
634{ 683{
635 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 685 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 686 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
687 /*pango_context_set_font_description (opengl_context, default_font);*/
688#if PANGO_VERSION_CHECK (1, 15, 2)
689 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif
638} 692}
639 693
640char * 694char *
641SDL_GetError () 695SDL_GetError ()
642 696
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 729
676 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
677 while (*m) 731 while (*m)
678 { 732 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 734 {
681 AV *av = newAV (); 735 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
708 762
709 if (RETVAL) 763 if (RETVAL)
710 { 764 {
711 av_clear (texture_av); 765 av_clear (texture_av);
712 766
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 769#include "glfunc.h"
716#undef GL_FUNC 770#undef GL_FUNC
717 } 771 }
718} 772}
725char * 779char *
726SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
727 781
728int 782int
729SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
730 787
731void 788void
732poll_events () 789poll_events ()
733 PPCODE: 790 PPCODE:
734{ 791{
744 { 801 {
745 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
746 case SDL_KEYUP: 803 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 809 break;
753 810
754 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 830 x = ev.motion.x;
774 y = ev.motion.y; 831 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 833 }
777 834
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 841 }
785 break; 842 break;
786 843
787 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 847
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 858 break;
802 } 859 }
803 860
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 862 }
806} 863}
807 864
808int 865int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 867 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 869 Mix_ChannelFinished (channel_finished);
813 870
814void 871void
872Mix_QuerySpec ()
873 PPCODE:
874{
875 int freq, channels;
876 Uint16 format;
877
878 if (Mix_QuerySpec (&freq, &format, &channels))
879 {
880 EXTEND (SP, 3);
881 PUSHs (sv_2mortal (newSViv (freq)));
882 PUSHs (sv_2mortal (newSViv (format)));
883 PUSHs (sv_2mortal (newSViv (channels)));
884 }
885}
886
887void
815Mix_CloseAudio () 888Mix_CloseAudio ()
816 889
817int 890int
818Mix_AllocateChannels (int numchans = -1) 891Mix_AllocateChannels (int numchans = -1)
892
893const char *
894Mix_GetError ()
819 895
820void 896void
821lowdelay (int fd, int val = 1) 897lowdelay (int fd, int val = 1)
822 CODE: 898 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 899 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
849 } 925 }
850 } 926 }
851#endif 927#endif
852} 928}
853 929
854void 930int
855add_font (char *file) 931add_font (char *file)
856 CODE: 932 CODE:
857 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
858 936
859void 937void
860load_image_inline (SV *image_) 938load_image_inline (SV *image_)
861 ALIAS: 939 ALIAS:
862 load_image_file = 1 940 load_image_file = 1
948void 1026void
949error (char *message) 1027error (char *message)
950 CODE: 1028 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1030#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1032#endif
955 1033
956void 1034void
957fatal (char *message) 1035fatal (char *message)
958 CODE: 1036 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1038#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1040#endif
963 _exit (1); 1041 _exit (1);
964 1042
965void 1043void
966_exit (int retval = 0) 1044_exit (int retval = 0)
978#if DEBUG 1056#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
980#endif 1058#endif
981} 1059}
982 1060
983MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
984 1062
985PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
986 1064
987CFPlus::Font 1065DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1067 CODE:
990{ 1068{
991 int count; 1069 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1073}
996 OUTPUT: 1074 OUTPUT:
997 RETVAL 1075 RETVAL
998 1076
999void 1077void
1000DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
1001 CODE: 1079 CODE:
1002 pango_font_description_free (self); 1080 pango_font_description_free (self);
1003 1081
1004void 1082void
1005make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1006 PROTOTYPE: $ 1084 PROTOTYPE: $
1007 CODE: 1085 CODE:
1008 default_font = self; 1086 default_font = self;
1009 1087
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1089
1012PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1013 1091
1014void 1092void
1015reset_glyph_cache () 1093glyph_cache_backup ()
1016 PROTOTYPE: 1094 PROTOTYPE:
1017 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1018 tc_clear (); 1102 tc_restore ();
1019 1103
1020CFPlus::Layout 1104DC::Layout
1021new (SV *class) 1105new (SV *class)
1022 CODE: 1106 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1024 1108
1025 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1032 1117
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1035 OUTPUT: 1120 OUTPUT:
1036 RETVAL 1121 RETVAL
1037 1122
1038void 1123void
1039DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1040 CODE: 1125 CODE:
1041 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
1042 Safefree (self); 1128 Safefree (self);
1043 1129
1044void 1130void
1045set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1046 CODE: 1132 CODE:
1047{ 1133{
1048 STRLEN textlen; 1134 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1050 1136
1051 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1052} 1138}
1053 1139
1054void 1140void
1055set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1056 CODE: 1142 CODE:
1057{ 1143{
1058 STRLEN textlen; 1144 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1060 1146
1061 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1062} 1148}
1063 1149
1064void 1150void
1065set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1066 CODE: 1152 CODE:
1067{ 1153{
1068 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1156 const char *pos = text;
1105 if (attrs) 1191 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1107} 1193}
1108 1194
1109void 1195void
1110get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1111 PPCODE: 1197 PPCODE:
1112{ 1198{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1200
1115 do 1201 do
1116 { 1202 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1204
1119 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1120 { 1206 {
1121 PangoRectangle extents; 1207 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1216
1131 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1132} 1218}
1133 1219
1134int 1220int
1135has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1136 CODE: 1222 CODE:
1137{ 1223{
1138 int lines = 1; 1224 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1140 1226
1145} 1231}
1146 OUTPUT: 1232 OUTPUT:
1147 RETVAL 1233 RETVAL
1148 1234
1149SV * 1235SV *
1150get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1151 CODE: 1237 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1240 OUTPUT:
1155 RETVAL 1241 RETVAL
1156 1242
1157void 1243void
1158set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1244set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159 CODE: 1245 CODE:
1160 self->r = r; 1246 self->r = r;
1161 self->g = g; 1247 self->g = g;
1162 self->b = b; 1248 self->b = b;
1163 self->a = a; 1249 self->a = a;
1164 1250
1165void 1251void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1253 CODE:
1168 if (self->font != font) 1254 if (self->font != font)
1169 { 1255 {
1170 self->font = font; 1256 self->font = font;
1171 layout_update_font (self); 1257 layout_update_font (self);
1172 } 1258 }
1173 1259
1174void 1260void
1175set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1176 CODE: 1262 CODE:
1177 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1178 { 1264 {
1179 self->base_height = base_height; 1265 self->base_height = base_height;
1180 layout_update_font (self); 1266 layout_update_font (self);
1181 } 1267 }
1182 1268
1183void 1269void
1184set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1271 CODE:
1186 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1272 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187 1273
1188void 1274void
1189set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1190 CODE: 1276 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1278
1193void 1279void
1194set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1195 CODE: 1281 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1283
1198void 1284void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1286 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1206 ); 1292 );
1207 1293
1208void 1294void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1296 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1298
1213void 1299void
1214size (CFPlus::Layout self) 1300size (DC::Layout self)
1215 PPCODE: 1301 PPCODE:
1216{ 1302{
1217 int w, h; 1303 int w, h;
1218 1304
1219 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1224} 1310}
1225 1311
1226int 1312int
1227descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1228 CODE: 1314 CODE:
1229{ 1315{
1230 PangoRectangle rect; 1316 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1234} 1320}
1235 OUTPUT: 1321 OUTPUT:
1236 RETVAL 1322 RETVAL
1237 1323
1238int 1324int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1326 CODE:
1241{ 1327{
1242 int index, trailing; 1328 int index, trailing;
1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1329 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1245} 1331}
1246 OUTPUT: 1332 OUTPUT:
1247 RETVAL 1333 RETVAL
1248 1334
1249void 1335void
1250cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1337 PPCODE:
1252{ 1338{
1253 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1341
1256 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1346}
1261 1347
1262void 1348void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1350 PPCODE:
1265{ 1351{
1266 int line, x; 1352 int line, x;
1267 1353
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1354 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1355#if !PANGO_VERSION_CHECK (1, 17, 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1357 --line;
1358#endif
1271 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1362}
1275 1363
1276void 1364void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1366 PPCODE:
1279{ 1367{
1280 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1281 int index, trailing; 1369 int index, trailing;
1282 1370
1283 if (line < 0) 1371 if (line < 0)
1284 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1285 1373
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1288 1376
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1377 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290 1378
1291 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1386 }
1299} 1387}
1300 1388
1301void 1389void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1305 self->pl, 1394 self->pl,
1395 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1308 flags 1398 flags
1309 ); 1399 );
1400 // we assume that context_change actually clears/frees stuff
1401 // and does not do any recomputation...
1402 pango_layout_context_changed (self->pl);
1310 1403
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1404void
1405draw (DC::Layout self)
1406 CODE:
1407{
1408 glEnable (GL_TEXTURE_2D);
1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1410 glEnable (GL_BLEND);
1411 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1412 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1413 glEnable (GL_ALPHA_TEST);
1414 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1415
1416 rc_draw (self->rc);
1417
1418 glDisable (GL_ALPHA_TEST);
1419 glDisable (GL_BLEND);
1420 glDisable (GL_TEXTURE_2D);
1421}
1422
1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1424
1313PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1426
1317void 1427void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1429 CODE:
1320{ 1430{
1347 HV *hv = (HV *)SvRV (self); 1457 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1458 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1459 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1460 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1461
1462 if (name <= 0)
1463 XSRETURN_EMPTY;
1464
1352 if (items < 5) 1465 if (items < 5)
1353 { 1466 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1467 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1468 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1469 }
1394 RETVAL = width > 0; 1507 RETVAL = width > 0;
1395} 1508}
1396 OUTPUT: 1509 OUTPUT:
1397 RETVAL 1510 RETVAL
1398 1511
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1513
1401PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1402 1515
1403CFPlus::Map 1516DC::Map
1404new (SV *class) 1517new (SV *class)
1405 CODE: 1518 CODE:
1406 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1520 RETVAL->x = 0;
1408 RETVAL->y = 0; 1521 RETVAL->y = 0;
1416 RETVAL->row = 0; 1529 RETVAL->row = 0;
1417 OUTPUT: 1530 OUTPUT:
1418 RETVAL 1531 RETVAL
1419 1532
1420void 1533void
1421DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1422 CODE: 1535 CODE:
1423{ 1536{
1424 map_clear (self); 1537 map_clear (self);
1425 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1426 Safefree (self->tex); 1539 Safefree (self->tex);
1427 Safefree (self); 1540 Safefree (self);
1428} 1541}
1429 1542
1430void 1543void
1431resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1545 CODE:
1433 self->w = map_width; 1546 self->w = map_width;
1434 self->h = map_height; 1547 self->h = map_height;
1435 1548
1436void 1549void
1437clear (CFPlus::Map self) 1550clear (DC::Map self)
1438 CODE: 1551 CODE:
1439 map_clear (self); 1552 map_clear (self);
1440 1553
1441void 1554void
1442set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1556 CODE:
1444{ 1557{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1559 need_texid (self, tile);
1447} 1560}
1448 1561
1449void 1562void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1564 CODE:
1452{ 1565{
1453 tileid texid; 1566 tileid texid;
1454 maptex *tex; 1567 maptex *tex;
1455 1568
1468 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1470} 1583}
1471 1584
1472void 1585void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1586set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1587 CODE:
1475{ 1588{
1476 need_texid (self, texid); 1589 need_texid (self, texid);
1477 1590
1478 { 1591 {
1498 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1613}
1501 1614
1502int 1615int
1503ox (CFPlus::Map self) 1616ox (DC::Map self)
1504 ALIAS: 1617 ALIAS:
1505 oy = 1 1618 oy = 1
1506 x = 2 1619 x = 2
1507 y = 3 1620 y = 3
1508 w = 4 1621 w = 4
1519 } 1632 }
1520 OUTPUT: 1633 OUTPUT:
1521 RETVAL 1634 RETVAL
1522 1635
1523void 1636void
1524scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1525 CODE: 1638 CODE:
1526{ 1639{
1527 if (dx > 0) 1640 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1642 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1546 } 1659 }
1547} 1660}
1548 1661
1549void 1662SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1664 CODE:
1552{ 1665{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1668 mapcell *cell;
1556 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1557 1672
1558 while (data < data_end - 1) 1673 while (data < data_end - 1)
1559 { 1674 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1561 1676
1581 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1582 1697
1583 do 1698 do
1584 { 1699 {
1585 ext = *data++; 1700 ext = *data++;
1586 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1587 1702
1588 if (cmd < 4) 1703 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1591 { 1706 {
1594 } 1709 }
1595 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1598 { 1713 {
1599 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1600 ; // decode player count 1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1601 1718
1602 data += *data + 1; 1719 data += *data + 1;
1603 } 1720 }
1604 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1605 cell->flags = *data++; 1722 cell->flags = *data++;
1612 } 1729 }
1613 else 1730 else
1614 cell->darkness = *data++ + 1; 1731 cell->darkness = *data++ + 1;
1615 } 1732 }
1616 1733
1734 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1735 if (flags & (4 >> z))
1618 { 1736 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1738 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1739 cell->tile [z] = self->face2tile [face];
1740
1741 if (cell->tile [z])
1742 {
1743 maptex *tex = self->tex + cell->tile [z];
1744 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z]));
1746
1747 if (tex->smoothtile)
1748 {
1749 maptex *smooth = self->tex + tex->smoothtile;
1750 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile));
1752 }
1753 }
1622 } 1754 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1755 }
1638 else 1756 else
1639 cell->darkness = 0; 1757 cell->darkness = 0;
1640 } 1758 }
1641} 1759}
1760 OUTPUT:
1761 RETVAL
1642 1762
1643SV * 1763SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1765 CODE:
1646{ 1766{
1647 int x1, x; 1767 int x1, x;
1648 int y1, y; 1768 int y1, y;
1649 int z; 1769 int z;
1694} 1814}
1695 OUTPUT: 1815 OUTPUT:
1696 RETVAL 1816 RETVAL
1697 1817
1698void 1818void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1700 CODE: 1820 CODE:
1701{ 1821{
1822 int x, y, z;
1823
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1827 smooth_key skey;
1706 int x, y, z; 1828 int pl_x, pl_y;
1707 int last_name; 1829 maptex pl_tex;
1830 rc_t *rc = rc_alloc ();
1831 rc_key_t key;
1832 rc_array_t *arr;
1833
1834 pl_tex.name = 0;
1708 1835
1709 // thats current max. sorry. 1836 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1712 1839
1713 // clear key, in case of extra padding 1840 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1841 memset (&skey, 0, sizeof (skey));
1715 1842
1716 glColor4ub (255, 255, 255, 255); 1843 memset (&key, 0, sizeof (key));
1717 1844 key.r = 255;
1718 glEnable (GL_BLEND); 1845 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1846 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1847 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1848 key.mode = GL_QUADS;
1722 1849 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1850 key.texname = -1;
1724
1725 last_name = 0;
1726 1851
1727 mx += self->x; 1852 mx += self->x;
1728 my += self->y; 1853 my += self->y;
1729 1854
1730 // first pass: determine smooth_max 1855 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1873 self->tex [cell->tile [2]].smoothlevel));
1749 } 1874 }
1750 } 1875 }
1876
1877 glEnable (GL_BLEND);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1880
1752 for (z = 0; z <= 2; z++) 1881 for (z = 0; z <= 2; z++)
1753 { 1882 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1883 memset (smooth_level, 0, sizeof (smooth_level));
1755 1884
1768 { 1897 {
1769 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1899 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h; 1900 int py = (y + 1) * T - tex.h;
1772 1901
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1902 if (key.texname != tex.name)
1776 { 1903 {
1777 if (!tex.name) 1904 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1779 1906
1780 glEnd (); 1907 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1909 }
1784 1910
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 { 1912 {
1913 pl_x = px;
1914 pl_y = py;
1915 pl_tex = tex;
1916 continue;
1917 }
1918
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1927 if (cell->flags & 1)
1793 { 1928 {
1794 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1930 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1931 int py = y * T - T * 6 / 32;
1797 1932
1933 if (tex.name)
1798 glEnd (); 1934 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1945 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1946 }
1807 } 1947 }
1808 1948
1809 // update smooth hash 1949 // update smooth hash
1810 if (tex.smoothtile) 1950 if (tex.smoothtile)
1846 } 1986 }
1847 } 1987 }
1848 } 1988 }
1849 } 1989 }
1850 1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1851 // go through all smoothlevels, lowest to highest, then draw. 1994 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1995 // this is basically counting sort
1853 { 1996 {
1854 int w, b; 1997 int w, b;
1855 1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 2001 for (w = 0; w < 256 / 32; ++w)
1857 { 2002 {
1858 uint32_t smask = smooth_level [w]; 2003 uint32_t smask = smooth_level [w];
1859 if (smask) 2004 if (smask)
1860 for (b = 0; b < 32; ++b) 2005 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 2024 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 2026 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 2027 float dy = tex.t * .5f ; // 2 images/column
1883 2028
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 2029 if (tex.name)
1887 { 2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
1888 if (!tex.name) 2033 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2034 {
1890
1891 glEnd (); 2035 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2037 glBegin (GL_QUADS);
1894 } 2038 }
1895 2039
1896 if (border) 2040 if (border)
1897 { 2041 {
1898 float ox = border * dx; 2042 float ox = border * dx;
1899 2043
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2048 }
1905 2049
1906 if (corner) 2050 if (corner)
1907 { 2051 {
1908 float ox = corner * dx; 2052 float ox = corner * dx;
1909 2053
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
1914 } 2059 }
1915 } 2060 }
1916 } 2061 }
1917 } 2062 }
1918 } 2063 }
2064
2065 glEnd ();
2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
1919 } 2068 }
1920 2069
1921 hv_clear (smooth); 2070 hv_clear (smooth);
1922 } 2071 }
1923 2072
1924 glEnd (); 2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
1925 2078
1926 glDisable (GL_TEXTURE_2D); 2079 key.texname = tex.name;
2080 arr = rc_array (rc, &key);
2081
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2083 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2084 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086
2087 rc_draw (rc);
2088 }
2089
1927 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2091 rc_free (rc);
1928 2092
1929 // top layer: overlays such as the health bar 2093 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2094 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2095 if (0 <= y + my && y + my < self->rows)
1932 { 2096 {
1957 } 2121 }
1958 } 2122 }
1959} 2123}
1960 2124
1961void 2125void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2127 CODE:
1964{ 2128{
1965 static float color[16][3] = { 2129 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2130 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2131 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2181 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2182 glDisable (GL_TEXTURE_2D);
2019} 2183}
2020 2184
2021void 2185void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2186fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2187 PPCODE:
2024{ 2188{
2025 int x, y; 2189 int x, y;
2026 int sw1 = sw + 2; 2190 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2191 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2262 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2263 PUSHs (darkness3_sv);
2100} 2264}
2101 2265
2102SV * 2266SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2267get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2268 CODE:
2105{ 2269{
2106 int x, y, x1, y1; 2270 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2271 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2272 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2165 else 2329 else
2166 *data++ = 0; 2330 *data++ = 0;
2167 } 2331 }
2168 } 2332 }
2169 2333
2334 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 {
2170 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
2171 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
2172 RETVAL = data_sv; 2341 RETVAL = data_sv;
2173} 2342}
2174 OUTPUT: 2343 OUTPUT:
2175 RETVAL 2344 RETVAL
2176 2345
2177void 2346void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2179 PPCODE: 2348 PPCODE:
2180{ 2349{
2181 int x, y, z; 2350 int x, y, z;
2182 int w, h; 2351 int w, h;
2183 int x1, y1; 2352 int x1, y1;
2353 STRLEN len;
2354 uint8_t *data, *end;
2355
2356 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv);
2359 end = data + len + 8;
2360
2361 if (len < 5)
2362 XSRETURN_EMPTY;
2184 2363
2185 if (*data++ != 0) 2364 if (*data++ != 0)
2186 return; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
2187 2366
2188 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2368 h = *data++ << 8; h |= *data++;
2190 2369
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2370 // we need to do this 'cause we don't keep an absolute coord system for rows
2203 { 2382 {
2204 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
2205 2384
2206 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
2207 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
2208 uint8_t flags = *data++; 2392 flags = *data++;
2209 2393
2210 if (flags) 2394 if (flags)
2211 { 2395 {
2212 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 }; 2397 tileid tile[3] = { 0, 0, 0 };
2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2218 2402
2219 if (cell->darkness == 0) 2403 if (cell->darkness == 0)
2220 { 2404 {
2221 cell->darkness = 0; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
2222 2407
2223 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
2224 { 2409 {
2225 tileid t = tile [z]; 2410 tileid t = tile [z];
2226 2411
2227 if (t >= self->texs || (t && !self->tex [t].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2228 { 2413 {
2229 XPUSHs (sv_2mortal (newSViv (t))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t); 2415 need_texid (self, t);
2231 } 2416 }
2232 2417
2233 cell->tile [z] = t; 2418 cell->tile [z] = t;
2234 } 2419 }
2236 } 2421 }
2237 } 2422 }
2238 } 2423 }
2239} 2424}
2240 2425
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2426MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2427
2243CFPlus::RW 2428DC::RW
2244new (SV *class, SV *data_sv) 2429new (SV *class, SV *data_sv)
2245 CODE: 2430 CODE:
2246{ 2431{
2247 STRLEN datalen; 2432 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2433 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2435 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2436}
2252 OUTPUT: 2437 OUTPUT:
2253 RETVAL 2438 RETVAL
2254 2439
2255CFPlus::RW 2440DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2441new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2442 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2443 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2444 OUTPUT:
2260 RETVAL 2445 RETVAL
2261 2446
2447# fails on win32:
2448# dc.xs(2268) : error C2059: syntax error : '('
2262void 2449#void
2263close (CFPlus::RW self) 2450#close (DC::RW self)
2264 CODE: 2451# CODE:
2265 SDL_RWclose (self); 2452# (self->(close)) (self);
2266 2453
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2454MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2455
2269PROTOTYPES: DISABLE 2456PROTOTYPES: DISABLE
2270 2457
2458DC::Channel
2459find ()
2460 CODE:
2461{
2462 RETVAL = Mix_GroupAvailable (-1);
2463
2464 if (RETVAL < 0)
2465 {
2466 RETVAL = Mix_GroupOldest (-1);
2467
2468 if (RETVAL < 0)
2469 XSRETURN_UNDEF;
2470
2471 Mix_HaltChannel (RETVAL);
2472 }
2473
2474 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128);
2476}
2477 OUTPUT:
2478 RETVAL
2479
2480void
2481halt (DC::Channel self)
2482 CODE:
2483 Mix_HaltChannel (self);
2484
2485void
2486expire (DC::Channel self, int ticks = -1)
2487 CODE:
2488 Mix_ExpireChannel (self, ticks);
2489
2490void
2491fade_out (DC::Channel self, int ticks = -1)
2492 CODE:
2493 Mix_FadeOutChannel (self, ticks);
2494
2271int 2495int
2272volume (CFPlus::Channel self, int volume) 2496volume (DC::Channel self, int volume)
2273 CODE: 2497 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2498 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2499 OUTPUT:
2276 RETVAL 2500 RETVAL
2277 2501
2278int 2502void
2279unregister_all_effects (CFPlus::Channel self) 2503unregister_all_effects (DC::Channel self)
2280 CODE: 2504 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2505 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2506
2285int 2507void
2286set_panning (CFPlus::Channel self, int left, int right) 2508set_panning (DC::Channel self, int left, int right)
2287 CODE: 2509 CODE:
2510 left = CLAMP (left , 0, 255);
2511 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2512 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2513
2292int 2514void
2293set_distance (CFPlus::Channel self, int distance) 2515set_distance (DC::Channel self, int distance)
2294 CODE: 2516 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2517 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2518
2299int 2519void
2300set_position (CFPlus::Channel self, int angle, int distance) 2520set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2521 CODE:
2522
2523void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE:
2526{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2530}
2304 RETVAL
2305 2531
2306int 2532void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2533set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2534 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2535 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2536
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2538
2315PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2316 2540
2317CFPlus::MixChunk 2541DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2319 CODE: 2543 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2545 OUTPUT:
2322 RETVAL 2546 RETVAL
2323 2547
2324void 2548void
2325DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
2326 CODE: 2550 CODE:
2327 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
2328 2552
2329int 2553int
2330volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2555 CODE:
2556 if (items > 1)
2557 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2559 OUTPUT:
2334 RETVAL 2560 RETVAL
2335 2561
2336CFPlus::Channel 2562DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2563play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2564 CODE:
2565{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2567
2568 if (RETVAL < 0)
2569 XSRETURN_UNDEF;
2570
2571 if (channel < 0)
2572 {
2340 Mix_UnregisterAllEffects (RETVAL); 2573 Mix_UnregisterAllEffects (RETVAL);
2574 Mix_Volume (RETVAL, 128);
2575 }
2576}
2341 OUTPUT: 2577 OUTPUT:
2342 RETVAL 2578 RETVAL
2343 2579
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2581
2346int 2582int
2347volume (int volume = -1) 2583volume (int volume = -1)
2348 PROTOTYPE: ;$ 2584 PROTOTYPE: ;$
2349 CODE: 2585 CODE:
2586 if (items > 0)
2587 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2588 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2589 OUTPUT:
2352 RETVAL 2590 RETVAL
2353 2591
2354int 2592void
2355fade_out (int ms) 2593fade_out (int ms)
2356 CODE: 2594 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2595 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2596
2361void 2597void
2362halt () 2598halt ()
2363 CODE: 2599 CODE:
2364 Mix_HaltMusic (); 2600 Mix_HaltMusic ();
2365 2601
2366CFPlus::MixMusic 2602DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2603new (SV *class, DC::RW rwops)
2368 CODE: 2604 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2605 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2606 OUTPUT:
2371 RETVAL 2607 RETVAL
2372 2608
2373void 2609void
2374DESTROY (CFPlus::MixMusic self) 2610DESTROY (DC::MixMusic self)
2375 CODE: 2611 CODE:
2376 Mix_FreeMusic (self); 2612 Mix_FreeMusic (self);
2377 2613
2378int 2614int
2379play (CFPlus::MixMusic self, int loops = -1) 2615play (DC::MixMusic self, int loops = -1)
2380 CODE: 2616 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2618 OUTPUT:
2383 RETVAL 2619 RETVAL
2384 2620
2385int 2621void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2623 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2624 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2625
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2627
2394PROTOTYPES: ENABLE 2628PROTOTYPES: ENABLE
2395 2629
2396BOOT: 2630BOOT:
2397{ 2631{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2633 static const struct {
2400 const char *name; 2634 const char *name;
2401 IV iv; 2635 IV iv;
2402 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2676 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2677 const_iv (GL_COMPRESSED_ALPHA_ARB),
2678 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2680 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2681 const_iv (GL_COMPRESSED_RGB_ARB),
2682 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2684 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2685 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2727 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2728 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2733 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2734 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
2503 2744
2504 texture_av = newAV (); 2745 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2746 AvREAL_off (texture_av);
2506} 2747}
2507 2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
2754
2508char * 2755char *
2509gl_vendor () 2756gl_vendor ()
2510 CODE: 2757 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2759 OUTPUT:
2633 2880
2634void glRect (float x1, float y1, float x2, float y2) 2881void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 2882 CODE:
2636 glRectf (x1, y1, x2, y2); 2883 glRectf (x1, y1, x2, y2);
2637 2884
2885void glRect_lineloop (float x1, float y1, float x2, float y2)
2886 CODE:
2887 glBegin (GL_LINE_LOOP);
2888 glVertex2f (x1, y1);
2889 glVertex2f (x2, y1);
2890 glVertex2f (x2, y2);
2891 glVertex2f (x1, y2);
2892 glEnd ();
2893
2638PROTOTYPES: ENABLE 2894PROTOTYPES: ENABLE
2639 2895
2640void glBegin (int mode) 2896void glBegin (int mode)
2641 2897
2642void glEnd () 2898void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2930void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 2931 CODE:
2676 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 2934
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2935void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 2936
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2937void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 2938
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 2940
2710 2966
2711void glEndList () 2967void glEndList ()
2712 2968
2713void glCallList (int list) 2969void glCallList (int list)
2714 2970
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 2972
2717PROTOTYPES: DISABLE 2973PROTOTYPES: DISABLE
2718 2974
2719void 2975void
2720find_widget (SV *self, NV x, NV y) 2976find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 2980 XPUSHs (self);
2725} 2981}
2726 2982
2727BOOT: 2983BOOT:
2728{ 2984{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 2986
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2987 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2732 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2988 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2733 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2989 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2734 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2990 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 2991}
2736 2992
2737void 2993void
2738draw (SV *self) 2994draw (SV *self)
2739 CODE: 2995 CODE:
2743 NV x, y, w, h; 2999 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 3000 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 3001 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 3002 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 3003 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 3004 double draw_x, draw_y;
2750 3005
2751 if (!SvROK (self)) 3006 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 3008
2754 hv = (HV *)SvRV (self); 3009 hv = (HV *)SvRV (self);
2755 3010
2756 if (SvTYPE (hv) != SVt_PVHV) 3011 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 3013
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3014 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2760 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3015 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 3016
2762 if (!h || !w) 3017 if (!h || !w)
2782 { 3037 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 3039
2785 if (svp && SvTRUE (*svp)) 3040 if (svp && SvTRUE (*svp))
2786 { 3041 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3042 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 3043 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 3045 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 3046 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 3047 glVertex2f (w, 0);
2795 glEnd (); 3050 glEnd ();
2796 glDisable (GL_BLEND); 3051 glDisable (GL_BLEND);
2797 } 3052 }
2798 } 3053 }
2799#if 0 3054#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 3055 // draw borders, for debugging
2801 glPushMatrix; 3056 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 3057 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 3058 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 3059 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 3060 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 3061 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 3062 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 3063 glVertex2f (0 , h - 1);
2809 glEnd; 3064 glEnd ();
2810 glPopMatrix; 3065 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 3066#endif
2814 PUSHMARK (SP); 3067 PUSHMARK (SP);
2815 XPUSHs (self); 3068 XPUSHs (self);
2816 PUTBACK; 3069 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 3070 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines