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.219 by root, Mon Aug 6 05:06:32 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 = 1024) 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);
870
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}
813 886
814void 887void
815Mix_CloseAudio () 888Mix_CloseAudio ()
816 889
817int 890int
852 } 925 }
853 } 926 }
854#endif 927#endif
855} 928}
856 929
857void 930int
858add_font (char *file) 931add_font (char *file)
859 CODE: 932 CODE:
860 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
861 936
862void 937void
863load_image_inline (SV *image_) 938load_image_inline (SV *image_)
864 ALIAS: 939 ALIAS:
865 load_image_file = 1 940 load_image_file = 1
951void 1026void
952error (char *message) 1027error (char *message)
953 CODE: 1028 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1030#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1032#endif
958 1033
959void 1034void
960fatal (char *message) 1035fatal (char *message)
961 CODE: 1036 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1038#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1040#endif
966 _exit (1); 1041 _exit (1);
967 1042
968void 1043void
969_exit (int retval = 0) 1044_exit (int retval = 0)
981#if DEBUG 1056#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
983#endif 1058#endif
984} 1059}
985 1060
986MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
987 1062
988PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
989 1064
990CFPlus::Font 1065DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1067 CODE:
993{ 1068{
994 int count; 1069 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1073}
999 OUTPUT: 1074 OUTPUT:
1000 RETVAL 1075 RETVAL
1001 1076
1002void 1077void
1003DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
1004 CODE: 1079 CODE:
1005 pango_font_description_free (self); 1080 pango_font_description_free (self);
1006 1081
1007void 1082void
1008make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1009 PROTOTYPE: $ 1084 PROTOTYPE: $
1010 CODE: 1085 CODE:
1011 default_font = self; 1086 default_font = self;
1012 1087
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1089
1015PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1016 1091
1017void 1092void
1018reset_glyph_cache () 1093glyph_cache_backup ()
1019 PROTOTYPE: 1094 PROTOTYPE:
1020 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1021 tc_clear (); 1102 tc_restore ();
1022 1103
1023CFPlus::Layout 1104DC::Layout
1024new (SV *class) 1105new (SV *class)
1025 CODE: 1106 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1027 1108
1028 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1035 1117
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1038 OUTPUT: 1120 OUTPUT:
1039 RETVAL 1121 RETVAL
1040 1122
1041void 1123void
1042DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1043 CODE: 1125 CODE:
1044 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
1045 Safefree (self); 1128 Safefree (self);
1046 1129
1047void 1130void
1048set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1049 CODE: 1132 CODE:
1050{ 1133{
1051 STRLEN textlen; 1134 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1053 1136
1054 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1055} 1138}
1056 1139
1057void 1140void
1058set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1059 CODE: 1142 CODE:
1060{ 1143{
1061 STRLEN textlen; 1144 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1063 1146
1064 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1065} 1148}
1066 1149
1067void 1150void
1068set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1069 CODE: 1152 CODE:
1070{ 1153{
1071 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1156 const char *pos = text;
1108 if (attrs) 1191 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1110} 1193}
1111 1194
1112void 1195void
1113get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1114 PPCODE: 1197 PPCODE:
1115{ 1198{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1200
1118 do 1201 do
1119 { 1202 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1204
1122 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1123 { 1206 {
1124 PangoRectangle extents; 1207 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1216
1134 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1135} 1218}
1136 1219
1137int 1220int
1138has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1139 CODE: 1222 CODE:
1140{ 1223{
1141 int lines = 1; 1224 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1143 1226
1148} 1231}
1149 OUTPUT: 1232 OUTPUT:
1150 RETVAL 1233 RETVAL
1151 1234
1152SV * 1235SV *
1153get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1154 CODE: 1237 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1240 OUTPUT:
1158 RETVAL 1241 RETVAL
1159 1242
1160void 1243void
1161set_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.)
1162 CODE: 1245 CODE:
1163 self->r = r; 1246 self->r = r;
1164 self->g = g; 1247 self->g = g;
1165 self->b = b; 1248 self->b = b;
1166 self->a = a; 1249 self->a = a;
1167 1250
1168void 1251void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1253 CODE:
1171 if (self->font != font) 1254 if (self->font != font)
1172 { 1255 {
1173 self->font = font; 1256 self->font = font;
1174 layout_update_font (self); 1257 layout_update_font (self);
1175 } 1258 }
1176 1259
1177void 1260void
1178set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1179 CODE: 1262 CODE:
1180 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1181 { 1264 {
1182 self->base_height = base_height; 1265 self->base_height = base_height;
1183 layout_update_font (self); 1266 layout_update_font (self);
1184 } 1267 }
1185 1268
1186void 1269void
1187set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1271 CODE:
1189 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);
1190 1273
1191void 1274void
1192set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1193 CODE: 1276 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1278
1196void 1279void
1197set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1198 CODE: 1281 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1283
1201void 1284void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1286 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1209 ); 1292 );
1210 1293
1211void 1294void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1296 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1298
1216void 1299void
1217size (CFPlus::Layout self) 1300size (DC::Layout self)
1218 PPCODE: 1301 PPCODE:
1219{ 1302{
1220 int w, h; 1303 int w, h;
1221 1304
1222 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1227} 1310}
1228 1311
1229int 1312int
1230descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1231 CODE: 1314 CODE:
1232{ 1315{
1233 PangoRectangle rect; 1316 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1237} 1320}
1238 OUTPUT: 1321 OUTPUT:
1239 RETVAL 1322 RETVAL
1240 1323
1241int 1324int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1326 CODE:
1244{ 1327{
1245 int index, trailing; 1328 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1248} 1331}
1249 OUTPUT: 1332 OUTPUT:
1250 RETVAL 1333 RETVAL
1251 1334
1252void 1335void
1253cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1337 PPCODE:
1255{ 1338{
1256 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1341
1259 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1346}
1264 1347
1265void 1348void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1350 PPCODE:
1268{ 1351{
1269 int line, x; 1352 int line, x;
1270 1353
1271 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)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1357 --line;
1358#endif
1274 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1362}
1278 1363
1279void 1364void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1366 PPCODE:
1282{ 1367{
1283 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1284 int index, trailing; 1369 int index, trailing;
1285 1370
1286 if (line < 0) 1371 if (line < 0)
1287 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1288 1373
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1291 1376
1292 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);
1293 1378
1294 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1386 }
1302} 1387}
1303 1388
1304void 1389void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1308 self->pl, 1394 self->pl,
1395 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1311 flags 1398 flags
1312 ); 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);
1313 1403
1314MODULE = 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
1315 1424
1316PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1426
1320void 1427void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1429 CODE:
1323{ 1430{
1400 RETVAL = width > 0; 1507 RETVAL = width > 0;
1401} 1508}
1402 OUTPUT: 1509 OUTPUT:
1403 RETVAL 1510 RETVAL
1404 1511
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1513
1407PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1408 1515
1409CFPlus::Map 1516DC::Map
1410new (SV *class) 1517new (SV *class)
1411 CODE: 1518 CODE:
1412 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1520 RETVAL->x = 0;
1414 RETVAL->y = 0; 1521 RETVAL->y = 0;
1422 RETVAL->row = 0; 1529 RETVAL->row = 0;
1423 OUTPUT: 1530 OUTPUT:
1424 RETVAL 1531 RETVAL
1425 1532
1426void 1533void
1427DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1428 CODE: 1535 CODE:
1429{ 1536{
1430 map_clear (self); 1537 map_clear (self);
1431 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1432 Safefree (self->tex); 1539 Safefree (self->tex);
1433 Safefree (self); 1540 Safefree (self);
1434} 1541}
1435 1542
1436void 1543void
1437resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1545 CODE:
1439 self->w = map_width; 1546 self->w = map_width;
1440 self->h = map_height; 1547 self->h = map_height;
1441 1548
1442void 1549void
1443clear (CFPlus::Map self) 1550clear (DC::Map self)
1444 CODE: 1551 CODE:
1445 map_clear (self); 1552 map_clear (self);
1446 1553
1447void 1554void
1448set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1556 CODE:
1450{ 1557{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1559 need_texid (self, tile);
1453} 1560}
1454 1561
1455void 1562void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1564 CODE:
1458{ 1565{
1459 tileid texid; 1566 tileid texid;
1460 maptex *tex; 1567 maptex *tex;
1461 1568
1474 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1476} 1583}
1477 1584
1478void 1585void
1479set_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)
1480 CODE: 1587 CODE:
1481{ 1588{
1482 need_texid (self, texid); 1589 need_texid (self, texid);
1483 1590
1484 { 1591 {
1504 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1613}
1507 1614
1508int 1615int
1509ox (CFPlus::Map self) 1616ox (DC::Map self)
1510 ALIAS: 1617 ALIAS:
1511 oy = 1 1618 oy = 1
1512 x = 2 1619 x = 2
1513 y = 3 1620 y = 3
1514 w = 4 1621 w = 4
1525 } 1632 }
1526 OUTPUT: 1633 OUTPUT:
1527 RETVAL 1634 RETVAL
1528 1635
1529void 1636void
1530scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1531 CODE: 1638 CODE:
1532{ 1639{
1533 if (dx > 0) 1640 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1642 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1657 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1552 } 1659 }
1553} 1660}
1554 1661
1555void 1662SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1664 CODE:
1558{ 1665{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1668 mapcell *cell;
1562 int x, y, flags; 1669 int x, y, z, flags;
1670 AV *missing = newAV ();
1671 RETVAL = newRV_noinc ((SV *)missing);
1563 1672
1564 while (data < data_end - 1) 1673 while (data < data_end - 1)
1565 { 1674 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1675 flags = (data [0] << 8) + data [1]; data += 2;
1567 1676
1587 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1588 1697
1589 do 1698 do
1590 { 1699 {
1591 ext = *data++; 1700 ext = *data++;
1592 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1593 1702
1594 if (cmd < 4) 1703 if (cmd < 4)
1595 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1596 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1597 { 1706 {
1600 } 1709 }
1601 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1602 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1603 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1604 { 1713 {
1605 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1606 ; // 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);
1607 1718
1608 data += *data + 1; 1719 data += *data + 1;
1609 } 1720 }
1610 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1611 cell->flags = *data++; 1722 cell->flags = *data++;
1618 } 1729 }
1619 else 1730 else
1620 cell->darkness = *data++ + 1; 1731 cell->darkness = *data++ + 1;
1621 } 1732 }
1622 1733
1734 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1735 if (flags & (4 >> z))
1624 { 1736 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1737 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1738 need_facenum (self, face);
1627 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 }
1628 } 1754 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1755 }
1644 else 1756 else
1645 cell->darkness = 0; 1757 cell->darkness = 0;
1646 } 1758 }
1647} 1759}
1760 OUTPUT:
1761 RETVAL
1648 1762
1649SV * 1763SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 1765 CODE:
1652{ 1766{
1653 int x1, x; 1767 int x1, x;
1654 int y1, y; 1768 int y1, y;
1655 int z; 1769 int z;
1699 RETVAL = map_sv; 1813 RETVAL = map_sv;
1700} 1814}
1701 OUTPUT: 1815 OUTPUT:
1702 RETVAL 1816 RETVAL
1703 1817
1704SV * 1818void
1705draw (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)
1706 CODE: 1820 CODE:
1707{ 1821{
1822 int x, y, z;
1823
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 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
1710 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)
1711 smooth_key skey; 1827 smooth_key skey;
1712 int x, y, z; 1828 int pl_x, pl_y;
1713 int last_name; 1829 maptex pl_tex;
1714 AV *missing = newAV (); 1830 rc_t *rc = rc_alloc ();
1715 RETVAL = newRV_noinc ((SV *)missing); 1831 rc_key_t key;
1832 rc_array_t *arr;
1833
1834 pl_tex.name = 0;
1716 1835
1717 // thats current max. sorry. 1836 // thats current max. sorry.
1718 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1720 1839
1721 // clear key, in case of extra padding 1840 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 1841 memset (&skey, 0, sizeof (skey));
1723 1842
1724 glColor4ub (255, 255, 255, 255); 1843 memset (&key, 0, sizeof (key));
1725 1844 key.r = 255;
1726 glEnable (GL_BLEND); 1845 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1846 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 1847 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1848 key.mode = GL_QUADS;
1730 1849 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1; 1850 key.texname = -1;
1734 1851
1735 mx += self->x; 1852 mx += self->x;
1736 my += self->y; 1853 my += self->y;
1737 1854
1738 // first pass: determine smooth_max 1855 // first pass: determine smooth_max
1754 MAX (self->tex [cell->tile [0]].smoothlevel, 1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 1873 self->tex [cell->tile [2]].smoothlevel));
1757 } 1874 }
1758 } 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);
1759 1880
1760 for (z = 0; z <= 2; z++) 1881 for (z = 0; z <= 2; z++)
1761 { 1882 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 1883 memset (smooth_level, 0, sizeof (smooth_level));
1763 1884
1773 tileid tile = cell->tile [z]; 1894 tileid tile = cell->tile [z];
1774 1895
1775 if (tile) 1896 if (tile)
1776 { 1897 {
1777 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1778 int px, py; 1899 int px = (x + 1) * T - tex.w;
1900 int py = (y + 1) * T - tex.h;
1779 1901
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 1902 if (key.texname != tex.name)
1783 { 1903 {
1784 if (!tex.name) 1904 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789 1906
1790 glEnd (); 1907 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1909 }
1794 1910
1795 px = (x + 1) * T - tex.w; 1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 { 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
1805 if (cell->flags & 1) 1927 if (cell->flags & 1)
1806 { 1928 {
1807 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 1930 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 1931 int py = y * T - T * 6 / 32;
1810 1932
1933 if (tex.name)
1811 glEnd (); 1934 {
1812 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);
1813 glBegin (GL_QUADS); 1945 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 1946 }
1820 } 1947 }
1821 1948
1822 // update smooth hash 1949 // update smooth hash
1823 if (tex.smoothtile) 1950 if (tex.smoothtile)
1859 } 1986 }
1860 } 1987 }
1861 } 1988 }
1862 } 1989 }
1863 1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1864 // go through all smoothlevels, lowest to highest, then draw. 1994 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 1995 // this is basically counting sort
1866 { 1996 {
1867 int w, b; 1997 int w, b;
1868 1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 2001 for (w = 0; w < 256 / 32; ++w)
1870 { 2002 {
1871 uint32_t smask = smooth_level [w]; 2003 uint32_t smask = smooth_level [w];
1872 if (smask) 2004 if (smask)
1873 for (b = 0; b < 32; ++b) 2005 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2024 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2026 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2027 float dy = tex.t * .5f ; // 2 images/column
1896 2028
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2029 if (tex.name)
1900 { 2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
1901 if (!tex.name) 2033 if (key.texname != tex.name)
1902 { 2034 {
1903 av_push (missing, newSViv (skey->tile)); 2035 glEnd ();
1904 continue; // smoothing not yet available 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS);
1905 } 2038 }
1906 2039
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2040 if (border)
1913 { 2041 {
1914 float ox = border * dx; 2042 float ox = border * dx;
1915 2043
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2048 }
1921 2049
1922 if (corner) 2050 if (corner)
1923 { 2051 {
1924 float ox = corner * dx; 2052 float ox = corner * dx;
1925 2053
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
1930 } 2059 }
1931 } 2060 }
1932 } 2061 }
1933 } 2062 }
1934 } 2063 }
2064
2065 glEnd ();
2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
1935 } 2068 }
1936 2069
1937 hv_clear (smooth); 2070 hv_clear (smooth);
1938 } 2071 }
1939 2072
1940 glEnd (); 2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
1941 2078
1942 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
1943 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2091 rc_free (rc);
1944 2092
1945 // top layer: overlays such as the health bar 2093 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2094 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2095 if (0 <= y + my && y + my < self->rows)
1948 { 2096 {
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2119 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2120 }
1973 } 2121 }
1974 } 2122 }
1975} 2123}
1976 OUTPUT:
1977 RETVAL
1978 2124
1979void 2125void
1980draw_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)
1981 CODE: 2127 CODE:
1982{ 2128{
1983 static float color[16][3] = { 2129 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2130 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2131 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2181 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2182 glDisable (GL_TEXTURE_2D);
2037} 2183}
2038 2184
2039void 2185void
2040fow_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)
2041 PPCODE: 2187 PPCODE:
2042{ 2188{
2043 int x, y; 2189 int x, y;
2044 int sw1 = sw + 2; 2190 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2191 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2262 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2263 PUSHs (darkness3_sv);
2118} 2264}
2119 2265
2120SV * 2266SV *
2121get_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)
2122 CODE: 2268 CODE:
2123{ 2269{
2124 int x, y, x1, y1; 2270 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2271 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2272 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2329 else
2184 *data++ = 0; 2330 *data++ = 0;
2185 } 2331 }
2186 } 2332 }
2187 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 {
2188 SvPOK_only (data_sv); 2337 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 }
2340
2190 RETVAL = data_sv; 2341 RETVAL = data_sv;
2191} 2342}
2192 OUTPUT: 2343 OUTPUT:
2193 RETVAL 2344 RETVAL
2194 2345
2195void 2346void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2347set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2348 PPCODE:
2198{ 2349{
2199 int x, y, z; 2350 int x, y, z;
2200 int w, h; 2351 int w, h;
2201 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;
2202 2363
2203 if (*data++ != 0) 2364 if (*data++ != 0)
2204 return; /* version mismatch */ 2365 XSRETURN_EMPTY; /* version mismatch */
2205 2366
2206 w = *data++ << 8; w |= *data++; 2367 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2368 h = *data++ << 8; h |= *data++;
2208 2369
2209 // 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
2221 { 2382 {
2222 maprow *row = map_get_row (self, y); 2383 maprow *row = map_get_row (self, y);
2223 2384
2224 for (x = x0; x < x1; x++) 2385 for (x = x0; x < x1; x++)
2225 { 2386 {
2387 uint8_t flags;
2388
2389 if (data + 7 >= end)
2390 XSRETURN_EMPTY;
2391
2226 uint8_t flags = *data++; 2392 flags = *data++;
2227 2393
2228 if (flags) 2394 if (flags)
2229 { 2395 {
2230 mapcell *cell = row_get_cell (row, x); 2396 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2397 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2400 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2401 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2402
2237 if (cell->darkness == 0) 2403 if (cell->darkness == 0)
2238 { 2404 {
2239 cell->darkness = 0; 2405 /*cell->darkness = 0;*/
2406 EXTEND (SP, 3);
2240 2407
2241 for (z = 0; z <= 2; z++) 2408 for (z = 0; z <= 2; z++)
2242 { 2409 {
2243 tileid t = tile [z]; 2410 tileid t = tile [z];
2244 2411
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2412 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2413 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2414 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2415 need_texid (self, t);
2249 } 2416 }
2250 2417
2251 cell->tile [z] = t; 2418 cell->tile [z] = t;
2252 } 2419 }
2254 } 2421 }
2255 } 2422 }
2256 } 2423 }
2257} 2424}
2258 2425
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2426MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2427
2261CFPlus::RW 2428DC::RW
2262new (SV *class, SV *data_sv) 2429new (SV *class, SV *data_sv)
2263 CODE: 2430 CODE:
2264{ 2431{
2265 STRLEN datalen; 2432 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2433 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2435 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2436}
2270 OUTPUT: 2437 OUTPUT:
2271 RETVAL 2438 RETVAL
2272 2439
2273CFPlus::RW 2440DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2441new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2442 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2443 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2444 OUTPUT:
2278 RETVAL 2445 RETVAL
2279 2446
2280# fails on win32: 2447# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2448# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2449#void
2283#close (CFPlus::RW self) 2450#close (DC::RW self)
2284# CODE: 2451# CODE:
2285# (self->(close)) (self); 2452# (self->(close)) (self);
2286 2453
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2454MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2455
2289PROTOTYPES: DISABLE 2456PROTOTYPES: DISABLE
2290 2457
2291CFPlus::Channel 2458DC::Channel
2292find () 2459find ()
2293 CODE: 2460 CODE:
2294{ 2461{
2295 RETVAL = Mix_GroupAvailable (-1); 2462 RETVAL = Mix_GroupAvailable (-1);
2296 2463
2309} 2476}
2310 OUTPUT: 2477 OUTPUT:
2311 RETVAL 2478 RETVAL
2312 2479
2313void 2480void
2314halt (CFPlus::Channel self) 2481halt (DC::Channel self)
2315 CODE: 2482 CODE:
2316 Mix_HaltChannel (self); 2483 Mix_HaltChannel (self);
2317 2484
2318void 2485void
2319expire (CFPlus::Channel self, int ticks = -1) 2486expire (DC::Channel self, int ticks = -1)
2320 CODE: 2487 CODE:
2321 Mix_ExpireChannel (self, ticks); 2488 Mix_ExpireChannel (self, ticks);
2322 2489
2323void 2490void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2491fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2492 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2493 Mix_FadeOutChannel (self, ticks);
2327 2494
2328int 2495int
2329volume (CFPlus::Channel self, int volume) 2496volume (DC::Channel self, int volume)
2330 CODE: 2497 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2498 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2499 OUTPUT:
2333 RETVAL 2500 RETVAL
2334 2501
2335void 2502void
2336unregister_all_effects (CFPlus::Channel self) 2503unregister_all_effects (DC::Channel self)
2337 CODE: 2504 CODE:
2338 Mix_UnregisterAllEffects (self); 2505 Mix_UnregisterAllEffects (self);
2339 2506
2340void 2507void
2341set_panning (CFPlus::Channel self, int left, int right) 2508set_panning (DC::Channel self, int left, int right)
2342 CODE: 2509 CODE:
2343 left = CLAMP (left , 0, 255); 2510 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2511 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2512 Mix_SetPanning (self, left, right);
2346 2513
2347void 2514void
2348set_distance (CFPlus::Channel self, int distance) 2515set_distance (DC::Channel self, int distance)
2349 CODE: 2516 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2517 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2518
2352void 2519void
2353set_position (CFPlus::Channel self, int angle, int distance) 2520set_position (DC::Channel self, int angle, int distance)
2354 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);
2355 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530}
2356 2531
2357void 2532void
2358set_reverse_stereo (CFPlus::Channel self, int flip) 2533set_reverse_stereo (DC::Channel self, int flip)
2359 CODE: 2534 CODE:
2360 Mix_SetReverseStereo (self, flip); 2535 Mix_SetReverseStereo (self, flip);
2361 2536
2362MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2363 2538
2364PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2365 2540
2366CFPlus::MixChunk 2541DC::MixChunk
2367new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2368 CODE: 2543 CODE:
2369 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2370 OUTPUT: 2545 OUTPUT:
2371 RETVAL 2546 RETVAL
2372 2547
2373void 2548void
2374DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
2375 CODE: 2550 CODE:
2376 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
2377 2552
2378int 2553int
2379volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
2380 CODE: 2555 CODE:
2381 if (items > 1) 2556 if (items > 1)
2382 volume = CLAMP (volume, 0, 128); 2557 volume = CLAMP (volume, 0, 128);
2383 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
2384 OUTPUT: 2559 OUTPUT:
2385 RETVAL 2560 RETVAL
2386 2561
2387CFPlus::Channel 2562DC::Channel
2388play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2563play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2389 CODE: 2564 CODE:
2390{ 2565{
2391 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2392 2567
2393 if (RETVAL < 0) 2568 if (RETVAL < 0)
2400 } 2575 }
2401} 2576}
2402 OUTPUT: 2577 OUTPUT:
2403 RETVAL 2578 RETVAL
2404 2579
2405MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2406 2581
2407int 2582int
2408volume (int volume = -1) 2583volume (int volume = -1)
2409 PROTOTYPE: ;$ 2584 PROTOTYPE: ;$
2410 CODE: 2585 CODE:
2422void 2597void
2423halt () 2598halt ()
2424 CODE: 2599 CODE:
2425 Mix_HaltMusic (); 2600 Mix_HaltMusic ();
2426 2601
2427CFPlus::MixMusic 2602DC::MixMusic
2428new (SV *class, CFPlus::RW rwops) 2603new (SV *class, DC::RW rwops)
2429 CODE: 2604 CODE:
2430 RETVAL = Mix_LoadMUS_RW (rwops); 2605 RETVAL = Mix_LoadMUS_RW (rwops);
2431 OUTPUT: 2606 OUTPUT:
2432 RETVAL 2607 RETVAL
2433 2608
2434void 2609void
2435DESTROY (CFPlus::MixMusic self) 2610DESTROY (DC::MixMusic self)
2436 CODE: 2611 CODE:
2437 Mix_FreeMusic (self); 2612 Mix_FreeMusic (self);
2438 2613
2439int 2614int
2440play (CFPlus::MixMusic self, int loops = -1) 2615play (DC::MixMusic self, int loops = -1)
2441 CODE: 2616 CODE:
2442 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
2443 OUTPUT: 2618 OUTPUT:
2444 RETVAL 2619 RETVAL
2445 2620
2446void 2621void
2447fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2448 CODE: 2623 CODE:
2449 Mix_FadeInMusicPos (self, loops, ms, position); 2624 Mix_FadeInMusicPos (self, loops, ms, position);
2450 2625
2451MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2452 2627
2453PROTOTYPES: ENABLE 2628PROTOTYPES: ENABLE
2454 2629
2455BOOT: 2630BOOT:
2456{ 2631{
2457 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2458 static const struct { 2633 static const struct {
2459 const char *name; 2634 const char *name;
2460 IV iv; 2635 IV iv;
2461 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
2462# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
2497 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
2498 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
2499 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
2500 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
2501 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),
2502 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2503 const_iv (GL_PROXY_TEXTURE_1D), 2684 const_iv (GL_PROXY_TEXTURE_1D),
2504 const_iv (GL_PROXY_TEXTURE_2D), 2685 const_iv (GL_PROXY_TEXTURE_2D),
2505 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
2506 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
2545 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2546 const_iv (GL_POINT_SMOOTH_HINT), 2727 const_iv (GL_POINT_SMOOTH_HINT),
2547 const_iv (GL_LINE_SMOOTH_HINT), 2728 const_iv (GL_LINE_SMOOTH_HINT),
2548 const_iv (GL_POLYGON_SMOOTH_HINT), 2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2549 const_iv (GL_GENERATE_MIPMAP_HINT), 2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2550 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2551 const_iv (GL_DONT_CARE), 2733 const_iv (GL_DONT_CARE),
2552 const_iv (GL_NICEST), 2734 const_iv (GL_NICEST),
2553 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
2554 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
2562 2744
2563 texture_av = newAV (); 2745 texture_av = newAV ();
2564 AvREAL_off (texture_av); 2746 AvREAL_off (texture_av);
2565} 2747}
2566 2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
2754
2567char * 2755char *
2568gl_vendor () 2756gl_vendor ()
2569 CODE: 2757 CODE:
2570 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
2571 OUTPUT: 2759 OUTPUT:
2692 2880
2693void glRect (float x1, float y1, float x2, float y2) 2881void glRect (float x1, float y1, float x2, float y2)
2694 CODE: 2882 CODE:
2695 glRectf (x1, y1, x2, y2); 2883 glRectf (x1, y1, x2, y2);
2696 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
2697PROTOTYPES: ENABLE 2894PROTOTYPES: ENABLE
2698 2895
2699void glBegin (int mode) 2896void glBegin (int mode)
2700 2897
2701void glEnd () 2898void glEnd ()
2733void 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)
2734 CODE: 2931 CODE:
2735 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
2736 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2737 2934
2738void 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)
2739 2936
2740void 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)
2741 2938
2742void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2743 2940
2769 2966
2770void glEndList () 2967void glEndList ()
2771 2968
2772void glCallList (int list) 2969void glCallList (int list)
2773 2970
2774MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2775 2972
2776PROTOTYPES: DISABLE 2973PROTOTYPES: DISABLE
2777 2974
2778void 2975void
2779find_widget (SV *self, NV x, NV y) 2976find_widget (SV *self, NV x, NV y)
2783 XPUSHs (self); 2980 XPUSHs (self);
2784} 2981}
2785 2982
2786BOOT: 2983BOOT:
2787{ 2984{
2788 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2789 2986
2790 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);
2791 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);
2792 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);
2793 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);
2794} 2991}
2795 2992
2796void 2993void
2797draw (SV *self) 2994draw (SV *self)
2798 CODE: 2995 CODE:
2802 NV x, y, w, h; 2999 NV x, y, w, h;
2803 SV *draw_x_sv = GvSV (draw_x_gv); 3000 SV *draw_x_sv = GvSV (draw_x_gv);
2804 SV *draw_y_sv = GvSV (draw_y_gv); 3001 SV *draw_y_sv = GvSV (draw_y_gv);
2805 SV *draw_w_sv = GvSV (draw_w_gv); 3002 SV *draw_w_sv = GvSV (draw_w_gv);
2806 SV *draw_h_sv = GvSV (draw_h_gv); 3003 SV *draw_h_sv = GvSV (draw_h_gv);
2807 SV *hover;
2808 double draw_x, draw_y, draw_w, draw_h; 3004 double draw_x, draw_y;
2809 3005
2810 if (!SvROK (self)) 3006 if (!SvROK (self))
2811 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2812 3008
2813 hv = (HV *)SvRV (self); 3009 hv = (HV *)SvRV (self);
2814 3010
2815 if (SvTYPE (hv) != SVt_PVHV) 3011 if (SvTYPE (hv) != SVt_PVHV)
2816 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2817 3013
2818 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.;
2819 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.;
2820 3016
2821 if (!h || !w) 3017 if (!h || !w)
2841 { 3037 {
2842 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2843 3039
2844 if (svp && SvTRUE (*svp)) 3040 if (svp && SvTRUE (*svp))
2845 { 3041 {
2846 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);
2847 glEnable (GL_BLEND); 3043 glEnable (GL_BLEND);
2848 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2849 glBegin (GL_QUADS); 3045 glBegin (GL_QUADS);
2850 glVertex2f (0, 0); 3046 glVertex2f (0, 0);
2851 glVertex2f (w, 0); 3047 glVertex2f (w, 0);
2854 glEnd (); 3050 glEnd ();
2855 glDisable (GL_BLEND); 3051 glDisable (GL_BLEND);
2856 } 3052 }
2857 } 3053 }
2858#if 0 3054#if 0
2859 if ($ENV{CFPLUS_DEBUG} & 1) { 3055 // draw borders, for debugging
2860 glPushMatrix; 3056 glPushMatrix ();
2861 glColor 1, 1, 0, 1; 3057 glColor4f (1., 1., 0., 1.);
2862 glTranslate 0.375, 0.375; 3058 glTranslatef (.5, .5, 0.);
2863 glBegin GL_LINE_LOOP; 3059 glBegin (GL_LINE_LOOP);
2864 glVertex 0 , 0; 3060 glVertex2f (0 , 0);
2865 glVertex $self->{w} - 1, 0; 3061 glVertex2f (w - 1, 0);
2866 glVertex $self->{w} - 1, $self->{h} - 1; 3062 glVertex2f (w - 1, h - 1);
2867 glVertex 0 , $self->{h} - 1; 3063 glVertex2f (0 , h - 1);
2868 glEnd; 3064 glEnd ();
2869 glPopMatrix; 3065 glPopMatrix ();
2870 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2871 }
2872#endif 3066#endif
2873 PUSHMARK (SP); 3067 PUSHMARK (SP);
2874 XPUSHs (self); 3068 XPUSHs (self);
2875 PUTBACK; 3069 PUTBACK;
2876 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