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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 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
120 143
121#include "pango-font.c" 144#include "pango-font.c"
122#include "pango-fontmap.c" 145#include "pango-fontmap.c"
123#include "pango-render.c" 146#include "pango-render.c"
124 147
125typedef IV CFPlus__Channel; 148typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 149typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 150typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 151typedef Mix_Music *DC__MixMusic;
129 152
130typedef PangoFontDescription *CFPlus__Font; 153typedef PangoFontDescription *DC__Font;
131 154
132static int 155static int
133shape_attr_p (PangoLayoutRun *run) 156shape_attr_p (PangoLayoutRun *run)
134{ 157{
135 GSList *attrs = run->item->analysis.extra_attrs; 158 GSList *attrs = run->item->analysis.extra_attrs;
149 172
150typedef struct cf_layout { 173typedef struct cf_layout {
151 PangoLayout *pl; 174 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 175 float r, g, b, a; // default color for rgba mode
153 int base_height; 176 int base_height;
154 CFPlus__Font font; 177 DC__Font font;
178 rc_t *rc;
155} *CFPlus__Layout; 179} *DC__Layout;
156 180
157static CFPlus__Font default_font; 181static DC__Font default_font;
158static PangoContext *opengl_context; 182static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
160 184
161static void 185static void
162substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
167#endif 191#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 193}
170 194
171static void 195static void
172layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
173{ 197{
174 /* 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
175 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
176 */ 200 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
178 202
179 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 205
182 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
183} 207}
184 208
185static void 209static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 211{
188 PangoRectangle rect; 212 PangoRectangle rect;
189 213
190 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
202 226
203typedef uint16_t tileid; 227typedef uint16_t tileid;
204typedef uint16_t faceid; 228typedef uint16_t faceid;
205 229
206typedef struct { 230typedef struct {
207 int name; 231 GLuint name;
208 int w, h; 232 int w, h;
209 float s, t; 233 float s, t;
210 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
211 tileid smoothtile; 235 tileid smoothtile;
212 uint8_t smoothlevel; 236 uint8_t smoothlevel;
230 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
232 256
233 int32_t rows; 257 int32_t rows;
234 maprow *row; 258 maprow *row;
235} *CFPlus__Map; 259} *DC__Map;
236 260
237static char * 261static char *
238prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
239{ 263{
240 char *p; 264 char *p;
278 self->texs *= 2; 302 self->texs *= 2;
279 } 303 }
280} 304}
281 305
282static maprow * 306static maprow *
283map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
284{ 308{
285 if (0 > y) 309 if (0 > y)
286 { 310 {
287 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
326 350
327 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
328} 352}
329 353
330static mapcell * 354static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
332{ 356{
333 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
334} 358}
335 359
336static void 360static void
337map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
338{ 362{
339 int r; 363 int r;
340 364
341 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
350 self->row = 0; 374 self->row = 0;
351 self->rows = 0; 375 self->rows = 0;
352} 376}
353 377
354static void 378static void
355map_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)
356{ 380{
357 int x, y; 381 int x, y;
358 maprow *row; 382 maprow *row;
359 mapcell *cell; 383 mapcell *cell;
360 384
439 n |= n >> 16; 463 n |= n >> 16;
440 464
441 return n + 1; 465 return n + 1;
442} 466}
443 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
444/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
447 482
448/******************************************************************************/ 483/******************************************************************************/
486 return 0; 521 return 0;
487 522
488 return 1; 523 return 1;
489} 524}
490 525
491MODULE = CFPlus PACKAGE = CFPlus 526MODULE = Deliantra::Client PACKAGE = DC
492 527
493PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
494 529
495BOOT: 530BOOT:
496{ 531{
497 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 533 static const struct {
499 const char *name; 534 const char *name;
500 IV iv; 535 IV iv;
501 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
524 559
525 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
528 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 649# undef const_iv
611 }; 650 };
612 651
613 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; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 671
633NV floor (NV x) 672NV floor (NV x)
634 673
635NV ceil (NV x) 674NV ceil (NV x)
636 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
637void 680void
638pango_init () 681pango_init ()
639 CODE: 682 CODE:
640{ 683{
641 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
642 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);
643 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
644} 692}
645 693
646char * 694char *
647SDL_GetError () 695SDL_GetError ()
648 696
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 729
682 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
683 while (*m) 731 while (*m)
684 { 732 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 734 {
687 AV *av = newAV (); 735 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
714 762
715 if (RETVAL) 763 if (RETVAL)
716 { 764 {
717 av_clear (texture_av); 765 av_clear (texture_av);
718 766
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#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);
721#include "glfunc.h" 769#include "glfunc.h"
722#undef GL_FUNC 770#undef GL_FUNC
723 } 771 }
724} 772}
731char * 779char *
732SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
733 781
734int 782int
735SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
736 787
737void 788void
738poll_events () 789poll_events ()
739 PPCODE: 790 PPCODE:
740{ 791{
750 { 801 {
751 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
752 case SDL_KEYUP: 803 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 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);
756 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 */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 809 break;
759 810
760 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 830 x = ev.motion.x;
780 y = ev.motion.y; 831 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 833 }
783 834
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 841 }
791 break; 842 break;
792 843
793 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 847
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 858 break;
808 } 859 }
809 860
810 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))));
811 } 862 }
812} 863}
813 864
814int 865int
815Mix_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)
816 POSTCALL: 867 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
818 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}
819 886
820void 887void
821Mix_CloseAudio () 888Mix_CloseAudio ()
822 889
823int 890int
858 } 925 }
859 } 926 }
860#endif 927#endif
861} 928}
862 929
863void 930int
864add_font (char *file) 931add_font (char *file)
865 CODE: 932 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
867 936
868void 937void
869load_image_inline (SV *image_) 938load_image_inline (SV *image_)
870 ALIAS: 939 ALIAS:
871 load_image_file = 1 940 load_image_file = 1
957void 1026void
958error (char *message) 1027error (char *message)
959 CODE: 1028 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1030#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1032#endif
964 1033
965void 1034void
966fatal (char *message) 1035fatal (char *message)
967 CODE: 1036 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1038#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1040#endif
972 _exit (1); 1041 _exit (1);
973 1042
974void 1043void
975_exit (int retval = 0) 1044_exit (int retval = 0)
987#if DEBUG 1056#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
989#endif 1058#endif
990} 1059}
991 1060
992MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
993 1062
994PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
995 1064
996CFPlus::Font 1065DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1067 CODE:
999{ 1068{
1000 int count; 1069 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1073}
1005 OUTPUT: 1074 OUTPUT:
1006 RETVAL 1075 RETVAL
1007 1076
1008void 1077void
1009DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
1010 CODE: 1079 CODE:
1011 pango_font_description_free (self); 1080 pango_font_description_free (self);
1012 1081
1013void 1082void
1014make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1015 PROTOTYPE: $ 1084 PROTOTYPE: $
1016 CODE: 1085 CODE:
1017 default_font = self; 1086 default_font = self;
1018 1087
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1089
1021PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1022 1091
1023void 1092void
1024reset_glyph_cache () 1093glyph_cache_backup ()
1025 PROTOTYPE: 1094 PROTOTYPE:
1026 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1027 tc_clear (); 1102 tc_restore ();
1028 1103
1029CFPlus::Layout 1104DC::Layout
1030new (SV *class) 1105new (SV *class)
1031 CODE: 1106 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1033 1108
1034 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1111 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1112 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1113 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1114 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1115 RETVAL->font = 0;
1116 RETVAL->rc = rc_alloc ();
1041 1117
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1118 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1044 OUTPUT: 1120 OUTPUT:
1045 RETVAL 1121 RETVAL
1046 1122
1047void 1123void
1048DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1049 CODE: 1125 CODE:
1050 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1127 rc_free (self->rc);
1051 Safefree (self); 1128 Safefree (self);
1052 1129
1053void 1130void
1054set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1055 CODE: 1132 CODE:
1056{ 1133{
1057 STRLEN textlen; 1134 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1059 1136
1060 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1061} 1138}
1062 1139
1063void 1140void
1064set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1065 CODE: 1142 CODE:
1066{ 1143{
1067 STRLEN textlen; 1144 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1069 1146
1070 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1071} 1148}
1072 1149
1073void 1150void
1074set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1075 CODE: 1152 CODE:
1076{ 1153{
1077 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1156 const char *pos = text;
1114 if (attrs) 1191 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1116} 1193}
1117 1194
1118void 1195void
1119get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1120 PPCODE: 1197 PPCODE:
1121{ 1198{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1200
1124 do 1201 do
1125 { 1202 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1204
1128 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1129 { 1206 {
1130 PangoRectangle extents; 1207 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1216
1140 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1141} 1218}
1142 1219
1143int 1220int
1144has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1145 CODE: 1222 CODE:
1146{ 1223{
1147 int lines = 1; 1224 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1149 1226
1154} 1231}
1155 OUTPUT: 1232 OUTPUT:
1156 RETVAL 1233 RETVAL
1157 1234
1158SV * 1235SV *
1159get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1160 CODE: 1237 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1240 OUTPUT:
1164 RETVAL 1241 RETVAL
1165 1242
1166void 1243void
1167set_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.)
1168 CODE: 1245 CODE:
1169 self->r = r; 1246 self->r = r;
1170 self->g = g; 1247 self->g = g;
1171 self->b = b; 1248 self->b = b;
1172 self->a = a; 1249 self->a = a;
1173 1250
1174void 1251void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1253 CODE:
1177 if (self->font != font) 1254 if (self->font != font)
1178 { 1255 {
1179 self->font = font; 1256 self->font = font;
1180 layout_update_font (self); 1257 layout_update_font (self);
1181 } 1258 }
1182 1259
1183void 1260void
1184set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1185 CODE: 1262 CODE:
1186 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1187 { 1264 {
1188 self->base_height = base_height; 1265 self->base_height = base_height;
1189 layout_update_font (self); 1266 layout_update_font (self);
1190 } 1267 }
1191 1268
1192void 1269void
1193set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1271 CODE:
1195 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);
1196 1273
1197void 1274void
1198set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1199 CODE: 1276 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1278
1202void 1279void
1203set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1204 CODE: 1281 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1283
1207void 1284void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1286 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1215 ); 1292 );
1216 1293
1217void 1294void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1296 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1298
1222void 1299void
1223size (CFPlus::Layout self) 1300size (DC::Layout self)
1224 PPCODE: 1301 PPCODE:
1225{ 1302{
1226 int w, h; 1303 int w, h;
1227 1304
1228 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1233} 1310}
1234 1311
1235int 1312int
1236descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1237 CODE: 1314 CODE:
1238{ 1315{
1239 PangoRectangle rect; 1316 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1243} 1320}
1244 OUTPUT: 1321 OUTPUT:
1245 RETVAL 1322 RETVAL
1246 1323
1247int 1324int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1326 CODE:
1250{ 1327{
1251 int index, trailing; 1328 int index, trailing;
1252 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);
1253 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1254} 1331}
1255 OUTPUT: 1332 OUTPUT:
1256 RETVAL 1333 RETVAL
1257 1334
1258void 1335void
1259cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1337 PPCODE:
1261{ 1338{
1262 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1341
1265 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1346}
1270 1347
1271void 1348void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1350 PPCODE:
1274{ 1351{
1275 int line, x; 1352 int line, x;
1276 1353
1277 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)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1357 --line;
1358#endif
1280 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1362}
1284 1363
1285void 1364void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1366 PPCODE:
1288{ 1367{
1289 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1290 int index, trailing; 1369 int index, trailing;
1291 1370
1292 if (line < 0) 1371 if (line < 0)
1293 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1294 1373
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1297 1376
1298 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);
1299 1378
1300 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1386 }
1308} 1387}
1309 1388
1310void 1389void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1391 CODE:
1392 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1314 self->pl, 1394 self->pl,
1395 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1396 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1397 self->r, self->g, self->b, self->a,
1317 flags 1398 flags
1318 ); 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);
1319 1403
1320MODULE = 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
1321 1424
1322PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1426
1326void 1427void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1429 CODE:
1329{ 1430{
1406 RETVAL = width > 0; 1507 RETVAL = width > 0;
1407} 1508}
1408 OUTPUT: 1509 OUTPUT:
1409 RETVAL 1510 RETVAL
1410 1511
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1513
1413PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1414 1515
1415CFPlus::Map 1516DC::Map
1416new (SV *class) 1517new (SV *class)
1417 CODE: 1518 CODE:
1418 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1520 RETVAL->x = 0;
1420 RETVAL->y = 0; 1521 RETVAL->y = 0;
1428 RETVAL->row = 0; 1529 RETVAL->row = 0;
1429 OUTPUT: 1530 OUTPUT:
1430 RETVAL 1531 RETVAL
1431 1532
1432void 1533void
1433DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1434 CODE: 1535 CODE:
1435{ 1536{
1436 map_clear (self); 1537 map_clear (self);
1437 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1438 Safefree (self->tex); 1539 Safefree (self->tex);
1439 Safefree (self); 1540 Safefree (self);
1440} 1541}
1441 1542
1442void 1543void
1443resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1545 CODE:
1445 self->w = map_width; 1546 self->w = map_width;
1446 self->h = map_height; 1547 self->h = map_height;
1447 1548
1448void 1549void
1449clear (CFPlus::Map self) 1550clear (DC::Map self)
1450 CODE: 1551 CODE:
1451 map_clear (self); 1552 map_clear (self);
1452 1553
1453void 1554void
1454set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1556 CODE:
1456{ 1557{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1559 need_texid (self, tile);
1459} 1560}
1460 1561
1461void 1562void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1564 CODE:
1464{ 1565{
1465 tileid texid; 1566 tileid texid;
1466 maptex *tex; 1567 maptex *tex;
1467 1568
1480 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1482} 1583}
1483 1584
1484void 1585void
1485set_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)
1486 CODE: 1587 CODE:
1487{ 1588{
1488 need_texid (self, texid); 1589 need_texid (self, texid);
1489 1590
1490 { 1591 {
1510 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1613}
1513 1614
1514int 1615int
1515ox (CFPlus::Map self) 1616ox (DC::Map self)
1516 ALIAS: 1617 ALIAS:
1517 oy = 1 1618 oy = 1
1518 x = 2 1619 x = 2
1519 y = 3 1620 y = 3
1520 w = 4 1621 w = 4
1531 } 1632 }
1532 OUTPUT: 1633 OUTPUT:
1533 RETVAL 1634 RETVAL
1534 1635
1535void 1636void
1536scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1537 CODE: 1638 CODE:
1538{ 1639{
1539 if (dx > 0) 1640 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1642 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1558 } 1659 }
1559} 1660}
1560 1661
1561SV * 1662SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1664 CODE:
1564{ 1665{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1668 mapcell *cell;
1595 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1596 1697
1597 do 1698 do
1598 { 1699 {
1599 ext = *data++; 1700 ext = *data++;
1600 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1601 1702
1602 if (cmd < 4) 1703 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1604 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1605 { 1706 {
1608 } 1709 }
1609 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1612 { 1713 {
1613 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1614 ; // 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);
1615 1718
1616 data += *data + 1; 1719 data += *data + 1;
1617 } 1720 }
1618 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 1722 cell->flags = *data++;
1656} 1759}
1657 OUTPUT: 1760 OUTPUT:
1658 RETVAL 1761 RETVAL
1659 1762
1660SV * 1763SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1765 CODE:
1663{ 1766{
1664 int x1, x; 1767 int x1, x;
1665 int y1, y; 1768 int y1, y;
1666 int z; 1769 int z;
1711} 1814}
1712 OUTPUT: 1815 OUTPUT:
1713 RETVAL 1816 RETVAL
1714 1817
1715void 1818void
1716draw (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)
1717 CODE: 1820 CODE:
1718{ 1821{
1719 int x, y, z; 1822 int x, y, z;
1720 1823
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 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
1723 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)
1724 smooth_key skey; 1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1725 1832
1726 rc_t *rc = rc_alloc (); 1833 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1834 rc_key_t key;
1728 rc_array_t *arr; 1835 rc_array_t *arr;
1729 1836
1788 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1789 1896
1790 if (tile) 1897 if (tile)
1791 { 1898 {
1792 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1793 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1794 1902
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1798 { 1904 {
1799 if (!tex.name) 1905 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1801 1907
1802 key.texname = tex.name; 1908 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1804 } 1910 }
1805 1911
1806 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1807 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1808 1919
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813 1924
1814 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1815 { 1926 {
1816 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1) 1928 if (cell->flags & 1)
1818 { 1929 {
1819 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1876 } 1987 }
1877 } 1988 }
1878 } 1989 }
1879 } 1990 }
1880 1991
1992 rc_draw (rc);
1993 rc_clear (rc);
1994
1881 // go through all smoothlevels, lowest to highest, then draw. 1995 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 1996 // this is basically counting sort
1883 { 1997 {
1884 int w, b; 1998 int w, b;
1885 1999
2000 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2002 for (w = 0; w < 256 / 32; ++w)
1887 { 2003 {
1888 uint32_t smask = smooth_level [w]; 2004 uint32_t smask = smooth_level [w];
1889 if (smask) 2005 if (smask)
1890 for (b = 0; b < 32; ++b) 2006 for (b = 0; b < 32; ++b)
1915 { 2031 {
1916 // this time avoiding texture state changes 2032 // this time avoiding texture state changes
1917 // save gobs of state changes. 2033 // save gobs of state changes.
1918 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1919 { 2035 {
2036 glEnd ();
1920 key.texname = tex.name; 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2038 glBegin (GL_QUADS);
1922 } 2039 }
1923 2040
1924 if (border) 2041 if (border)
1925 { 2042 {
1926 float ox = border * dx; 2043 float ox = border * dx;
1927 2044
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2049 }
1933 2050
1934 if (corner) 2051 if (corner)
1935 { 2052 {
1936 float ox = corner * dx; 2053 float ox = corner * dx;
1937 2054
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2057 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2059 }
1943 } 2060 }
1944 } 2061 }
1945 } 2062 }
1946 } 2063 }
1947 } 2064 }
2065
2066 glEnd ();
2067 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1;
1948 } 2069 }
1949 2070
1950 hv_clear (smooth); 2071 hv_clear (smooth);
2072 }
2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
1951 rc_draw (rc); 2088 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2089 }
1954 2090
1955 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
1956 rc_free (rc); 2092 rc_free (rc);
1957 2093
1986 } 2122 }
1987 } 2123 }
1988} 2124}
1989 2125
1990void 2126void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2127draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1992 CODE: 2128 CODE:
1993{ 2129{
1994 static float color[16][3] = { 2130 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
1996 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2046 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2048} 2184}
2049 2185
2050void 2186void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2187fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2188 PPCODE:
2053{ 2189{
2054 int x, y; 2190 int x, y;
2055 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2129} 2265}
2130 2266
2131SV * 2267SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2268get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2269 CODE:
2134{ 2270{
2135 int x, y, x1, y1; 2271 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2330 else
2195 *data++ = 0; 2331 *data++ = 0;
2196 } 2332 }
2197 } 2333 }
2198 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2199 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2201 RETVAL = data_sv; 2342 RETVAL = data_sv;
2202} 2343}
2203 OUTPUT: 2344 OUTPUT:
2204 RETVAL 2345 RETVAL
2205 2346
2206void 2347void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2349 PPCODE:
2209{ 2350{
2210 int x, y, z; 2351 int x, y, z;
2211 int w, h; 2352 int w, h;
2212 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2213 2364
2214 if (*data++ != 0) 2365 if (*data++ != 0)
2215 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2216 2367
2217 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
2219 2370
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2371 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2383 {
2233 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2234 2385
2235 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2236 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2237 uint8_t flags = *data++; 2393 flags = *data++;
2238 2394
2239 if (flags) 2395 if (flags)
2240 { 2396 {
2241 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2403
2248 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2249 { 2405 {
2250 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2251 2408
2252 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2253 { 2410 {
2254 tileid t = tile [z]; 2411 tileid t = tile [z];
2255 2412
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2414 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2416 need_texid (self, t);
2260 } 2417 }
2261 2418
2262 cell->tile [z] = t; 2419 cell->tile [z] = t;
2263 } 2420 }
2265 } 2422 }
2266 } 2423 }
2267 } 2424 }
2268} 2425}
2269 2426
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2428
2272CFPlus::RW 2429DC::RW
2273new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2274 CODE: 2431 CODE:
2275{ 2432{
2276 STRLEN datalen; 2433 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2437}
2281 OUTPUT: 2438 OUTPUT:
2282 RETVAL 2439 RETVAL
2283 2440
2284CFPlus::RW 2441DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2443 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2445 OUTPUT:
2289 RETVAL 2446 RETVAL
2290 2447
2291# fails on win32: 2448# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2450#void
2294#close (CFPlus::RW self) 2451#close (DC::RW self)
2295# CODE: 2452# CODE:
2296# (self->(close)) (self); 2453# (self->(close)) (self);
2297 2454
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2456
2300PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2301 2458
2302CFPlus::Channel 2459DC::Channel
2303find () 2460find ()
2304 CODE: 2461 CODE:
2305{ 2462{
2306 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2307 2464
2320} 2477}
2321 OUTPUT: 2478 OUTPUT:
2322 RETVAL 2479 RETVAL
2323 2480
2324void 2481void
2325halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2326 CODE: 2483 CODE:
2327 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2328 2485
2329void 2486void
2330expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2331 CODE: 2488 CODE:
2332 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2333 2490
2334void 2491void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2493 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2338 2495
2339int 2496int
2340volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2341 CODE: 2498 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2500 OUTPUT:
2344 RETVAL 2501 RETVAL
2345 2502
2346void 2503void
2347unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2348 CODE: 2505 CODE:
2349 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2350 2507
2351void 2508void
2352set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2353 CODE: 2510 CODE:
2354 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2357 2514
2358void 2515void
2359set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2360 CODE: 2517 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2519
2363void 2520void
2364set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2522 CODE:
2366 2523
2367void 2524void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2526 CODE:
2370{ 2527{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2528 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2529 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2531}
2375 2532
2376void 2533void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2535 CODE:
2379 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2380 2537
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2539
2383PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2384 2541
2385CFPlus::MixChunk 2542DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2387 CODE: 2544 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2546 OUTPUT:
2390 RETVAL 2547 RETVAL
2391 2548
2392void 2549void
2393DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2394 CODE: 2551 CODE:
2395 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2396 2553
2397int 2554int
2398volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2556 CODE:
2400 if (items > 1) 2557 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2560 OUTPUT:
2404 RETVAL 2561 RETVAL
2405 2562
2406CFPlus::Channel 2563DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2564play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2565 CODE:
2409{ 2566{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2568
2412 if (RETVAL < 0) 2569 if (RETVAL < 0)
2419 } 2576 }
2420} 2577}
2421 OUTPUT: 2578 OUTPUT:
2422 RETVAL 2579 RETVAL
2423 2580
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2425 2582
2426int 2583int
2427volume (int volume = -1) 2584volume (int volume = -1)
2428 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2429 CODE: 2586 CODE:
2441void 2598void
2442halt () 2599halt ()
2443 CODE: 2600 CODE:
2444 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2445 2602
2446CFPlus::MixMusic 2603DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2448 CODE: 2605 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2607 OUTPUT:
2451 RETVAL 2608 RETVAL
2452 2609
2453void 2610void
2454DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2455 CODE: 2612 CODE:
2456 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2457 2614
2458int 2615int
2459play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2460 CODE: 2617 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 2619 OUTPUT:
2463 RETVAL 2620 RETVAL
2464 2621
2465void 2622void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 2624 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2469 2626
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 2628
2472PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2473 2630
2474BOOT: 2631BOOT:
2475{ 2632{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 2634 static const struct {
2478 const char *name; 2635 const char *name;
2479 IV iv; 2636 IV iv;
2480 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2516 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2677 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2678 const_iv (GL_COMPRESSED_ALPHA_ARB),
2679 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2680 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2681 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2682 const_iv (GL_COMPRESSED_RGB_ARB),
2683 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 2685 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 2686 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2727 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 2728 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 2729 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 2730 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 2731 const_iv (GL_GENERATE_MIPMAP_HINT),
2732 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 2734 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 2735 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
2581 2745
2582 texture_av = newAV (); 2746 texture_av = newAV ();
2583 AvREAL_off (texture_av); 2747 AvREAL_off (texture_av);
2584} 2748}
2585 2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
2755
2586char * 2756char *
2587gl_vendor () 2757gl_vendor ()
2588 CODE: 2758 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 2760 OUTPUT:
2711 2881
2712void glRect (float x1, float y1, float x2, float y2) 2882void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 2883 CODE:
2714 glRectf (x1, y1, x2, y2); 2884 glRectf (x1, y1, x2, y2);
2715 2885
2886void glRect_lineloop (float x1, float y1, float x2, float y2)
2887 CODE:
2888 glBegin (GL_LINE_LOOP);
2889 glVertex2f (x1, y1);
2890 glVertex2f (x2, y1);
2891 glVertex2f (x2, y2);
2892 glVertex2f (x1, y2);
2893 glEnd ();
2894
2716PROTOTYPES: ENABLE 2895PROTOTYPES: ENABLE
2717 2896
2718void glBegin (int mode) 2897void glBegin (int mode)
2719 2898
2720void glEnd () 2899void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2931void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 2932 CODE:
2754 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 2935
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2936void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 2937
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2938void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 2939
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 2941
2788 2967
2789void glEndList () 2968void glEndList ()
2790 2969
2791void glCallList (int list) 2970void glCallList (int list)
2792 2971
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 2973
2795PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2796 2975
2797void 2976void
2798find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 2981 XPUSHs (self);
2803} 2982}
2804 2983
2805BOOT: 2984BOOT:
2806{ 2985{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 2987
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2988 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2989 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2990 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2991 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 2992}
2814 2993
2815void 2994void
2816draw (SV *self) 2995draw (SV *self)
2817 CODE: 2996 CODE:
2821 NV x, y, w, h; 3000 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3001 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3002 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3005 double draw_x, draw_y;
2828 3006
2829 if (!SvROK (self)) 3007 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3009
2832 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2833 3011
2834 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3014
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3015 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3016 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3017
2840 if (!h || !w) 3018 if (!h || !w)
2860 { 3038 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3039 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3040
2863 if (svp && SvTRUE (*svp)) 3041 if (svp && SvTRUE (*svp))
2864 { 3042 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3043 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3044 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3045 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3046 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3047 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3048 glVertex2f (w, 0);
2873 glEnd (); 3051 glEnd ();
2874 glDisable (GL_BLEND); 3052 glDisable (GL_BLEND);
2875 } 3053 }
2876 } 3054 }
2877#if 0 3055#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3056 // draw borders, for debugging
2879 glPushMatrix; 3057 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3058 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3059 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3060 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3061 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3062 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3063 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3064 glVertex2f (0 , h - 1);
2887 glEnd; 3065 glEnd ();
2888 glPopMatrix; 3066 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3067#endif
2892 PUSHMARK (SP); 3068 PUSHMARK (SP);
2893 XPUSHs (self); 3069 XPUSHs (self);
2894 PUTBACK; 3070 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3071 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines