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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.262 by root, Wed Jul 16 20:12:27 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 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
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 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
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
88/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90
68#if 0 91#if 1
69# define PARACHUTE SDL_INIT_NOPARACHUTE 92# define PARACHUTE SDL_INIT_NOPARACHUTE
70#else 93#else
71# define PARACHUTE 0 94# define PARACHUTE 0
72#endif 95#endif
73 96
114 av_push (texture_av, (SV *)(size_t)name); 137 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 138 glDeleteTextures (1, &name);
116} 139}
117 140
118#include "texcache.c" 141#include "texcache.c"
142#include "rendercache.c"
119 143
120#include "pango-font.c" 144#include "pango-font.c"
121#include "pango-fontmap.c" 145#include "pango-fontmap.c"
122#include "pango-render.c" 146#include "pango-render.c"
123 147
124typedef IV CFPlus__Channel; 148typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 149typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
128 152
129typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
130 154
131static int 155static int
132shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
133{ 157{
134 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
148 172
149typedef struct cf_layout { 173typedef struct cf_layout {
150 PangoLayout *pl; 174 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
152 int base_height; 176 int base_height;
153 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
154} *CFPlus__Layout; 179} *DC__Layout;
155 180
156static CFPlus__Font default_font; 181static DC__Font default_font;
157static PangoContext *opengl_context; 182static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
159 184
160static void 185static void
161substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
166#endif 191#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 193}
169 194
170static void 195static void
171layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
172{ 197{
173 /* 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
174 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
175 */ 200 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
177 202
178 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 205
181 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
182} 207}
183 208
184static void 209static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 211{
187 PangoRectangle rect; 212 PangoRectangle rect;
188 213
189 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
201 226
202typedef uint16_t tileid; 227typedef uint16_t tileid;
203typedef uint16_t faceid; 228typedef uint16_t faceid;
204 229
205typedef struct { 230typedef struct {
206 int name; 231 GLuint name;
207 int w, h; 232 int w, h;
208 float s, t; 233 float s, t;
209 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
210 tileid smoothtile; 235 tileid smoothtile;
211 uint8_t smoothlevel; 236 uint8_t smoothlevel;
229 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
231 256
232 int32_t rows; 257 int32_t rows;
233 maprow *row; 258 maprow *row;
234} *CFPlus__Map; 259} *DC__Map;
235 260
236static char * 261static char *
237prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
238{ 263{
239 char *p; 264 char *p;
277 self->texs *= 2; 302 self->texs *= 2;
278 } 303 }
279} 304}
280 305
281static maprow * 306static maprow *
282map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
283{ 308{
284 if (0 > y) 309 if (0 > y)
285 { 310 {
286 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
325 350
326 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
327} 352}
328 353
329static mapcell * 354static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
331{ 356{
332 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
333} 358}
334 359
335static void 360static void
336map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
337{ 362{
338 int r; 363 int r;
339 364
340 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
349 self->row = 0; 374 self->row = 0;
350 self->rows = 0; 375 self->rows = 0;
351} 376}
352 377
353static void 378static void
354map_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)
355{ 380{
356 int x, y; 381 int x, y;
357 maprow *row; 382 maprow *row;
358 mapcell *cell; 383 mapcell *cell;
359 384
438 n |= n >> 16; 463 n |= n >> 16;
439 464
440 return n + 1; 465 return n + 1;
441} 466}
442 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
443/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
446 482
447/******************************************************************************/ 483/******************************************************************************/
485 return 0; 521 return 0;
486 522
487 return 1; 523 return 1;
488} 524}
489 525
490MODULE = CFPlus PACKAGE = CFPlus 526MODULE = Deliantra::Client PACKAGE = DC
491 527
492PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
493 529
494BOOT: 530BOOT:
495{ 531{
496 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 533 static const struct {
498 const char *name; 534 const char *name;
499 IV iv; 535 IV iv;
500 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
523 559
524 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
527 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
528 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
608 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
609# undef const_iv 649# undef const_iv
610 }; 650 };
611 651
612 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; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 671
632NV floor (NV x) 672NV floor (NV x)
633 673
634NV ceil (NV x) 674NV ceil (NV x)
635 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
636void 680void
637pango_init () 681pango_init ()
638 CODE: 682 CODE:
639{ 683{
640 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 692}
644 693
645char * 694char *
646SDL_GetError () 695SDL_GetError ()
647 696
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 729
681 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
682 while (*m) 731 while (*m)
683 { 732 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
685 { 734 {
686 AV *av = newAV (); 735 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
713 762
714 if (RETVAL) 763 if (RETVAL)
715 { 764 {
716 av_clear (texture_av); 765 av_clear (texture_av);
717 766
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#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);
720#include "glfunc.h" 769#include "glfunc.h"
721#undef GL_FUNC 770#undef GL_FUNC
722 } 771 }
723} 772}
730char * 779char *
731SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
732 781
733int 782int
734SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
735 787
736void 788void
737poll_events () 789poll_events ()
738 PPCODE: 790 PPCODE:
739{ 791{
749 { 801 {
750 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
751 case SDL_KEYUP: 803 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 809 break;
758 810
759 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 830 x = ev.motion.x;
779 y = ev.motion.y; 831 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 833 }
782 834
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 841 }
790 break; 842 break;
791 843
792 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 847
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 858 break;
807 } 859 }
808 860
809 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))));
810 } 862 }
811} 863}
812 864
813int 865int
814Mix_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)
815 POSTCALL: 867 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
817 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}
818 886
819void 887void
820Mix_CloseAudio () 888Mix_CloseAudio ()
821 889
822int 890int
857 } 925 }
858 } 926 }
859#endif 927#endif
860} 928}
861 929
862void 930int
863add_font (char *file) 931add_font (char *file)
864 CODE: 932 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
866 936
867void 937void
868load_image_inline (SV *image_) 938load_image_inline (SV *image_)
869 ALIAS: 939 ALIAS:
870 load_image_file = 1 940 load_image_file = 1
956void 1026void
957error (char *message) 1027error (char *message)
958 CODE: 1028 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1030#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1032#endif
963 1033
964void 1034void
965fatal (char *message) 1035fatal (char *message)
966 CODE: 1036 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1038#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1040#endif
971 _exit (1); 1041 _exit (1);
972 1042
973void 1043void
974_exit (int retval = 0) 1044_exit (int retval = 0)
986#if DEBUG 1056#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
988#endif 1058#endif
989} 1059}
990 1060
991MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
992 1062
993PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
994 1064
995CFPlus::Font 1065DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1067 CODE:
998{ 1068{
999 int count; 1069 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1073}
1004 OUTPUT: 1074 OUTPUT:
1005 RETVAL 1075 RETVAL
1006 1076
1007void 1077void
1008DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
1009 CODE: 1079 CODE:
1010 pango_font_description_free (self); 1080 pango_font_description_free (self);
1011 1081
1012void 1082void
1013make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1014 PROTOTYPE: $ 1084 PROTOTYPE: $
1015 CODE: 1085 CODE:
1016 default_font = self; 1086 default_font = self;
1017 1087
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1089
1020PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1021 1091
1022void 1092void
1023reset_glyph_cache () 1093glyph_cache_backup ()
1024 PROTOTYPE: 1094 PROTOTYPE:
1025 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1026 tc_clear (); 1102 tc_restore ();
1027 1103
1028CFPlus::Layout 1104DC::Layout
1029new (SV *class) 1105new (SV *class)
1030 CODE: 1106 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1032 1108
1033 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1040 1117
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1043 OUTPUT: 1120 OUTPUT:
1044 RETVAL 1121 RETVAL
1045 1122
1046void 1123void
1047DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1048 CODE: 1125 CODE:
1049 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
1050 Safefree (self); 1128 Safefree (self);
1051 1129
1052void 1130void
1053set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1054 CODE: 1132 CODE:
1055{ 1133{
1056 STRLEN textlen; 1134 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1058 1136
1059 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1060} 1138}
1061 1139
1062void 1140void
1063set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1064 CODE: 1142 CODE:
1065{ 1143{
1066 STRLEN textlen; 1144 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1068 1146
1069 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1070} 1148}
1071 1149
1072void 1150void
1073set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1074 CODE: 1152 CODE:
1075{ 1153{
1076 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1156 const char *pos = text;
1113 if (attrs) 1191 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1115} 1193}
1116 1194
1117void 1195void
1118get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1119 PPCODE: 1197 PPCODE:
1120{ 1198{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1200
1123 do 1201 do
1124 { 1202 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1204
1127 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1128 { 1206 {
1129 PangoRectangle extents; 1207 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1216
1139 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1140} 1218}
1141 1219
1142int 1220int
1143has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1144 CODE: 1222 CODE:
1145{ 1223{
1146 int lines = 1; 1224 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1148 1226
1153} 1231}
1154 OUTPUT: 1232 OUTPUT:
1155 RETVAL 1233 RETVAL
1156 1234
1157SV * 1235SV *
1158get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1159 CODE: 1237 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1240 OUTPUT:
1163 RETVAL 1241 RETVAL
1164 1242
1165void 1243void
1166set_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.)
1167 CODE: 1245 CODE:
1168 self->r = r; 1246 self->r = r;
1169 self->g = g; 1247 self->g = g;
1170 self->b = b; 1248 self->b = b;
1171 self->a = a; 1249 self->a = a;
1172 1250
1173void 1251void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1253 CODE:
1176 if (self->font != font) 1254 if (self->font != font)
1177 { 1255 {
1178 self->font = font; 1256 self->font = font;
1179 layout_update_font (self); 1257 layout_update_font (self);
1180 } 1258 }
1181 1259
1182void 1260void
1183set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1184 CODE: 1262 CODE:
1185 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1186 { 1264 {
1187 self->base_height = base_height; 1265 self->base_height = base_height;
1188 layout_update_font (self); 1266 layout_update_font (self);
1189 } 1267 }
1190 1268
1191void 1269void
1192set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1271 CODE:
1194 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);
1195 1273
1196void 1274void
1197set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1198 CODE: 1276 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1278
1201void 1279void
1202set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1203 CODE: 1281 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1283
1206void 1284void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1286 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1214 ); 1292 );
1215 1293
1216void 1294void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1296 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1298
1221void 1299void
1222size (CFPlus::Layout self) 1300size (DC::Layout self)
1223 PPCODE: 1301 PPCODE:
1224{ 1302{
1225 int w, h; 1303 int w, h;
1226 1304
1227 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1232} 1310}
1233 1311
1234int 1312int
1235descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1236 CODE: 1314 CODE:
1237{ 1315{
1238 PangoRectangle rect; 1316 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1242} 1320}
1243 OUTPUT: 1321 OUTPUT:
1244 RETVAL 1322 RETVAL
1245 1323
1246int 1324int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1326 CODE:
1249{ 1327{
1250 int index, trailing; 1328 int index, trailing;
1251 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);
1252 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1253} 1331}
1254 OUTPUT: 1332 OUTPUT:
1255 RETVAL 1333 RETVAL
1256 1334
1257void 1335void
1258cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1337 PPCODE:
1260{ 1338{
1261 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1341
1264 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1346}
1269 1347
1270void 1348void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1350 PPCODE:
1273{ 1351{
1274 int line, x; 1352 int line, x;
1275 1353
1276 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)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1357 --line;
1358#endif
1279 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1362}
1283 1363
1284void 1364void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1366 PPCODE:
1287{ 1367{
1288 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1289 int index, trailing; 1369 int index, trailing;
1290 1370
1291 if (line < 0) 1371 if (line < 0)
1292 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1293 1373
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1296 1376
1297 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);
1298 1378
1299 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1386 }
1307} 1387}
1308 1388
1309void 1389void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1313 self->pl, 1394 self->pl,
1395 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1316 flags 1398 flags
1317 ); 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);
1318 1403
1319MODULE = 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
1320 1424
1321PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1426
1325void 1427void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1429 CODE:
1328{ 1430{
1405 RETVAL = width > 0; 1507 RETVAL = width > 0;
1406} 1508}
1407 OUTPUT: 1509 OUTPUT:
1408 RETVAL 1510 RETVAL
1409 1511
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1513
1412PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1413 1515
1414CFPlus::Map 1516DC::Map
1415new (SV *class) 1517new (SV *class)
1416 CODE: 1518 CODE:
1417 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1520 RETVAL->x = 0;
1419 RETVAL->y = 0; 1521 RETVAL->y = 0;
1427 RETVAL->row = 0; 1529 RETVAL->row = 0;
1428 OUTPUT: 1530 OUTPUT:
1429 RETVAL 1531 RETVAL
1430 1532
1431void 1533void
1432DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1433 CODE: 1535 CODE:
1434{ 1536{
1435 map_clear (self); 1537 map_clear (self);
1436 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1437 Safefree (self->tex); 1539 Safefree (self->tex);
1438 Safefree (self); 1540 Safefree (self);
1439} 1541}
1440 1542
1441void 1543void
1442resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1545 CODE:
1444 self->w = map_width; 1546 self->w = map_width;
1445 self->h = map_height; 1547 self->h = map_height;
1446 1548
1447void 1549void
1448clear (CFPlus::Map self) 1550clear (DC::Map self)
1449 CODE: 1551 CODE:
1450 map_clear (self); 1552 map_clear (self);
1451 1553
1452void 1554void
1453set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1556 CODE:
1455{ 1557{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1559 need_texid (self, tile);
1458} 1560}
1459 1561
1460void 1562void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1564 CODE:
1463{ 1565{
1464 tileid texid; 1566 tileid texid;
1465 maptex *tex; 1567 maptex *tex;
1466 1568
1479 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1481} 1583}
1482 1584
1483void 1585void
1484set_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)
1485 CODE: 1587 CODE:
1486{ 1588{
1487 need_texid (self, texid); 1589 need_texid (self, texid);
1488 1590
1489 { 1591 {
1509 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1613}
1512 1614
1513int 1615int
1514ox (CFPlus::Map self) 1616ox (DC::Map self)
1515 ALIAS: 1617 ALIAS:
1516 oy = 1 1618 oy = 1
1517 x = 2 1619 x = 2
1518 y = 3 1620 y = 3
1519 w = 4 1621 w = 4
1530 } 1632 }
1531 OUTPUT: 1633 OUTPUT:
1532 RETVAL 1634 RETVAL
1533 1635
1534void 1636void
1535scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1536 CODE: 1638 CODE:
1537{ 1639{
1538 if (dx > 0) 1640 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1642 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1557 } 1659 }
1558} 1660}
1559 1661
1560SV * 1662SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1664 CODE:
1563{ 1665{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1668 mapcell *cell;
1594 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1595 1697
1596 do 1698 do
1597 { 1699 {
1598 ext = *data++; 1700 ext = *data++;
1599 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1600 1702
1601 if (cmd < 4) 1703 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1603 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1604 { 1706 {
1607 } 1709 }
1608 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1611 { 1713 {
1612 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1613 ; // 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);
1614 1718
1615 data += *data + 1; 1719 data += *data + 1;
1616 } 1720 }
1617 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 1722 cell->flags = *data++;
1655} 1759}
1656 OUTPUT: 1760 OUTPUT:
1657 RETVAL 1761 RETVAL
1658 1762
1659SV * 1763SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1765 CODE:
1662{ 1766{
1663 int x1, x; 1767 int x1, x;
1664 int y1, y; 1768 int y1, y;
1665 int z; 1769 int z;
1710} 1814}
1711 OUTPUT: 1815 OUTPUT:
1712 RETVAL 1816 RETVAL
1713 1817
1714void 1818void
1715draw (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)
1716 CODE: 1820 CODE:
1717{ 1821{
1822 int x, y, z;
1823
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 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
1720 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)
1721 smooth_key skey; 1827 smooth_key skey;
1722 int x, y, z; 1828 int pl_x, pl_y;
1723 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;
1724 1835
1725 // thats current max. sorry. 1836 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1837 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1838 if (sh > 255) sh = 255;
1728 1839
1729 // clear key, in case of extra padding 1840 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1841 memset (&skey, 0, sizeof (skey));
1731 1842
1732 glColor4ub (255, 255, 255, 255); 1843 memset (&key, 0, sizeof (key));
1733 1844 key.r = 255;
1734 glEnable (GL_BLEND); 1845 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1846 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1847 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1848 key.mode = GL_QUADS;
1738 1849 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1850 key.texname = -1;
1742 1851
1743 mx += self->x; 1852 mx += self->x;
1744 my += self->y; 1853 my += self->y;
1745 1854
1746 // first pass: determine smooth_max 1855 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1871 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1872 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1873 self->tex [cell->tile [2]].smoothlevel));
1765 } 1874 }
1766 } 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);
1767 1880
1768 for (z = 0; z <= 2; z++) 1881 for (z = 0; z <= 2; z++)
1769 { 1882 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1883 memset (smooth_level, 0, sizeof (smooth_level));
1771 1884
1781 tileid tile = cell->tile [z]; 1894 tileid tile = cell->tile [z];
1782 1895
1783 if (tile) 1896 if (tile)
1784 { 1897 {
1785 maptex tex = self->tex [tile]; 1898 maptex tex = self->tex [tile];
1786 int px, py; 1899 int px = (x + 1) * T - tex.w;
1900 int py = (y + 1) * T - tex.h;
1787 1901
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1902 if (key.texname != tex.name)
1791 { 1903 {
1792 if (!tex.name) 1904 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1905 tex = self->tex [2]; /* missing, replace by noface */
1794 1906
1795 glEnd (); 1907 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1909 }
1799 1910
1800 px = (x + 1) * T - tex.w; 1911 if (expect_false (cell->player == player) && expect_false (z == 2))
1801 py = (y + 1) * T - tex.h;
1802
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 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
1810 if (cell->flags & 1) 1927 if (cell->flags & 1)
1811 { 1928 {
1812 maptex tex = self->tex [1]; 1929 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1930 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1931 int py = y * T - T * 6 / 32;
1815 1932
1933 if (tex.name)
1816 glEnd (); 1934 {
1817 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);
1818 glBegin (GL_QUADS); 1945 }
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 } 1946 }
1825 } 1947 }
1826 1948
1827 // update smooth hash 1949 // update smooth hash
1828 if (tex.smoothtile) 1950 if (tex.smoothtile)
1864 } 1986 }
1865 } 1987 }
1866 } 1988 }
1867 } 1989 }
1868 1990
1991 rc_draw (rc);
1992 rc_clear (rc);
1993
1869 // go through all smoothlevels, lowest to highest, then draw. 1994 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 1995 // this is basically counting sort
1871 { 1996 {
1872 int w, b; 1997 int w, b;
1873 1998
1999 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2001 for (w = 0; w < 256 / 32; ++w)
1875 { 2002 {
1876 uint32_t smask = smooth_level [w]; 2003 uint32_t smask = smooth_level [w];
1877 if (smask) 2004 if (smask)
1878 for (b = 0; b < 32; ++b) 2005 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2024 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2026 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2027 float dy = tex.t * .5f ; // 2 images/column
1901 2028
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2029 if (tex.name)
1905 { 2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
1906 if (!tex.name) 2033 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2034 {
1908
1909 glEnd (); 2035 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2037 glBegin (GL_QUADS);
1912 } 2038 }
1913 2039
1914 if (border) 2040 if (border)
1915 { 2041 {
1916 float ox = border * dx; 2042 float ox = border * dx;
1917 2043
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2048 }
1923 2049
1924 if (corner) 2050 if (corner)
1925 { 2051 {
1926 float ox = corner * dx; 2052 float ox = corner * dx;
1927 2053
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2054 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2058 }
1932 } 2059 }
1933 } 2060 }
1934 } 2061 }
1935 } 2062 }
1936 } 2063 }
2064
2065 glEnd ();
2066 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1;
1937 } 2068 }
1938 2069
1939 hv_clear (smooth); 2070 hv_clear (smooth);
1940 } 2071 }
1941 2072
1942 glEnd (); 2073 if (pl_tex.name)
2074 {
2075 maptex tex = pl_tex;
2076 int px = pl_x + pdx;
2077 int py = pl_y + pdy;
1943 2078
1944 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
1945 glDisable (GL_BLEND); 2090 glDisable (GL_BLEND);
2091 rc_free (rc);
1946 2092
1947 // top layer: overlays such as the health bar 2093 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2094 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2095 if (0 <= y + my && y + my < self->rows)
1950 { 2096 {
1975 } 2121 }
1976 } 2122 }
1977} 2123}
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:
2355 2522
2356void 2523void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2525 CODE:
2359{ 2526{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2530}
2364 2531
2365void 2532void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2533set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2534 CODE:
2368 Mix_SetReverseStereo (self, flip); 2535 Mix_SetReverseStereo (self, flip);
2369 2536
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2538
2372PROTOTYPES: DISABLE 2539PROTOTYPES: DISABLE
2373 2540
2374CFPlus::MixChunk 2541DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2376 CODE: 2543 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2544 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2545 OUTPUT:
2379 RETVAL 2546 RETVAL
2380 2547
2381void 2548void
2382DESTROY (CFPlus::MixChunk self) 2549DESTROY (DC::MixChunk self)
2383 CODE: 2550 CODE:
2384 Mix_FreeChunk (self); 2551 Mix_FreeChunk (self);
2385 2552
2386int 2553int
2387volume (CFPlus::MixChunk self, int volume = -1) 2554volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2555 CODE:
2389 if (items > 1) 2556 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2557 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2558 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2559 OUTPUT:
2393 RETVAL 2560 RETVAL
2394 2561
2395CFPlus::Channel 2562DC::Channel
2396play (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)
2397 CODE: 2564 CODE:
2398{ 2565{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2566 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2567
2401 if (RETVAL < 0) 2568 if (RETVAL < 0)
2408 } 2575 }
2409} 2576}
2410 OUTPUT: 2577 OUTPUT:
2411 RETVAL 2578 RETVAL
2412 2579
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2581
2415int 2582int
2416volume (int volume = -1) 2583volume (int volume = -1)
2417 PROTOTYPE: ;$ 2584 PROTOTYPE: ;$
2418 CODE: 2585 CODE:
2430void 2597void
2431halt () 2598halt ()
2432 CODE: 2599 CODE:
2433 Mix_HaltMusic (); 2600 Mix_HaltMusic ();
2434 2601
2435CFPlus::MixMusic 2602DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2603new (SV *class, DC::RW rwops)
2437 CODE: 2604 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2605 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2606 OUTPUT:
2440 RETVAL 2607 RETVAL
2441 2608
2442void 2609void
2443DESTROY (CFPlus::MixMusic self) 2610DESTROY (DC::MixMusic self)
2444 CODE: 2611 CODE:
2445 Mix_FreeMusic (self); 2612 Mix_FreeMusic (self);
2446 2613
2447int 2614int
2448play (CFPlus::MixMusic self, int loops = -1) 2615play (DC::MixMusic self, int loops = -1)
2449 CODE: 2616 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2617 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2618 OUTPUT:
2452 RETVAL 2619 RETVAL
2453 2620
2454void 2621void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2622fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2623 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2624 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2625
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2626MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2627
2461PROTOTYPES: ENABLE 2628PROTOTYPES: ENABLE
2462 2629
2463BOOT: 2630BOOT:
2464{ 2631{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2632 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2633 static const struct {
2467 const char *name; 2634 const char *name;
2468 IV iv; 2635 IV iv;
2469 } *civ, const_iv[] = { 2636 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2637# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2672 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2673 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2674 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2675 const_iv (GL_FLOAT),
2509 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),
2510 const_iv (GL_COMPILE), 2683 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2684 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2685 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2686 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2687 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2726 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2727 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2728 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2729 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2730 const_iv (GL_GENERATE_MIPMAP_HINT),
2731 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2732 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2733 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2734 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2735 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2736 const_iv (GL_V3F),
2570 2744
2571 texture_av = newAV (); 2745 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2746 AvREAL_off (texture_av);
2573} 2747}
2574 2748
2749void
2750disable_GL_EXT_blend_func_separate ()
2751 CODE:
2752 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0;
2754
2575char * 2755char *
2576gl_vendor () 2756gl_vendor ()
2577 CODE: 2757 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2758 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2759 OUTPUT:
2700 2880
2701void glRect (float x1, float y1, float x2, float y2) 2881void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2882 CODE:
2703 glRectf (x1, y1, x2, y2); 2883 glRectf (x1, y1, x2, y2);
2704 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
2705PROTOTYPES: ENABLE 2894PROTOTYPES: ENABLE
2706 2895
2707void glBegin (int mode) 2896void glBegin (int mode)
2708 2897
2709void glEnd () 2898void glEnd ()
2741void 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)
2742 CODE: 2931 CODE:
2743 if (gl.SeparableFilter2D) 2932 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2933 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2934
2746void 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)
2747 2936
2748void 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)
2749 2938
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2939void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2940
2777 2966
2778void glEndList () 2967void glEndList ()
2779 2968
2780void glCallList (int list) 2969void glCallList (int list)
2781 2970
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 2972
2784PROTOTYPES: DISABLE 2973PROTOTYPES: DISABLE
2785 2974
2786void 2975void
2787find_widget (SV *self, NV x, NV y) 2976find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 2980 XPUSHs (self);
2792} 2981}
2793 2982
2794BOOT: 2983BOOT:
2795{ 2984{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2985 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 2986
2798 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);
2799 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);
2800 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);
2801 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);
2802} 2991}
2803 2992
2804void 2993void
2805draw (SV *self) 2994draw (SV *self)
2806 CODE: 2995 CODE:
2810 NV x, y, w, h; 2999 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3000 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3001 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3002 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3003 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3004 double draw_x, draw_y;
2817 3005
2818 if (!SvROK (self)) 3006 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3007 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3008
2821 hv = (HV *)SvRV (self); 3009 hv = (HV *)SvRV (self);
2822 3010
2823 if (SvTYPE (hv) != SVt_PVHV) 3011 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3012 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3013
2826 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.;
2827 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.;
2828 3016
2829 if (!h || !w) 3017 if (!h || !w)
2849 { 3037 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3038 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3039
2852 if (svp && SvTRUE (*svp)) 3040 if (svp && SvTRUE (*svp))
2853 { 3041 {
2854 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);
2855 glEnable (GL_BLEND); 3043 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3044 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3045 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3046 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3047 glVertex2f (w, 0);
2862 glEnd (); 3050 glEnd ();
2863 glDisable (GL_BLEND); 3051 glDisable (GL_BLEND);
2864 } 3052 }
2865 } 3053 }
2866#if 0 3054#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3055 // draw borders, for debugging
2868 glPushMatrix; 3056 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3057 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3058 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3059 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3060 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3061 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3062 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3063 glVertex2f (0 , h - 1);
2876 glEnd; 3064 glEnd ();
2877 glPopMatrix; 3065 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3066#endif
2881 PUSHMARK (SP); 3067 PUSHMARK (SP);
2882 XPUSHs (self); 3068 XPUSHs (self);
2883 PUTBACK; 3069 PUTBACK;
2884 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