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.225 by root, Sat Aug 11 12:07:54 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;
155 rc_t *rc; 178 rc_t *rc;
156} *CFPlus__Layout; 179} *DC__Layout;
157 180
158static CFPlus__Font default_font; 181static DC__Font default_font;
159static PangoContext *opengl_context; 182static PangoContext *opengl_context;
160static PangoFontMap *opengl_fontmap; 183static PangoFontMap *opengl_fontmap;
161 184
162static void 185static void
163substitute_func (FcPattern *pattern, gpointer data) 186substitute_func (FcPattern *pattern, gpointer data)
168#endif 191#endif
169 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 192 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170} 193}
171 194
172static void 195static void
173layout_update_font (CFPlus__Layout self) 196layout_update_font (DC__Layout self)
174{ 197{
175 /* 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
176 * reasonably well with bitstream vera 199 * reasonably well with dejavu/bistream fonts
177 */ 200 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 201 PangoFontDescription *font = self->font ? self->font : default_font;
179 202
180 pango_font_description_set_absolute_size (font, 203 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 204 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182 205
183 pango_layout_set_font_description (self->pl, font); 206 pango_layout_set_font_description (self->pl, font);
184} 207}
185 208
186static void 209static void
187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 210layout_get_pixel_size (DC__Layout self, int *w, int *h)
188{ 211{
189 PangoRectangle rect; 212 PangoRectangle rect;
190 213
191 // get_pixel_* wrongly rounds down 214 // get_pixel_* wrongly rounds down
192 pango_layout_get_extents (self->pl, 0, &rect); 215 pango_layout_get_extents (self->pl, 0, &rect);
203 226
204typedef uint16_t tileid; 227typedef uint16_t tileid;
205typedef uint16_t faceid; 228typedef uint16_t faceid;
206 229
207typedef struct { 230typedef struct {
208 int name; 231 GLuint name;
209 int w, h; 232 int w, h;
210 float s, t; 233 float s, t;
211 uint8_t r, g, b, a; 234 uint8_t r, g, b, a;
212 tileid smoothtile; 235 tileid smoothtile;
213 uint8_t smoothlevel; 236 uint8_t smoothlevel;
231 int faces; tileid *face2tile; // [faceid] 254 int faces; tileid *face2tile; // [faceid]
232 int texs; maptex *tex; // [tileid] 255 int texs; maptex *tex; // [tileid]
233 256
234 int32_t rows; 257 int32_t rows;
235 maprow *row; 258 maprow *row;
236} *CFPlus__Map; 259} *DC__Map;
237 260
238static char * 261static char *
239prepend (char *ptr, int sze, int inc) 262prepend (char *ptr, int sze, int inc)
240{ 263{
241 char *p; 264 char *p;
279 self->texs *= 2; 302 self->texs *= 2;
280 } 303 }
281} 304}
282 305
283static maprow * 306static maprow *
284map_get_row (CFPlus__Map self, int y) 307map_get_row (DC__Map self, int y)
285{ 308{
286 if (0 > y) 309 if (0 > y)
287 { 310 {
288 int extend = - y + MAP_EXTEND_Y; 311 int extend = - y + MAP_EXTEND_Y;
289 Prepend (maprow, self->row, self->rows, extend); 312 Prepend (maprow, self->row, self->rows, extend);
327 350
328 return row->col + (x - row->c0); 351 return row->col + (x - row->c0);
329} 352}
330 353
331static mapcell * 354static mapcell *
332map_get_cell (CFPlus__Map self, int x, int y) 355map_get_cell (DC__Map self, int x, int y)
333{ 356{
334 return row_get_cell (map_get_row (self, y), x); 357 return row_get_cell (map_get_row (self, y), x);
335} 358}
336 359
337static void 360static void
338map_clear (CFPlus__Map self) 361map_clear (DC__Map self)
339{ 362{
340 int r; 363 int r;
341 364
342 for (r = 0; r < self->rows; r++) 365 for (r = 0; r < self->rows; r++)
343 Safefree (self->row[r].col); 366 Safefree (self->row[r].col);
351 self->row = 0; 374 self->row = 0;
352 self->rows = 0; 375 self->rows = 0;
353} 376}
354 377
355static void 378static void
356map_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)
357{ 380{
358 int x, y; 381 int x, y;
359 maprow *row; 382 maprow *row;
360 mapcell *cell; 383 mapcell *cell;
361 384
440 n |= n >> 16; 463 n |= n >> 16;
441 464
442 return n + 1; 465 return n + 1;
443} 466}
444 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
445/* SDL should provide this, really. */ 479/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300 480#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314 481#define SDLK_MODIFIER_MAX 314
448 482
449/******************************************************************************/ 483/******************************************************************************/
487 return 0; 521 return 0;
488 522
489 return 1; 523 return 1;
490} 524}
491 525
492MODULE = CFPlus PACKAGE = CFPlus 526MODULE = Deliantra::Client PACKAGE = DC
493 527
494PROTOTYPES: ENABLE 528PROTOTYPES: ENABLE
495 529
496BOOT: 530BOOT:
497{ 531{
498 HV *stash = gv_stashpv ("CFPlus", 1); 532 HV *stash = gv_stashpv ("DC", 1);
499 static const struct { 533 static const struct {
500 const char *name; 534 const char *name;
501 IV iv; 535 IV iv;
502 } *civ, const_iv[] = { 536 } *civ, const_iv[] = {
503# define const_iv(name) { # name, (IV)name } 537# define const_iv(name) { # name, (IV)name }
525 559
526 const_iv (SDL_APPINPUTFOCUS), 560 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS), 561 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE), 562 const_iv (SDL_APPACTIVE),
529 563
564 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST),
530 const_iv (SDLK_KP0), 566 const_iv (SDLK_KP0),
531 const_iv (SDLK_KP1), 567 const_iv (SDLK_KP1),
532 const_iv (SDLK_KP2), 568 const_iv (SDLK_KP2),
533 const_iv (SDLK_KP3), 569 const_iv (SDLK_KP3),
534 const_iv (SDLK_KP4), 570 const_iv (SDLK_KP4),
606 const_iv (KMOD_LMETA), 642 const_iv (KMOD_LMETA),
607 const_iv (KMOD_RMETA), 643 const_iv (KMOD_RMETA),
608 const_iv (KMOD_NUM), 644 const_iv (KMOD_NUM),
609 const_iv (KMOD_CAPS), 645 const_iv (KMOD_CAPS),
610 const_iv (KMOD_MODE), 646 const_iv (KMOD_MODE),
647
648 const_iv (MIX_DEFAULT_FORMAT),
611# undef const_iv 649# undef const_iv
612 }; 650 };
613 651
614 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; )
615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
633 671
634NV floor (NV x) 672NV floor (NV x)
635 673
636NV ceil (NV x) 674NV ceil (NV x)
637 675
676IV minpot (UV n)
677
678IV popcount (UV n)
679
638void 680void
639pango_init () 681pango_init ()
640 CODE: 682 CODE:
641{ 683{
642 opengl_fontmap = pango_opengl_font_map_new (); 684 opengl_fontmap = pango_opengl_font_map_new ();
643 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);
644 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
645} 692}
646 693
647char * 694char *
648SDL_GetError () 695SDL_GetError ()
649 696
681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682 729
683 if (m && m != (SDL_Rect **)-1) 730 if (m && m != (SDL_Rect **)-1)
684 while (*m) 731 while (*m)
685 { 732 {
686 if ((*m)->w >= 640 && (*m)->h >= 480) 733 if ((*m)->w >= 800 && (*m)->h >= 480)
687 { 734 {
688 AV *av = newAV (); 735 AV *av = newAV ();
689 av_push (av, newSViv ((*m)->w)); 736 av_push (av, newSViv ((*m)->w));
690 av_push (av, newSViv ((*m)->h)); 737 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb)); 738 av_push (av, newSViv (rgb));
715 762
716 if (RETVAL) 763 if (RETVAL)
717 { 764 {
718 av_clear (texture_av); 765 av_clear (texture_av);
719 766
720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721#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);
722#include "glfunc.h" 769#include "glfunc.h"
723#undef GL_FUNC 770#undef GL_FUNC
724 } 771 }
725} 772}
732char * 779char *
733SDL_GetKeyName (int sym) 780SDL_GetKeyName (int sym)
734 781
735int 782int
736SDL_GetAppState () 783SDL_GetAppState ()
784
785int
786SDL_GetModState ()
737 787
738void 788void
739poll_events () 789poll_events ()
740 PPCODE: 790 PPCODE:
741{ 791{
751 { 801 {
752 case SDL_KEYDOWN: 802 case SDL_KEYDOWN:
753 case SDL_KEYUP: 803 case SDL_KEYUP:
754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756 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);
757 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 */
758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759 break; 809 break;
760 810
761 case SDL_ACTIVEEVENT: 811 case SDL_ACTIVEEVENT:
762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
780 x = ev.motion.x; 830 x = ev.motion.x;
781 y = ev.motion.y; 831 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 } 833 }
784 834
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 hv_store (hv, "state", 5, newSViv (state), 0); 836 hv_store (hv, "state", 5, newSViv (state), 0);
787 hv_store (hv, "x", 1, newSViv (x), 0); 837 hv_store (hv, "x", 1, newSViv (x), 0);
788 hv_store (hv, "y", 1, newSViv (y), 0); 838 hv_store (hv, "y", 1, newSViv (y), 0);
789 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 839 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 840 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 } 841 }
792 break; 842 break;
793 843
794 case SDL_MOUSEBUTTONDOWN: 844 case SDL_MOUSEBUTTONDOWN:
795 case SDL_MOUSEBUTTONUP: 845 case SDL_MOUSEBUTTONUP:
796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 846 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797 847
798 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 848 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 849 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 850 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 851 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 856 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 857 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808 break; 858 break;
809 } 859 }
810 860
811 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))));
812 } 862 }
813} 863}
814 864
815int 865int
816Mix_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)
817 POSTCALL: 867 POSTCALL:
818 Mix_HookMusicFinished (music_finished); 868 Mix_HookMusicFinished (music_finished);
819 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}
820 886
821void 887void
822Mix_CloseAudio () 888Mix_CloseAudio ()
823 889
824int 890int
859 } 925 }
860 } 926 }
861#endif 927#endif
862} 928}
863 929
864void 930int
865add_font (char *file) 931add_font (char *file)
866 CODE: 932 CODE:
867 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT:
935 RETVAL
868 936
869void 937void
870load_image_inline (SV *image_) 938load_image_inline (SV *image_)
871 ALIAS: 939 ALIAS:
872 load_image_file = 1 940 load_image_file = 1
958void 1026void
959error (char *message) 1027error (char *message)
960 CODE: 1028 CODE:
961 fprintf (stderr, "ERROR: %s\n", message); 1029 fprintf (stderr, "ERROR: %s\n", message);
962#ifdef _WIN32 1030#ifdef _WIN32
963 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1031 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964#endif 1032#endif
965 1033
966void 1034void
967fatal (char *message) 1035fatal (char *message)
968 CODE: 1036 CODE:
969 fprintf (stderr, "FATAL: %s\n", message); 1037 fprintf (stderr, "FATAL: %s\n", message);
970#ifdef _WIN32 1038#ifdef _WIN32
971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1039 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972#endif 1040#endif
973 _exit (1); 1041 _exit (1);
974 1042
975void 1043void
976_exit (int retval = 0) 1044_exit (int retval = 0)
988#if DEBUG 1056#if DEBUG
989 VALGRIND_DO_LEAK_CHECK; 1057 VALGRIND_DO_LEAK_CHECK;
990#endif 1058#endif
991} 1059}
992 1060
993MODULE = CFPlus PACKAGE = CFPlus::Font 1061MODULE = Deliantra::Client PACKAGE = DC::Font
994 1062
995PROTOTYPES: DISABLE 1063PROTOTYPES: DISABLE
996 1064
997CFPlus::Font 1065DC::Font
998new_from_file (SV *class, char *path, int id = 0) 1066new_from_file (SV *class, char *path, int id = 0)
999 CODE: 1067 CODE:
1000{ 1068{
1001 int count; 1069 int count;
1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1005} 1073}
1006 OUTPUT: 1074 OUTPUT:
1007 RETVAL 1075 RETVAL
1008 1076
1009void 1077void
1010DESTROY (CFPlus::Font self) 1078DESTROY (DC::Font self)
1011 CODE: 1079 CODE:
1012 pango_font_description_free (self); 1080 pango_font_description_free (self);
1013 1081
1014void 1082void
1015make_default (CFPlus::Font self) 1083make_default (DC::Font self)
1016 PROTOTYPE: $ 1084 PROTOTYPE: $
1017 CODE: 1085 CODE:
1018 default_font = self; 1086 default_font = self;
1019 1087
1020MODULE = CFPlus PACKAGE = CFPlus::Layout 1088MODULE = Deliantra::Client PACKAGE = DC::Layout
1021 1089
1022PROTOTYPES: DISABLE 1090PROTOTYPES: DISABLE
1023 1091
1024void 1092void
1025reset_glyph_cache () 1093glyph_cache_backup ()
1026 PROTOTYPE: 1094 PROTOTYPE:
1027 CODE: 1095 CODE:
1096 tc_backup ();
1097
1098void
1099glyph_cache_restore ()
1100 PROTOTYPE:
1101 CODE:
1028 tc_clear (); 1102 tc_restore ();
1029 1103
1030CFPlus::Layout 1104DC::Layout
1031new (SV *class) 1105new (SV *class)
1032 CODE: 1106 CODE:
1033 New (0, RETVAL, 1, struct cf_layout); 1107 New (0, RETVAL, 1, struct cf_layout);
1034 1108
1035 RETVAL->pl = pango_layout_new (opengl_context); 1109 RETVAL->pl = pango_layout_new (opengl_context);
1045 layout_update_font (RETVAL); 1119 layout_update_font (RETVAL);
1046 OUTPUT: 1120 OUTPUT:
1047 RETVAL 1121 RETVAL
1048 1122
1049void 1123void
1050DESTROY (CFPlus::Layout self) 1124DESTROY (DC::Layout self)
1051 CODE: 1125 CODE:
1052 g_object_unref (self->pl); 1126 g_object_unref (self->pl);
1053 rc_free (self->rc); 1127 rc_free (self->rc);
1054 Safefree (self); 1128 Safefree (self);
1055 1129
1056void 1130void
1057set_text (CFPlus::Layout self, SV *text_) 1131set_text (DC::Layout self, SV *text_)
1058 CODE: 1132 CODE:
1059{ 1133{
1060 STRLEN textlen; 1134 STRLEN textlen;
1061 char *text = SvPVutf8 (text_, textlen); 1135 char *text = SvPVutf8 (text_, textlen);
1062 1136
1063 pango_layout_set_text (self->pl, text, textlen); 1137 pango_layout_set_text (self->pl, text, textlen);
1064} 1138}
1065 1139
1066void 1140void
1067set_markup (CFPlus::Layout self, SV *text_) 1141set_markup (DC::Layout self, SV *text_)
1068 CODE: 1142 CODE:
1069{ 1143{
1070 STRLEN textlen; 1144 STRLEN textlen;
1071 char *text = SvPVutf8 (text_, textlen); 1145 char *text = SvPVutf8 (text_, textlen);
1072 1146
1073 pango_layout_set_markup (self->pl, text, textlen); 1147 pango_layout_set_markup (self->pl, text, textlen);
1074} 1148}
1075 1149
1076void 1150void
1077set_shapes (CFPlus::Layout self, ...) 1151set_shapes (DC::Layout self, ...)
1078 CODE: 1152 CODE:
1079{ 1153{
1080 PangoAttrList *attrs = 0; 1154 PangoAttrList *attrs = 0;
1081 const char *text = pango_layout_get_text (self->pl); 1155 const char *text = pango_layout_get_text (self->pl);
1082 const char *pos = text; 1156 const char *pos = text;
1117 if (attrs) 1191 if (attrs)
1118 pango_layout_set_attributes (self->pl, attrs); 1192 pango_layout_set_attributes (self->pl, attrs);
1119} 1193}
1120 1194
1121void 1195void
1122get_shapes (CFPlus::Layout self) 1196get_shapes (DC::Layout self)
1123 PPCODE: 1197 PPCODE:
1124{ 1198{
1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1199 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126 1200
1127 do 1201 do
1128 { 1202 {
1129 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1203 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130 1204
1131 if (run && shape_attr_p (run)) 1205 if (run && shape_attr_p (run))
1132 { 1206 {
1133 PangoRectangle extents; 1207 PangoRectangle extents;
1134 pango_layout_iter_get_run_extents (iter, 0, &extents); 1208 pango_layout_iter_get_run_extents (iter, 0, &extents);
1142 1216
1143 pango_layout_iter_free (iter); 1217 pango_layout_iter_free (iter);
1144} 1218}
1145 1219
1146int 1220int
1147has_wrapped (CFPlus::Layout self) 1221has_wrapped (DC::Layout self)
1148 CODE: 1222 CODE:
1149{ 1223{
1150 int lines = 1; 1224 int lines = 1;
1151 const char *text = pango_layout_get_text (self->pl); 1225 const char *text = pango_layout_get_text (self->pl);
1152 1226
1157} 1231}
1158 OUTPUT: 1232 OUTPUT:
1159 RETVAL 1233 RETVAL
1160 1234
1161SV * 1235SV *
1162get_text (CFPlus::Layout self) 1236get_text (DC::Layout self)
1163 CODE: 1237 CODE:
1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1238 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165 sv_utf8_decode (RETVAL); 1239 sv_utf8_decode (RETVAL);
1166 OUTPUT: 1240 OUTPUT:
1167 RETVAL 1241 RETVAL
1168 1242
1169void 1243void
1170set_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.)
1171 CODE: 1245 CODE:
1172 self->r = r; 1246 self->r = r;
1173 self->g = g; 1247 self->g = g;
1174 self->b = b; 1248 self->b = b;
1175 self->a = a; 1249 self->a = a;
1176 1250
1177void 1251void
1178set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1252set_font (DC::Layout self, DC::Font font = 0)
1179 CODE: 1253 CODE:
1180 if (self->font != font) 1254 if (self->font != font)
1181 { 1255 {
1182 self->font = font; 1256 self->font = font;
1183 layout_update_font (self); 1257 layout_update_font (self);
1184 } 1258 }
1185 1259
1186void 1260void
1187set_height (CFPlus::Layout self, int base_height) 1261set_height (DC::Layout self, int base_height)
1188 CODE: 1262 CODE:
1189 if (self->base_height != base_height) 1263 if (self->base_height != base_height)
1190 { 1264 {
1191 self->base_height = base_height; 1265 self->base_height = base_height;
1192 layout_update_font (self); 1266 layout_update_font (self);
1193 } 1267 }
1194 1268
1195void 1269void
1196set_width (CFPlus::Layout self, int max_width = -1) 1270set_width (DC::Layout self, int max_width = -1)
1197 CODE: 1271 CODE:
1198 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);
1199 1273
1200void 1274void
1201set_indent (CFPlus::Layout self, int indent) 1275set_indent (DC::Layout self, int indent)
1202 CODE: 1276 CODE:
1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1277 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204 1278
1205void 1279void
1206set_spacing (CFPlus::Layout self, int spacing) 1280set_spacing (DC::Layout self, int spacing)
1207 CODE: 1281 CODE:
1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1282 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209 1283
1210void 1284void
1211set_ellipsise (CFPlus::Layout self, int ellipsise) 1285set_ellipsise (DC::Layout self, int ellipsise)
1212 CODE: 1286 CODE:
1213 pango_layout_set_ellipsize (self->pl, 1287 pango_layout_set_ellipsize (self->pl,
1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1288 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1289 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1290 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217 : PANGO_ELLIPSIZE_NONE 1291 : PANGO_ELLIPSIZE_NONE
1218 ); 1292 );
1219 1293
1220void 1294void
1221set_single_paragraph_mode (CFPlus::Layout self, int spm) 1295set_single_paragraph_mode (DC::Layout self, int spm)
1222 CODE: 1296 CODE:
1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1297 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224 1298
1225void 1299void
1226size (CFPlus::Layout self) 1300size (DC::Layout self)
1227 PPCODE: 1301 PPCODE:
1228{ 1302{
1229 int w, h; 1303 int w, h;
1230 1304
1231 layout_get_pixel_size (self, &w, &h); 1305 layout_get_pixel_size (self, &w, &h);
1234 PUSHs (sv_2mortal (newSViv (w))); 1308 PUSHs (sv_2mortal (newSViv (w)));
1235 PUSHs (sv_2mortal (newSViv (h))); 1309 PUSHs (sv_2mortal (newSViv (h)));
1236} 1310}
1237 1311
1238int 1312int
1239descent (CFPlus::Layout self) 1313descent (DC::Layout self)
1240 CODE: 1314 CODE:
1241{ 1315{
1242 PangoRectangle rect; 1316 PangoRectangle rect;
1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1317 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244 pango_layout_line_get_pixel_extents (line, 0, &rect); 1318 pango_layout_line_get_pixel_extents (line, 0, &rect);
1245 RETVAL = PANGO_DESCENT (rect); 1319 RETVAL = PANGO_DESCENT (rect);
1246} 1320}
1247 OUTPUT: 1321 OUTPUT:
1248 RETVAL 1322 RETVAL
1249 1323
1250int 1324int
1251xy_to_index (CFPlus::Layout self, int x, int y) 1325xy_to_index (DC::Layout self, int x, int y)
1252 CODE: 1326 CODE:
1253{ 1327{
1254 int index, trailing; 1328 int index, trailing;
1255 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);
1256 RETVAL = index + trailing; 1330 RETVAL = index + trailing;
1257} 1331}
1258 OUTPUT: 1332 OUTPUT:
1259 RETVAL 1333 RETVAL
1260 1334
1261void 1335void
1262cursor_pos (CFPlus::Layout self, int index) 1336cursor_pos (DC::Layout self, int index)
1263 PPCODE: 1337 PPCODE:
1264{ 1338{
1265 PangoRectangle strong_pos; 1339 PangoRectangle pos;
1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1340 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267 1341
1268 EXTEND (SP, 3); 1342 EXTEND (SP, 3);
1269 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1343 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272} 1346}
1273 1347
1274void 1348void
1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1349index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276 PPCODE: 1350 PPCODE:
1277{ 1351{
1278 int line, x; 1352 int line, x;
1279 1353
1280 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)
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1356 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282 1357 --line;
1358#endif
1283 EXTEND (SP, 2); 1359 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1))); 1360 PUSHs (sv_2mortal (newSViv (line)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1361 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286} 1362}
1287 1363
1288void 1364void
1289line_x_to_index (CFPlus::Layout self, int line, int x) 1365line_x_to_index (DC::Layout self, int line, int x)
1290 PPCODE: 1366 PPCODE:
1291{ 1367{
1292 PangoLayoutLine *lp; 1368 PangoLayoutLine *lp;
1293 int index, trailing; 1369 int index, trailing;
1294 1370
1295 if (line < 0) 1371 if (line < 0)
1296 XSRETURN_EMPTY; 1372 XSRETURN_EMPTY;
1297 1373
1298 if (!(lp = pango_layout_get_line (self->pl, line))) 1374 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */ 1375 XSRETURN_EMPTY; /* do better */
1300 1376
1301 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);
1302 1378
1303 EXTEND (SP, 2); 1379 EXTEND (SP, 2);
1309 PUSHs (sv_2mortal (newSViv (trailing))); 1385 PUSHs (sv_2mortal (newSViv (trailing)));
1310 } 1386 }
1311} 1387}
1312 1388
1313void 1389void
1314render (CFPlus::Layout self, float x, float y, int flags = 0) 1390render (DC::Layout self, float x, float y, int flags = 0)
1315 CODE: 1391 CODE:
1316 rc_clear (self->rc); 1392 rc_clear (self->rc);
1317 pango_opengl_render_layout_subpixel ( 1393 pango_opengl_render_layout_subpixel (
1318 self->pl, 1394 self->pl,
1319 self->rc, 1395 self->rc,
1324 // we assume that context_change actually clears/frees stuff 1400 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation... 1401 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl); 1402 pango_layout_context_changed (self->pl);
1327 1403
1328void 1404void
1329draw (CFPlus::Layout self) 1405draw (DC::Layout self)
1330 CODE: 1406 CODE:
1331{ 1407{
1332 glEnable (GL_TEXTURE_2D); 1408 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 1409 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND); 1410 glEnable (GL_BLEND);
1342 glDisable (GL_ALPHA_TEST); 1418 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND); 1419 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D); 1420 glDisable (GL_TEXTURE_2D);
1345} 1421}
1346 1422
1347MODULE = CFPlus PACKAGE = CFPlus::Texture 1423MODULE = Deliantra::Client PACKAGE = DC::Texture
1348 1424
1349PROTOTYPES: ENABLE 1425PROTOTYPES: ENABLE
1350
1351int minpot (int n)
1352 1426
1353void 1427void
1354pad (SV *data_, int ow, int oh, int nw, int nh) 1428pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE: 1429 CODE:
1356{ 1430{
1433 RETVAL = width > 0; 1507 RETVAL = width > 0;
1434} 1508}
1435 OUTPUT: 1509 OUTPUT:
1436 RETVAL 1510 RETVAL
1437 1511
1438MODULE = CFPlus PACKAGE = CFPlus::Map 1512MODULE = Deliantra::Client PACKAGE = DC::Map
1439 1513
1440PROTOTYPES: DISABLE 1514PROTOTYPES: DISABLE
1441 1515
1442CFPlus::Map 1516DC::Map
1443new (SV *class) 1517new (SV *class)
1444 CODE: 1518 CODE:
1445 New (0, RETVAL, 1, struct map); 1519 New (0, RETVAL, 1, struct map);
1446 RETVAL->x = 0; 1520 RETVAL->x = 0;
1447 RETVAL->y = 0; 1521 RETVAL->y = 0;
1455 RETVAL->row = 0; 1529 RETVAL->row = 0;
1456 OUTPUT: 1530 OUTPUT:
1457 RETVAL 1531 RETVAL
1458 1532
1459void 1533void
1460DESTROY (CFPlus::Map self) 1534DESTROY (DC::Map self)
1461 CODE: 1535 CODE:
1462{ 1536{
1463 map_clear (self); 1537 map_clear (self);
1464 Safefree (self->face2tile); 1538 Safefree (self->face2tile);
1465 Safefree (self->tex); 1539 Safefree (self->tex);
1466 Safefree (self); 1540 Safefree (self);
1467} 1541}
1468 1542
1469void 1543void
1470resize (CFPlus::Map self, int map_width, int map_height) 1544resize (DC::Map self, int map_width, int map_height)
1471 CODE: 1545 CODE:
1472 self->w = map_width; 1546 self->w = map_width;
1473 self->h = map_height; 1547 self->h = map_height;
1474 1548
1475void 1549void
1476clear (CFPlus::Map self) 1550clear (DC::Map self)
1477 CODE: 1551 CODE:
1478 map_clear (self); 1552 map_clear (self);
1479 1553
1480void 1554void
1481set_tileid (CFPlus::Map self, int face, int tile) 1555set_tileid (DC::Map self, int face, int tile)
1482 CODE: 1556 CODE:
1483{ 1557{
1484 need_facenum (self, face); self->face2tile [face] = tile; 1558 need_facenum (self, face); self->face2tile [face] = tile;
1485 need_texid (self, tile); 1559 need_texid (self, tile);
1486} 1560}
1487 1561
1488void 1562void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level) 1563set_smooth (DC::Map self, int face, int smooth, int level)
1490 CODE: 1564 CODE:
1491{ 1565{
1492 tileid texid; 1566 tileid texid;
1493 maptex *tex; 1567 maptex *tex;
1494 1568
1507 tex->smoothtile = self->face2tile [smooth]; 1581 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level; 1582 tex->smoothlevel = level;
1509} 1583}
1510 1584
1511void 1585void
1512set_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)
1513 CODE: 1587 CODE:
1514{ 1588{
1515 need_texid (self, texid); 1589 need_texid (self, texid);
1516 1590
1517 { 1591 {
1537 // from transparent color bleeding and ugly wrapping effects. 1611 // from transparent color bleeding and ugly wrapping effects.
1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539} 1613}
1540 1614
1541int 1615int
1542ox (CFPlus::Map self) 1616ox (DC::Map self)
1543 ALIAS: 1617 ALIAS:
1544 oy = 1 1618 oy = 1
1545 x = 2 1619 x = 2
1546 y = 3 1620 y = 3
1547 w = 4 1621 w = 4
1558 } 1632 }
1559 OUTPUT: 1633 OUTPUT:
1560 RETVAL 1634 RETVAL
1561 1635
1562void 1636void
1563scroll (CFPlus::Map self, int dx, int dy) 1637scroll (DC::Map self, int dx, int dy)
1564 CODE: 1638 CODE:
1565{ 1639{
1566 if (dx > 0) 1640 if (dx > 0)
1567 map_blank (self, self->x, self->y, dx, self->h); 1641 map_blank (self, self->x, self->y, dx, self->h);
1568 else if (dx < 0) 1642 else if (dx < 0)
1584 self->y += MAP_EXTEND_Y; 1658 self->y += MAP_EXTEND_Y;
1585 } 1659 }
1586} 1660}
1587 1661
1588SV * 1662SV *
1589map1a_update (CFPlus::Map self, SV *data_, int extmap) 1663map1a_update (DC::Map self, SV *data_, int extmap)
1590 CODE: 1664 CODE:
1591{ 1665{
1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593 uint8_t *data_end = (uint8_t *)SvEND (data_); 1667 uint8_t *data_end = (uint8_t *)SvEND (data_);
1594 mapcell *cell; 1668 mapcell *cell;
1622 uint8_t ext, cmd; 1696 uint8_t ext, cmd;
1623 1697
1624 do 1698 do
1625 { 1699 {
1626 ext = *data++; 1700 ext = *data++;
1627 cmd = ext & 0x3f; 1701 cmd = ext & 0x7f;
1628 1702
1629 if (cmd < 4) 1703 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1; 1704 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health 1705 else if (cmd == 5) // health
1632 { 1706 {
1635 } 1709 }
1636 else if (cmd == 6) // monster width 1710 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1; 1711 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47) 1712 else if (cmd == 0x47)
1639 { 1713 {
1640 if (*data == 4) 1714 if (*data == 1) cell->player = data [1];
1641 ; // 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);
1642 1718
1643 data += *data + 1; 1719 data += *data + 1;
1644 } 1720 }
1645 else if (cmd == 8) // cell flags 1721 else if (cmd == 8) // cell flags
1646 cell->flags = *data++; 1722 cell->flags = *data++;
1683} 1759}
1684 OUTPUT: 1760 OUTPUT:
1685 RETVAL 1761 RETVAL
1686 1762
1687SV * 1763SV *
1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1764mapmap (DC::Map self, int x0, int y0, int w, int h)
1689 CODE: 1765 CODE:
1690{ 1766{
1691 int x1, x; 1767 int x1, x;
1692 int y1, y; 1768 int y1, y;
1693 int z; 1769 int z;
1738} 1814}
1739 OUTPUT: 1815 OUTPUT:
1740 RETVAL 1816 RETVAL
1741 1817
1742void 1818void
1743draw (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)
1744 CODE: 1820 CODE:
1745{ 1821{
1746 int x, y, z; 1822 int x, y, z;
1747 1823
1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749 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
1750 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)
1751 smooth_key skey; 1827 smooth_key skey;
1828 int pl_x, pl_y;
1829 maptex pl_tex;
1830
1831 pl_tex.name = 0;
1752 1832
1753 rc_t *rc = rc_alloc (); 1833 rc_t *rc = rc_alloc ();
1754 rc_key_t key; 1834 rc_key_t key;
1755 rc_array_t *arr; 1835 rc_array_t *arr;
1756 1836
1815 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1816 1896
1817 if (tile) 1897 if (tile)
1818 { 1898 {
1819 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1820 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1821 1902
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1825 { 1904 {
1826 if (!tex.name) 1905 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1828 1907
1829 key.texname = tex.name; 1908 key.texname = tex.name;
1830 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1831 } 1910 }
1832 1911
1833 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1834 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1835 1919
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837 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);
1838 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);
1839 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);
1840 1924
1841 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1842 { 1926 {
1843 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1844 if (cell->flags & 1) 1928 if (cell->flags & 1)
1845 { 1929 {
1846 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
1911 // go through all smoothlevels, lowest to highest, then draw. 1995 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort 1996 // this is basically counting sort
1913 { 1997 {
1914 int w, b; 1998 int w, b;
1915 1999
2000 glEnable (GL_TEXTURE_2D);
2001 glBegin (GL_QUADS);
1916 for (w = 0; w < 256 / 32; ++w) 2002 for (w = 0; w < 256 / 32; ++w)
1917 { 2003 {
1918 uint32_t smask = smooth_level [w]; 2004 uint32_t smask = smooth_level [w];
1919 if (smask) 2005 if (smask)
1920 for (b = 0; b < 32; ++b) 2006 for (b = 0; b < 32; ++b)
1945 { 2031 {
1946 // this time avoiding texture state changes 2032 // this time avoiding texture state changes
1947 // save gobs of state changes. 2033 // save gobs of state changes.
1948 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1949 { 2035 {
2036 glEnd ();
1950 key.texname = tex.name; 2037 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1951 arr = rc_array (rc, &key); 2038 glBegin (GL_QUADS);
1952 } 2039 }
1953 2040
1954 if (border) 2041 if (border)
1955 { 2042 {
1956 float ox = border * dx; 2043 float ox = border * dx;
1957 2044
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2045 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2046 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2047 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2048 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1962 } 2049 }
1963 2050
1964 if (corner) 2051 if (corner)
1965 { 2052 {
1966 float ox = corner * dx; 2053 float ox = corner * dx;
1967 2054
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2055 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2056 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1970 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);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2058 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1972 } 2059 }
1973 } 2060 }
1974 } 2061 }
1975 } 2062 }
1976 } 2063 }
1977 } 2064 }
2065
2066 glEnd ();
2067 glDisable (GL_TEXTURE_2D);
2068 key.texname = -1;
1978 } 2069 }
1979 2070
1980 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
1981 rc_draw (rc); 2088 rc_draw (rc);
1982 rc_clear (rc);
1983 } 2089 }
1984 2090
1985 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
1986 rc_free (rc); 2092 rc_free (rc);
1987 2093
2016 } 2122 }
2017 } 2123 }
2018} 2124}
2019 2125
2020void 2126void
2021draw_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)
2022 CODE: 2128 CODE:
2023{ 2129{
2024 static float color[16][3] = { 2130 static float color[16][3] = {
2025 { 0.00F, 0.00F, 0.00F }, 2131 { 0.00F, 0.00F, 0.00F },
2026 { 1.00F, 1.00F, 1.00F }, 2132 { 1.00F, 1.00F, 1.00F },
2076 glDisable (GL_BLEND); 2182 glDisable (GL_BLEND);
2077 glDisable (GL_TEXTURE_2D); 2183 glDisable (GL_TEXTURE_2D);
2078} 2184}
2079 2185
2080void 2186void
2081fow_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)
2082 PPCODE: 2188 PPCODE:
2083{ 2189{
2084 int x, y; 2190 int x, y;
2085 int sw1 = sw + 2; 2191 int sw1 = sw + 2;
2086 int sh1 = sh + 2; 2192 int sh1 = sh + 2;
2157 PUSHs (sv_2mortal (newSViv (sh3))); 2263 PUSHs (sv_2mortal (newSViv (sh3)));
2158 PUSHs (darkness3_sv); 2264 PUSHs (darkness3_sv);
2159} 2265}
2160 2266
2161SV * 2267SV *
2162get_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)
2163 CODE: 2269 CODE:
2164{ 2270{
2165 int x, y, x1, y1; 2271 int x, y, x1, y1;
2166 SV *data_sv = newSV (w * h * 7 + 5); 2272 SV *data_sv = newSV (w * h * 7 + 5);
2167 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2273 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2224 else 2330 else
2225 *data++ = 0; 2331 *data++ = 0;
2226 } 2332 }
2227 } 2333 }
2228 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 {
2229 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2230 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2231 RETVAL = data_sv; 2342 RETVAL = data_sv;
2232} 2343}
2233 OUTPUT: 2344 OUTPUT:
2234 RETVAL 2345 RETVAL
2235 2346
2236void 2347void
2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2238 PPCODE: 2349 PPCODE:
2239{ 2350{
2240 int x, y, z; 2351 int x, y, z;
2241 int w, h; 2352 int w, h;
2242 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;
2243 2364
2244 if (*data++ != 0) 2365 if (*data++ != 0)
2245 return; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2246 2367
2247 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
2248 h = *data++ << 8; h |= *data++; 2369 h = *data++ << 8; h |= *data++;
2249 2370
2250 // 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
2262 { 2383 {
2263 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2264 2385
2265 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2266 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2267 uint8_t flags = *data++; 2393 flags = *data++;
2268 2394
2269 if (flags) 2395 if (flags)
2270 { 2396 {
2271 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2277 2403
2278 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2279 { 2405 {
2280 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2281 2408
2282 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2283 { 2410 {
2284 tileid t = tile [z]; 2411 tileid t = tile [z];
2285 2412
2286 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2287 { 2414 {
2288 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t); 2416 need_texid (self, t);
2290 } 2417 }
2291 2418
2292 cell->tile [z] = t; 2419 cell->tile [z] = t;
2293 } 2420 }
2295 } 2422 }
2296 } 2423 }
2297 } 2424 }
2298} 2425}
2299 2426
2300MODULE = CFPlus PACKAGE = CFPlus::RW 2427MODULE = Deliantra::Client PACKAGE = DC::RW
2301 2428
2302CFPlus::RW 2429DC::RW
2303new (SV *class, SV *data_sv) 2430new (SV *class, SV *data_sv)
2304 CODE: 2431 CODE:
2305{ 2432{
2306 STRLEN datalen; 2433 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen); 2434 char *data = SvPVbyte (data_sv, datalen);
2309 RETVAL = SDL_RWFromConstMem (data, datalen); 2436 RETVAL = SDL_RWFromConstMem (data, datalen);
2310} 2437}
2311 OUTPUT: 2438 OUTPUT:
2312 RETVAL 2439 RETVAL
2313 2440
2314CFPlus::RW 2441DC::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb") 2442new_from_file (SV *class, const char *path, const char *mode = "rb")
2316 CODE: 2443 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode); 2444 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT: 2445 OUTPUT:
2319 RETVAL 2446 RETVAL
2320 2447
2321# fails on win32: 2448# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '(' 2449# dc.xs(2268) : error C2059: syntax error : '('
2323#void 2450#void
2324#close (CFPlus::RW self) 2451#close (DC::RW self)
2325# CODE: 2452# CODE:
2326# (self->(close)) (self); 2453# (self->(close)) (self);
2327 2454
2328MODULE = CFPlus PACKAGE = CFPlus::Channel 2455MODULE = Deliantra::Client PACKAGE = DC::Channel
2329 2456
2330PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2331 2458
2332CFPlus::Channel 2459DC::Channel
2333find () 2460find ()
2334 CODE: 2461 CODE:
2335{ 2462{
2336 RETVAL = Mix_GroupAvailable (-1); 2463 RETVAL = Mix_GroupAvailable (-1);
2337 2464
2350} 2477}
2351 OUTPUT: 2478 OUTPUT:
2352 RETVAL 2479 RETVAL
2353 2480
2354void 2481void
2355halt (CFPlus::Channel self) 2482halt (DC::Channel self)
2356 CODE: 2483 CODE:
2357 Mix_HaltChannel (self); 2484 Mix_HaltChannel (self);
2358 2485
2359void 2486void
2360expire (CFPlus::Channel self, int ticks = -1) 2487expire (DC::Channel self, int ticks = -1)
2361 CODE: 2488 CODE:
2362 Mix_ExpireChannel (self, ticks); 2489 Mix_ExpireChannel (self, ticks);
2363 2490
2364void 2491void
2365fade_out (CFPlus::Channel self, int ticks = -1) 2492fade_out (DC::Channel self, int ticks = -1)
2366 CODE: 2493 CODE:
2367 Mix_FadeOutChannel (self, ticks); 2494 Mix_FadeOutChannel (self, ticks);
2368 2495
2369int 2496int
2370volume (CFPlus::Channel self, int volume) 2497volume (DC::Channel self, int volume)
2371 CODE: 2498 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2499 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT: 2500 OUTPUT:
2374 RETVAL 2501 RETVAL
2375 2502
2376void 2503void
2377unregister_all_effects (CFPlus::Channel self) 2504unregister_all_effects (DC::Channel self)
2378 CODE: 2505 CODE:
2379 Mix_UnregisterAllEffects (self); 2506 Mix_UnregisterAllEffects (self);
2380 2507
2381void 2508void
2382set_panning (CFPlus::Channel self, int left, int right) 2509set_panning (DC::Channel self, int left, int right)
2383 CODE: 2510 CODE:
2384 left = CLAMP (left , 0, 255); 2511 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255); 2512 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right); 2513 Mix_SetPanning (self, left, right);
2387 2514
2388void 2515void
2389set_distance (CFPlus::Channel self, int distance) 2516set_distance (DC::Channel self, int distance)
2390 CODE: 2517 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2518 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392 2519
2393void 2520void
2394set_position (CFPlus::Channel self, int angle, int distance) 2521set_position (DC::Channel self, int angle, int distance)
2395 CODE: 2522 CODE:
2396 2523
2397void 2524void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2525set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2399 CODE: 2526 CODE:
2400{ 2527{
2401 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));
2402 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);
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2530 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404} 2531}
2405 2532
2406void 2533void
2407set_reverse_stereo (CFPlus::Channel self, int flip) 2534set_reverse_stereo (DC::Channel self, int flip)
2408 CODE: 2535 CODE:
2409 Mix_SetReverseStereo (self, flip); 2536 Mix_SetReverseStereo (self, flip);
2410 2537
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2538MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2412 2539
2413PROTOTYPES: DISABLE 2540PROTOTYPES: DISABLE
2414 2541
2415CFPlus::MixChunk 2542DC::MixChunk
2416new (SV *class, CFPlus::RW rwops) 2543new (SV *class, DC::RW rwops)
2417 CODE: 2544 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2545 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT: 2546 OUTPUT:
2420 RETVAL 2547 RETVAL
2421 2548
2422void 2549void
2423DESTROY (CFPlus::MixChunk self) 2550DESTROY (DC::MixChunk self)
2424 CODE: 2551 CODE:
2425 Mix_FreeChunk (self); 2552 Mix_FreeChunk (self);
2426 2553
2427int 2554int
2428volume (CFPlus::MixChunk self, int volume = -1) 2555volume (DC::MixChunk self, int volume = -1)
2429 CODE: 2556 CODE:
2430 if (items > 1) 2557 if (items > 1)
2431 volume = CLAMP (volume, 0, 128); 2558 volume = CLAMP (volume, 0, 128);
2432 RETVAL = Mix_VolumeChunk (self, volume); 2559 RETVAL = Mix_VolumeChunk (self, volume);
2433 OUTPUT: 2560 OUTPUT:
2434 RETVAL 2561 RETVAL
2435 2562
2436CFPlus::Channel 2563DC::Channel
2437play (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)
2438 CODE: 2565 CODE:
2439{ 2566{
2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2567 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441 2568
2442 if (RETVAL < 0) 2569 if (RETVAL < 0)
2449 } 2576 }
2450} 2577}
2451 OUTPUT: 2578 OUTPUT:
2452 RETVAL 2579 RETVAL
2453 2580
2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2581MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2455 2582
2456int 2583int
2457volume (int volume = -1) 2584volume (int volume = -1)
2458 PROTOTYPE: ;$ 2585 PROTOTYPE: ;$
2459 CODE: 2586 CODE:
2471void 2598void
2472halt () 2599halt ()
2473 CODE: 2600 CODE:
2474 Mix_HaltMusic (); 2601 Mix_HaltMusic ();
2475 2602
2476CFPlus::MixMusic 2603DC::MixMusic
2477new (SV *class, CFPlus::RW rwops) 2604new (SV *class, DC::RW rwops)
2478 CODE: 2605 CODE:
2479 RETVAL = Mix_LoadMUS_RW (rwops); 2606 RETVAL = Mix_LoadMUS_RW (rwops);
2480 OUTPUT: 2607 OUTPUT:
2481 RETVAL 2608 RETVAL
2482 2609
2483void 2610void
2484DESTROY (CFPlus::MixMusic self) 2611DESTROY (DC::MixMusic self)
2485 CODE: 2612 CODE:
2486 Mix_FreeMusic (self); 2613 Mix_FreeMusic (self);
2487 2614
2488int 2615int
2489play (CFPlus::MixMusic self, int loops = -1) 2616play (DC::MixMusic self, int loops = -1)
2490 CODE: 2617 CODE:
2491 RETVAL = Mix_PlayMusic (self, loops); 2618 RETVAL = Mix_PlayMusic (self, loops);
2492 OUTPUT: 2619 OUTPUT:
2493 RETVAL 2620 RETVAL
2494 2621
2495void 2622void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2623fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2497 CODE: 2624 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position); 2625 Mix_FadeInMusicPos (self, loops, ms, position);
2499 2626
2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2627MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2501 2628
2502PROTOTYPES: ENABLE 2629PROTOTYPES: ENABLE
2503 2630
2504BOOT: 2631BOOT:
2505{ 2632{
2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2633 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2507 static const struct { 2634 static const struct {
2508 const char *name; 2635 const char *name;
2509 IV iv; 2636 IV iv;
2510 } *civ, const_iv[] = { 2637 } *civ, const_iv[] = {
2511# define const_iv(name) { # name, (IV)name } 2638# define const_iv(name) { # name, (IV)name }
2546 const_iv (GL_INTENSITY), 2673 const_iv (GL_INTENSITY),
2547 const_iv (GL_LUMINANCE), 2674 const_iv (GL_LUMINANCE),
2548 const_iv (GL_LUMINANCE_ALPHA), 2675 const_iv (GL_LUMINANCE_ALPHA),
2549 const_iv (GL_FLOAT), 2676 const_iv (GL_FLOAT),
2550 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),
2551 const_iv (GL_COMPILE), 2684 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D), 2685 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D), 2686 const_iv (GL_PROXY_TEXTURE_2D),
2554 const_iv (GL_TEXTURE_1D), 2687 const_iv (GL_TEXTURE_1D),
2555 const_iv (GL_TEXTURE_2D), 2688 const_iv (GL_TEXTURE_2D),
2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2727 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT), 2728 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT), 2729 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT), 2730 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT), 2731 const_iv (GL_GENERATE_MIPMAP_HINT),
2732 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2599 const_iv (GL_FASTEST), 2733 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE), 2734 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST), 2735 const_iv (GL_NICEST),
2602 const_iv (GL_V2F), 2736 const_iv (GL_V2F),
2603 const_iv (GL_V3F), 2737 const_iv (GL_V3F),
2611 2745
2612 texture_av = newAV (); 2746 texture_av = newAV ();
2613 AvREAL_off (texture_av); 2747 AvREAL_off (texture_av);
2614} 2748}
2615 2749
2750void
2751disable_GL_EXT_blend_func_separate ()
2752 CODE:
2753 gl.BlendFuncSeparate = 0;
2754 gl.BlendFuncSeparateEXT = 0;
2755
2616char * 2756char *
2617gl_vendor () 2757gl_vendor ()
2618 CODE: 2758 CODE:
2619 RETVAL = (char *)glGetString (GL_VENDOR); 2759 RETVAL = (char *)glGetString (GL_VENDOR);
2620 OUTPUT: 2760 OUTPUT:
2741 2881
2742void glRect (float x1, float y1, float x2, float y2) 2882void glRect (float x1, float y1, float x2, float y2)
2743 CODE: 2883 CODE:
2744 glRectf (x1, y1, x2, y2); 2884 glRectf (x1, y1, x2, y2);
2745 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
2746PROTOTYPES: ENABLE 2895PROTOTYPES: ENABLE
2747 2896
2748void glBegin (int mode) 2897void glBegin (int mode)
2749 2898
2750void glEnd () 2899void glEnd ()
2782void 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)
2783 CODE: 2932 CODE:
2784 if (gl.SeparableFilter2D) 2933 if (gl.SeparableFilter2D)
2785 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2934 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2786 2935
2787void 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)
2788 2937
2789void 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)
2790 2939
2791void glDrawPixels (int width, int height, int format, int type, char *pixels) 2940void glDrawPixels (int width, int height, int format, int type, char *pixels)
2792 2941
2818 2967
2819void glEndList () 2968void glEndList ()
2820 2969
2821void glCallList (int list) 2970void glCallList (int list)
2822 2971
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2972MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2824 2973
2825PROTOTYPES: DISABLE 2974PROTOTYPES: DISABLE
2826 2975
2827void 2976void
2828find_widget (SV *self, NV x, NV y) 2977find_widget (SV *self, NV x, NV y)
2832 XPUSHs (self); 2981 XPUSHs (self);
2833} 2982}
2834 2983
2835BOOT: 2984BOOT:
2836{ 2985{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2986 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2838 2987
2839 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);
2840 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);
2841 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);
2842 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);
2843} 2992}
2844 2993
2845void 2994void
2846draw (SV *self) 2995draw (SV *self)
2847 CODE: 2996 CODE:
2851 NV x, y, w, h; 3000 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv); 3001 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv); 3002 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv); 3003 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv); 3004 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h; 3005 double draw_x, draw_y;
2858 3006
2859 if (!SvROK (self)) 3007 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3008 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2861 3009
2862 hv = (HV *)SvRV (self); 3010 hv = (HV *)SvRV (self);
2863 3011
2864 if (SvTYPE (hv) != SVt_PVHV) 3012 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3013 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2866 3014
2867 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.;
2868 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.;
2869 3017
2870 if (!h || !w) 3018 if (!h || !w)
2890 { 3038 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3039 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892 3040
2893 if (svp && SvTRUE (*svp)) 3041 if (svp && SvTRUE (*svp))
2894 { 3042 {
2895 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);
2896 glEnable (GL_BLEND); 3044 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3045 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS); 3046 glBegin (GL_QUADS);
2899 glVertex2f (0, 0); 3047 glVertex2f (0, 0);
2900 glVertex2f (w, 0); 3048 glVertex2f (w, 0);
2903 glEnd (); 3051 glEnd ();
2904 glDisable (GL_BLEND); 3052 glDisable (GL_BLEND);
2905 } 3053 }
2906 } 3054 }
2907#if 0 3055#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) { 3056 // draw borders, for debugging
2909 glPushMatrix; 3057 glPushMatrix ();
2910 glColor 1, 1, 0, 1; 3058 glColor4f (1., 1., 0., 1.);
2911 glTranslate 0.375, 0.375; 3059 glTranslatef (.5, .5, 0.);
2912 glBegin GL_LINE_LOOP; 3060 glBegin (GL_LINE_LOOP);
2913 glVertex 0 , 0; 3061 glVertex2f (0 , 0);
2914 glVertex $self->{w} - 1, 0; 3062 glVertex2f (w - 1, 0);
2915 glVertex $self->{w} - 1, $self->{h} - 1; 3063 glVertex2f (w - 1, h - 1);
2916 glVertex 0 , $self->{h} - 1; 3064 glVertex2f (0 , h - 1);
2917 glEnd; 3065 glEnd ();
2918 glPopMatrix; 3066 glPopMatrix ();
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif 3067#endif
2922 PUSHMARK (SP); 3068 PUSHMARK (SP);
2923 XPUSHs (self); 3069 XPUSHs (self);
2924 PUTBACK; 3070 PUTBACK;
2925 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