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