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.220 by root, Thu Aug 9 11:02:08 2007 UTC vs.
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
40#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
41 46
42#include <glib/gmacros.h> 47#include <glib/gmacros.h>
43 48
44#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
45 61
46#ifndef _WIN32 62#ifndef _WIN32
47# include <sys/types.h> 63# include <sys/types.h>
48# include <sys/socket.h> 64# include <sys/socket.h>
49# include <netinet/in.h> 65# include <netinet/in.h>
58#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
60 76
61#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
62 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
63#if 0 82#if 0
64# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
65#else 84#else
66# define PARACHUTE 0 85# define PARACHUTE 0
67#endif 86#endif
109 av_push (texture_av, (SV *)(size_t)name); 128 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 129 glDeleteTextures (1, &name);
111} 130}
112 131
113#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
114 134
115#include "pango-font.c" 135#include "pango-font.c"
116#include "pango-fontmap.c" 136#include "pango-fontmap.c"
117#include "pango-render.c" 137#include "pango-render.c"
118 138
119typedef IV CFPlus__Channel; 139typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 140typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 142typedef Mix_Music *DC__MixMusic;
123 143
124typedef PangoFontDescription *CFPlus__Font; 144typedef PangoFontDescription *DC__Font;
125 145
126static int 146static int
127shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
128{ 148{
129 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
143 163
144typedef struct cf_layout { 164typedef struct cf_layout {
145 PangoLayout *pl; 165 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
147 int base_height; 167 int base_height;
148 CFPlus__Font font; 168 DC__Font font;
169 rc_t *rc;
149} *CFPlus__Layout; 170} *DC__Layout;
150 171
151static CFPlus__Font default_font; 172static DC__Font default_font;
152static PangoContext *opengl_context; 173static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
154 175
155static void 176static void
156substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
161#endif 182#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 184}
164 185
165static void 186static void
166layout_update_font (CFPlus__Layout self) 187layout_update_font (DC__Layout self)
167{ 188{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
170 */ 191 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
175 196
176 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
177} 198}
178 199
179static void 200static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 202{
182 PangoRectangle rect; 203 PangoRectangle rect;
183 204
184 // get_pixel_* wrongly rounds down 205 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 206 pango_layout_get_extents (self->pl, 0, &rect);
196 217
197typedef uint16_t tileid; 218typedef uint16_t tileid;
198typedef uint16_t faceid; 219typedef uint16_t faceid;
199 220
200typedef struct { 221typedef struct {
201 int name; 222 GLuint name;
202 int w, h; 223 int w, h;
203 float s, t; 224 float s, t;
204 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
205 tileid smoothtile; 226 tileid smoothtile;
206 uint8_t smoothlevel; 227 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 245 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 246 int texs; maptex *tex; // [tileid]
226 247
227 int32_t rows; 248 int32_t rows;
228 maprow *row; 249 maprow *row;
229} *CFPlus__Map; 250} *DC__Map;
230 251
231static char * 252static char *
232prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
233{ 254{
234 char *p; 255 char *p;
272 self->texs *= 2; 293 self->texs *= 2;
273 } 294 }
274} 295}
275 296
276static maprow * 297static maprow *
277map_get_row (CFPlus__Map self, int y) 298map_get_row (DC__Map self, int y)
278{ 299{
279 if (0 > y) 300 if (0 > y)
280 { 301 {
281 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
320 341
321 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
322} 343}
323 344
324static mapcell * 345static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
326{ 347{
327 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
328} 349}
329 350
330static void 351static void
331map_clear (CFPlus__Map self) 352map_clear (DC__Map self)
332{ 353{
333 int r; 354 int r;
334 355
335 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
344 self->row = 0; 365 self->row = 0;
345 self->rows = 0; 366 self->rows = 0;
346} 367}
347 368
348static void 369static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 371{
351 int x, y; 372 int x, y;
352 maprow *row; 373 maprow *row;
353 mapcell *cell; 374 mapcell *cell;
354 375
433 n |= n >> 16; 454 n |= n >> 16;
434 455
435 return n + 1; 456 return n + 1;
436} 457}
437 458
459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
438/* SDL should provide this, really. */ 470/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 471#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 472#define SDLK_MODIFIER_MAX 314
441 473
442/******************************************************************************/ 474/******************************************************************************/
480 return 0; 512 return 0;
481 513
482 return 1; 514 return 1;
483} 515}
484 516
485MODULE = CFPlus PACKAGE = CFPlus 517MODULE = Deliantra::Client PACKAGE = DC
486 518
487PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
488 520
489BOOT: 521BOOT:
490{ 522{
491 HV *stash = gv_stashpv ("CFPlus", 1); 523 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 524 static const struct {
493 const char *name; 525 const char *name;
494 IV iv; 526 IV iv;
495 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
518 550
519 const_iv (SDL_APPINPUTFOCUS), 551 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 552 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 553 const_iv (SDL_APPACTIVE),
522 554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
638
639 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 640# undef const_iv
605 }; 641 };
606 642
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 662
627NV floor (NV x) 663NV floor (NV x)
628 664
629NV ceil (NV x) 665NV ceil (NV x)
630 666
667IV minpot (UV n)
668
669IV popcount (UV n)
670
631void 671void
632pango_init () 672pango_init ()
633 CODE: 673 CODE:
634{ 674{
635 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif
638} 682}
639 683
640char * 684char *
641SDL_GetError () 685SDL_GetError ()
642 686
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 719
676 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
677 while (*m) 721 while (*m)
678 { 722 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 723 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 724 {
681 AV *av = newAV (); 725 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 728 av_push (av, newSViv (rgb));
708 752
709 if (RETVAL) 753 if (RETVAL)
710 { 754 {
711 av_clear (texture_av); 755 av_clear (texture_av);
712 756
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 759#include "glfunc.h"
716#undef GL_FUNC 760#undef GL_FUNC
717 } 761 }
718} 762}
725char * 769char *
726SDL_GetKeyName (int sym) 770SDL_GetKeyName (int sym)
727 771
728int 772int
729SDL_GetAppState () 773SDL_GetAppState ()
774
775int
776SDL_GetModState ()
730 777
731void 778void
732poll_events () 779poll_events ()
733 PPCODE: 780 PPCODE:
734{ 781{
744 { 791 {
745 case SDL_KEYDOWN: 792 case SDL_KEYDOWN:
746 case SDL_KEYUP: 793 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 799 break;
753 800
754 case SDL_ACTIVEEVENT: 801 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 820 x = ev.motion.x;
774 y = ev.motion.y; 821 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 823 }
777 824
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 826 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 827 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 828 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 829 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 830 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 831 }
785 break; 832 break;
786 833
787 case SDL_MOUSEBUTTONDOWN: 834 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 835 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 837
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 838 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 840 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 841 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 846 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 847 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 848 break;
802 } 849 }
803 850
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 851 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 852 }
806} 853}
807 854
808int 855int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 856Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 857 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 858 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 859 Mix_ChannelFinished (channel_finished);
860
861void
862Mix_QuerySpec ()
863 PPCODE:
864{
865 int freq, channels;
866 Uint16 format;
867
868 if (Mix_QuerySpec (&freq, &format, &channels))
869 {
870 EXTEND (SP, 3);
871 PUSHs (sv_2mortal (newSViv (freq)));
872 PUSHs (sv_2mortal (newSViv (format)));
873 PUSHs (sv_2mortal (newSViv (channels)));
874 }
875}
813 876
814void 877void
815Mix_CloseAudio () 878Mix_CloseAudio ()
816 879
817int 880int
951void 1014void
952error (char *message) 1015error (char *message)
953 CODE: 1016 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1017 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1018#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1019 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1020#endif
958 1021
959void 1022void
960fatal (char *message) 1023fatal (char *message)
961 CODE: 1024 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1025 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1026#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1027 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1028#endif
966 _exit (1); 1029 _exit (1);
967 1030
968void 1031void
969_exit (int retval = 0) 1032_exit (int retval = 0)
981#if DEBUG 1044#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1045 VALGRIND_DO_LEAK_CHECK;
983#endif 1046#endif
984} 1047}
985 1048
986MODULE = CFPlus PACKAGE = CFPlus::Font 1049MODULE = Deliantra::Client PACKAGE = DC::Font
987 1050
988PROTOTYPES: DISABLE 1051PROTOTYPES: DISABLE
989 1052
990CFPlus::Font 1053DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1054new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1055 CODE:
993{ 1056{
994 int count; 1057 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1061}
999 OUTPUT: 1062 OUTPUT:
1000 RETVAL 1063 RETVAL
1001 1064
1002void 1065void
1003DESTROY (CFPlus::Font self) 1066DESTROY (DC::Font self)
1004 CODE: 1067 CODE:
1005 pango_font_description_free (self); 1068 pango_font_description_free (self);
1006 1069
1007void 1070void
1008make_default (CFPlus::Font self) 1071make_default (DC::Font self)
1009 PROTOTYPE: $ 1072 PROTOTYPE: $
1010 CODE: 1073 CODE:
1011 default_font = self; 1074 default_font = self;
1012 1075
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1076MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1077
1015PROTOTYPES: DISABLE 1078PROTOTYPES: DISABLE
1016 1079
1017void 1080void
1018reset_glyph_cache () 1081glyph_cache_backup ()
1019 PROTOTYPE: 1082 PROTOTYPE:
1020 CODE: 1083 CODE:
1084 tc_backup ();
1085
1086void
1087glyph_cache_restore ()
1088 PROTOTYPE:
1089 CODE:
1021 tc_clear (); 1090 tc_restore ();
1022 1091
1023CFPlus::Layout 1092DC::Layout
1024new (SV *class) 1093new (SV *class)
1025 CODE: 1094 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1095 New (0, RETVAL, 1, struct cf_layout);
1027 1096
1028 RETVAL->pl = pango_layout_new (opengl_context); 1097 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1099 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1100 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1101 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1102 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1103 RETVAL->font = 0;
1104 RETVAL->rc = rc_alloc ();
1035 1105
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1106 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1107 layout_update_font (RETVAL);
1038 OUTPUT: 1108 OUTPUT:
1039 RETVAL 1109 RETVAL
1040 1110
1041void 1111void
1042DESTROY (CFPlus::Layout self) 1112DESTROY (DC::Layout self)
1043 CODE: 1113 CODE:
1044 g_object_unref (self->pl); 1114 g_object_unref (self->pl);
1115 rc_free (self->rc);
1045 Safefree (self); 1116 Safefree (self);
1046 1117
1047void 1118void
1048set_text (CFPlus::Layout self, SV *text_) 1119set_text (DC::Layout self, SV *text_)
1049 CODE: 1120 CODE:
1050{ 1121{
1051 STRLEN textlen; 1122 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1053 1124
1054 pango_layout_set_text (self->pl, text, textlen); 1125 pango_layout_set_text (self->pl, text, textlen);
1055} 1126}
1056 1127
1057void 1128void
1058set_markup (CFPlus::Layout self, SV *text_) 1129set_markup (DC::Layout self, SV *text_)
1059 CODE: 1130 CODE:
1060{ 1131{
1061 STRLEN textlen; 1132 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1133 char *text = SvPVutf8 (text_, textlen);
1063 1134
1064 pango_layout_set_markup (self->pl, text, textlen); 1135 pango_layout_set_markup (self->pl, text, textlen);
1065} 1136}
1066 1137
1067void 1138void
1068set_shapes (CFPlus::Layout self, ...) 1139set_shapes (DC::Layout self, ...)
1069 CODE: 1140 CODE:
1070{ 1141{
1071 PangoAttrList *attrs = 0; 1142 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1143 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1144 const char *pos = text;
1108 if (attrs) 1179 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1180 pango_layout_set_attributes (self->pl, attrs);
1110} 1181}
1111 1182
1112void 1183void
1113get_shapes (CFPlus::Layout self) 1184get_shapes (DC::Layout self)
1114 PPCODE: 1185 PPCODE:
1115{ 1186{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1187 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1188
1118 do 1189 do
1119 { 1190 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1191 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1192
1122 if (run && shape_attr_p (run)) 1193 if (run && shape_attr_p (run))
1123 { 1194 {
1124 PangoRectangle extents; 1195 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1196 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1204
1134 pango_layout_iter_free (iter); 1205 pango_layout_iter_free (iter);
1135} 1206}
1136 1207
1137int 1208int
1138has_wrapped (CFPlus::Layout self) 1209has_wrapped (DC::Layout self)
1139 CODE: 1210 CODE:
1140{ 1211{
1141 int lines = 1; 1212 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1213 const char *text = pango_layout_get_text (self->pl);
1143 1214
1148} 1219}
1149 OUTPUT: 1220 OUTPUT:
1150 RETVAL 1221 RETVAL
1151 1222
1152SV * 1223SV *
1153get_text (CFPlus::Layout self) 1224get_text (DC::Layout self)
1154 CODE: 1225 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1226 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1227 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1228 OUTPUT:
1158 RETVAL 1229 RETVAL
1159 1230
1160void 1231void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1232set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1233 CODE:
1163 self->r = r; 1234 self->r = r;
1164 self->g = g; 1235 self->g = g;
1165 self->b = b; 1236 self->b = b;
1166 self->a = a; 1237 self->a = a;
1167 1238
1168void 1239void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1240set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1241 CODE:
1171 if (self->font != font) 1242 if (self->font != font)
1172 { 1243 {
1173 self->font = font; 1244 self->font = font;
1174 layout_update_font (self); 1245 layout_update_font (self);
1175 } 1246 }
1176 1247
1177void 1248void
1178set_height (CFPlus::Layout self, int base_height) 1249set_height (DC::Layout self, int base_height)
1179 CODE: 1250 CODE:
1180 if (self->base_height != base_height) 1251 if (self->base_height != base_height)
1181 { 1252 {
1182 self->base_height = base_height; 1253 self->base_height = base_height;
1183 layout_update_font (self); 1254 layout_update_font (self);
1184 } 1255 }
1185 1256
1186void 1257void
1187set_width (CFPlus::Layout self, int max_width = -1) 1258set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1259 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1260 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1261
1191void 1262void
1192set_indent (CFPlus::Layout self, int indent) 1263set_indent (DC::Layout self, int indent)
1193 CODE: 1264 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1265 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1266
1196void 1267void
1197set_spacing (CFPlus::Layout self, int spacing) 1268set_spacing (DC::Layout self, int spacing)
1198 CODE: 1269 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1270 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1271
1201void 1272void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1273set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1274 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1275 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1276 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1277 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1278 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1279 : PANGO_ELLIPSIZE_NONE
1209 ); 1280 );
1210 1281
1211void 1282void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1283set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1284 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1285 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1286
1216void 1287void
1217size (CFPlus::Layout self) 1288size (DC::Layout self)
1218 PPCODE: 1289 PPCODE:
1219{ 1290{
1220 int w, h; 1291 int w, h;
1221 1292
1222 layout_get_pixel_size (self, &w, &h); 1293 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1296 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1297 PUSHs (sv_2mortal (newSViv (h)));
1227} 1298}
1228 1299
1229int 1300int
1230descent (CFPlus::Layout self) 1301descent (DC::Layout self)
1231 CODE: 1302 CODE:
1232{ 1303{
1233 PangoRectangle rect; 1304 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1305 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1306 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1307 RETVAL = PANGO_DESCENT (rect);
1237} 1308}
1238 OUTPUT: 1309 OUTPUT:
1239 RETVAL 1310 RETVAL
1240 1311
1241int 1312int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1313xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1314 CODE:
1244{ 1315{
1245 int index, trailing; 1316 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1317 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1318 RETVAL = index + trailing;
1248} 1319}
1249 OUTPUT: 1320 OUTPUT:
1250 RETVAL 1321 RETVAL
1251 1322
1252void 1323void
1253cursor_pos (CFPlus::Layout self, int index) 1324cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1325 PPCODE:
1255{ 1326{
1256 PangoRectangle strong_pos; 1327 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1328 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1329
1259 EXTEND (SP, 3); 1330 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1331 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1332 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1333 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1334}
1264 1335
1265void 1336void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1337index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1338 PPCODE:
1268{ 1339{
1269 int line, x; 1340 int line, x;
1270 1341
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1342 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1343#if !PANGO_VERSION_CHECK (1, 17, 3)
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1344 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1345 --line;
1346#endif
1274 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1348 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1349 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1350}
1278 1351
1279void 1352void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1353line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1354 PPCODE:
1282{ 1355{
1283 PangoLayoutLine *lp; 1356 PangoLayoutLine *lp;
1284 int index, trailing; 1357 int index, trailing;
1285 1358
1286 if (line < 0) 1359 if (line < 0)
1287 XSRETURN_EMPTY; 1360 XSRETURN_EMPTY;
1288 1361
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1362 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1363 XSRETURN_EMPTY; /* do better */
1291 1364
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1365 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1366
1294 EXTEND (SP, 2); 1367 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1373 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1374 }
1302} 1375}
1303 1376
1304void 1377void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1378render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1379 CODE:
1380 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1381 pango_opengl_render_layout_subpixel (
1308 self->pl, 1382 self->pl,
1383 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1384 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1385 self->r, self->g, self->b, self->a,
1311 flags 1386 flags
1312 ); 1387 );
1388 // we assume that context_change actually clears/frees stuff
1389 // and does not do any recomputation...
1390 pango_layout_context_changed (self->pl);
1313 1391
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1392void
1393draw (DC::Layout self)
1394 CODE:
1395{
1396 glEnable (GL_TEXTURE_2D);
1397 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1398 glEnable (GL_BLEND);
1399 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1400 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1401 glEnable (GL_ALPHA_TEST);
1402 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1403
1404 rc_draw (self->rc);
1405
1406 glDisable (GL_ALPHA_TEST);
1407 glDisable (GL_BLEND);
1408 glDisable (GL_TEXTURE_2D);
1409}
1410
1411MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1412
1316PROTOTYPES: ENABLE 1413PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1414
1320void 1415void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1416pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1417 CODE:
1323{ 1418{
1400 RETVAL = width > 0; 1495 RETVAL = width > 0;
1401} 1496}
1402 OUTPUT: 1497 OUTPUT:
1403 RETVAL 1498 RETVAL
1404 1499
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1500MODULE = Deliantra::Client PACKAGE = DC::Map
1406 1501
1407PROTOTYPES: DISABLE 1502PROTOTYPES: DISABLE
1408 1503
1409CFPlus::Map 1504DC::Map
1410new (SV *class) 1505new (SV *class)
1411 CODE: 1506 CODE:
1412 New (0, RETVAL, 1, struct map); 1507 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1508 RETVAL->x = 0;
1414 RETVAL->y = 0; 1509 RETVAL->y = 0;
1422 RETVAL->row = 0; 1517 RETVAL->row = 0;
1423 OUTPUT: 1518 OUTPUT:
1424 RETVAL 1519 RETVAL
1425 1520
1426void 1521void
1427DESTROY (CFPlus::Map self) 1522DESTROY (DC::Map self)
1428 CODE: 1523 CODE:
1429{ 1524{
1430 map_clear (self); 1525 map_clear (self);
1431 Safefree (self->face2tile); 1526 Safefree (self->face2tile);
1432 Safefree (self->tex); 1527 Safefree (self->tex);
1433 Safefree (self); 1528 Safefree (self);
1434} 1529}
1435 1530
1436void 1531void
1437resize (CFPlus::Map self, int map_width, int map_height) 1532resize (DC::Map self, int map_width, int map_height)
1438 CODE: 1533 CODE:
1439 self->w = map_width; 1534 self->w = map_width;
1440 self->h = map_height; 1535 self->h = map_height;
1441 1536
1442void 1537void
1443clear (CFPlus::Map self) 1538clear (DC::Map self)
1444 CODE: 1539 CODE:
1445 map_clear (self); 1540 map_clear (self);
1446 1541
1447void 1542void
1448set_tileid (CFPlus::Map self, int face, int tile) 1543set_tileid (DC::Map self, int face, int tile)
1449 CODE: 1544 CODE:
1450{ 1545{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1546 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1547 need_texid (self, tile);
1453} 1548}
1454 1549
1455void 1550void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1551set_smooth (DC::Map self, int face, int smooth, int level)
1457 CODE: 1552 CODE:
1458{ 1553{
1459 tileid texid; 1554 tileid texid;
1460 maptex *tex; 1555 maptex *tex;
1461 1556
1474 tex->smoothtile = self->face2tile [smooth]; 1569 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1570 tex->smoothlevel = level;
1476} 1571}
1477 1572
1478void 1573void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1574set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1575 CODE:
1481{ 1576{
1482 need_texid (self, texid); 1577 need_texid (self, texid);
1483 1578
1484 { 1579 {
1504 // from transparent color bleeding and ugly wrapping effects. 1599 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1601}
1507 1602
1508int 1603int
1509ox (CFPlus::Map self) 1604ox (DC::Map self)
1510 ALIAS: 1605 ALIAS:
1511 oy = 1 1606 oy = 1
1512 x = 2 1607 x = 2
1513 y = 3 1608 y = 3
1514 w = 4 1609 w = 4
1525 } 1620 }
1526 OUTPUT: 1621 OUTPUT:
1527 RETVAL 1622 RETVAL
1528 1623
1529void 1624void
1530scroll (CFPlus::Map self, int dx, int dy) 1625scroll (DC::Map self, int dx, int dy)
1531 CODE: 1626 CODE:
1532{ 1627{
1533 if (dx > 0) 1628 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1629 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1630 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1645 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1646 self->y += MAP_EXTEND_Y;
1552 } 1647 }
1553} 1648}
1554 1649
1555void 1650SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1651map1a_update (DC::Map self, SV *data_, int extmap)
1557 CODE: 1652 CODE:
1558{ 1653{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1655 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1656 mapcell *cell;
1562 int x, y, flags; 1657 int x, y, z, flags;
1658 AV *missing = newAV ();
1659 RETVAL = newRV_noinc ((SV *)missing);
1563 1660
1564 while (data < data_end - 1) 1661 while (data < data_end - 1)
1565 { 1662 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1663 flags = (data [0] << 8) + data [1]; data += 2;
1567 1664
1618 } 1715 }
1619 else 1716 else
1620 cell->darkness = *data++ + 1; 1717 cell->darkness = *data++ + 1;
1621 } 1718 }
1622 1719
1720 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1721 if (flags & (4 >> z))
1624 { 1722 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1723 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1724 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face]; 1725 cell->tile [z] = self->face2tile [face];
1726
1727 if (cell->tile [z])
1728 {
1729 maptex *tex = self->tex + cell->tile [z];
1730 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z]));
1732
1733 if (tex->smoothtile)
1734 {
1735 maptex *smooth = self->tex + tex->smoothtile;
1736 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile));
1738 }
1739 }
1628 } 1740 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1741 }
1644 else 1742 else
1645 cell->darkness = 0; 1743 cell->darkness = 0;
1646 } 1744 }
1647} 1745}
1746 OUTPUT:
1747 RETVAL
1648 1748
1649SV * 1749SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1750mapmap (DC::Map self, int x0, int y0, int w, int h)
1651 CODE: 1751 CODE:
1652{ 1752{
1653 int x1, x; 1753 int x1, x;
1654 int y1, y; 1754 int y1, y;
1655 int z; 1755 int z;
1699 RETVAL = map_sv; 1799 RETVAL = map_sv;
1700} 1800}
1701 OUTPUT: 1801 OUTPUT:
1702 RETVAL 1802 RETVAL
1703 1803
1704SV * 1804void
1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1805draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1706 CODE: 1806 CODE:
1707{ 1807{
1808 int x, y, z;
1809
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1711 smooth_key skey; 1813 smooth_key skey;
1712 int x, y, z; 1814
1713 int last_name; 1815 rc_t *rc = rc_alloc ();
1714 AV *missing = newAV (); 1816 rc_key_t key;
1715 RETVAL = newRV_noinc ((SV *)missing); 1817 rc_array_t *arr;
1716 1818
1717 // thats current max. sorry. 1819 // thats current max. sorry.
1718 if (sw > 255) sw = 255; 1820 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 1821 if (sh > 255) sh = 255;
1720 1822
1721 // clear key, in case of extra padding 1823 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 1824 memset (&skey, 0, sizeof (skey));
1723 1825
1724 glColor4ub (255, 255, 255, 255); 1826 memset (&key, 0, sizeof (key));
1725 1827 key.r = 255;
1726 glEnable (GL_BLEND); 1828 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1829 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 1830 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1831 key.mode = GL_QUADS;
1730 1832 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1; 1833 key.texname = -1;
1734 1834
1735 mx += self->x; 1835 mx += self->x;
1736 my += self->y; 1836 my += self->y;
1737 1837
1738 // first pass: determine smooth_max 1838 // first pass: determine smooth_max
1754 MAX (self->tex [cell->tile [0]].smoothlevel, 1854 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 1855 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 1856 self->tex [cell->tile [2]].smoothlevel));
1757 } 1857 }
1758 } 1858 }
1859
1860 glEnable (GL_BLEND);
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759 1863
1760 for (z = 0; z <= 2; z++) 1864 for (z = 0; z <= 2; z++)
1761 { 1865 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 1866 memset (smooth_level, 0, sizeof (smooth_level));
1763 1867
1775 if (tile) 1879 if (tile)
1776 { 1880 {
1777 maptex tex = self->tex [tile]; 1881 maptex tex = self->tex [tile];
1778 int px, py; 1882 int px, py;
1779 1883
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 1884 if (key.texname != tex.name)
1783 { 1885 {
1784 if (!tex.name) 1886 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 1887 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789 1888
1790 glEnd (); 1889 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1890 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1891 }
1794 1892
1795 px = (x + 1) * T - tex.w; 1893 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 1894 py = (y + 1) * T - tex.h;
1797 1895
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1802 1900
1803 if (cell->flags && z == 2) 1901 if (cell->flags && z == 2)
1804 { 1902 {
1903 // overlays such as the speech bubble, probably more to come
1805 if (cell->flags & 1) 1904 if (cell->flags & 1)
1806 { 1905 {
1807 maptex tex = self->tex [1]; 1906 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 1907 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 1908 int py = y * T - T * 6 / 32;
1810 1909
1910 if (tex.name)
1811 glEnd (); 1911 {
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1813 glBegin (GL_QUADS); 1922 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 1923 }
1820 } 1924 }
1821 1925
1822 // update smooth hash 1926 // update smooth hash
1823 if (tex.smoothtile) 1927 if (tex.smoothtile)
1859 } 1963 }
1860 } 1964 }
1861 } 1965 }
1862 } 1966 }
1863 1967
1968 rc_draw (rc);
1969 rc_clear (rc);
1970
1864 // go through all smoothlevels, lowest to highest, then draw. 1971 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 1972 // this is basically counting sort
1866 { 1973 {
1867 int w, b; 1974 int w, b;
1868 1975
1976 glEnable (GL_TEXTURE_2D);
1977 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 1978 for (w = 0; w < 256 / 32; ++w)
1870 { 1979 {
1871 uint32_t smask = smooth_level [w]; 1980 uint32_t smask = smooth_level [w];
1872 if (smask) 1981 if (smask)
1873 for (b = 0; b < 32; ++b) 1982 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 2001 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2002 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 2003 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 2004 float dy = tex.t * .5f ; // 2 images/column
1896 2005
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 2006 if (tex.name)
1900 { 2007 {
2008 // this time avoiding texture state changes
2009 // save gobs of state changes.
1901 if (!tex.name) 2010 if (key.texname != tex.name)
1902 { 2011 {
1903 av_push (missing, newSViv (skey->tile)); 2012 glEnd ();
1904 continue; // smoothing not yet available 2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS);
1905 } 2015 }
1906 2016
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 2017 if (border)
1913 { 2018 {
1914 float ox = border * dx; 2019 float ox = border * dx;
1915 2020
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2025 }
1921 2026
1922 if (corner) 2027 if (corner)
1923 { 2028 {
1924 float ox = corner * dx; 2029 float ox = corner * dx;
1925 2030
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2031 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2035 }
1930 } 2036 }
1931 } 2037 }
1932 } 2038 }
1933 } 2039 }
1934 } 2040 }
2041
2042 glEnd ();
2043 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1;
1935 } 2045 }
1936 2046
1937 hv_clear (smooth); 2047 hv_clear (smooth);
1938 } 2048 }
1939 2049
1940 glEnd ();
1941
1942 glDisable (GL_TEXTURE_2D);
1943 glDisable (GL_BLEND); 2050 glDisable (GL_BLEND);
2051 rc_free (rc);
1944 2052
1945 // top layer: overlays such as the health bar 2053 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2054 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2055 if (0 <= y + my && y + my < self->rows)
1948 { 2056 {
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2079 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2080 }
1973 } 2081 }
1974 } 2082 }
1975} 2083}
1976 OUTPUT:
1977 RETVAL
1978 2084
1979void 2085void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2087 CODE:
1982{ 2088{
1983 static float color[16][3] = { 2089 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2090 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2091 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2141 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2142 glDisable (GL_TEXTURE_2D);
2037} 2143}
2038 2144
2039void 2145void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2146fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2147 PPCODE:
2042{ 2148{
2043 int x, y; 2149 int x, y;
2044 int sw1 = sw + 2; 2150 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2151 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2222 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2223 PUSHs (darkness3_sv);
2118} 2224}
2119 2225
2120SV * 2226SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2227get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2228 CODE:
2123{ 2229{
2124 int x, y, x1, y1; 2230 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2231 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2232 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2191} 2297}
2192 OUTPUT: 2298 OUTPUT:
2193 RETVAL 2299 RETVAL
2194 2300
2195void 2301void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2302set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2197 PPCODE: 2303 PPCODE:
2198{ 2304{
2199 int x, y, z; 2305 int x, y, z;
2200 int w, h; 2306 int w, h;
2201 int x1, y1; 2307 int x1, y1;
2202 2308
2203 if (*data++ != 0) 2309 if (*data++ != 0)
2204 return; /* version mismatch */ 2310 XSRETURN_EMPTY; /* version mismatch */
2205 2311
2206 w = *data++ << 8; w |= *data++; 2312 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2313 h = *data++ << 8; h |= *data++;
2208 2314
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2315 // we need to do this 'cause we don't keep an absolute coord system for rows
2254 } 2360 }
2255 } 2361 }
2256 } 2362 }
2257} 2363}
2258 2364
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2365MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2366
2261CFPlus::RW 2367DC::RW
2262new (SV *class, SV *data_sv) 2368new (SV *class, SV *data_sv)
2263 CODE: 2369 CODE:
2264{ 2370{
2265 STRLEN datalen; 2371 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2372 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2374 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2375}
2270 OUTPUT: 2376 OUTPUT:
2271 RETVAL 2377 RETVAL
2272 2378
2273CFPlus::RW 2379DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2380new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2381 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2382 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2383 OUTPUT:
2278 RETVAL 2384 RETVAL
2279 2385
2280# fails on win32: 2386# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2387# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2388#void
2283#close (CFPlus::RW self) 2389#close (DC::RW self)
2284# CODE: 2390# CODE:
2285# (self->(close)) (self); 2391# (self->(close)) (self);
2286 2392
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2393MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2394
2289PROTOTYPES: DISABLE 2395PROTOTYPES: DISABLE
2290 2396
2291CFPlus::Channel 2397DC::Channel
2292find () 2398find ()
2293 CODE: 2399 CODE:
2294{ 2400{
2295 RETVAL = Mix_GroupAvailable (-1); 2401 RETVAL = Mix_GroupAvailable (-1);
2296 2402
2309} 2415}
2310 OUTPUT: 2416 OUTPUT:
2311 RETVAL 2417 RETVAL
2312 2418
2313void 2419void
2314halt (CFPlus::Channel self) 2420halt (DC::Channel self)
2315 CODE: 2421 CODE:
2316 Mix_HaltChannel (self); 2422 Mix_HaltChannel (self);
2317 2423
2318void 2424void
2319expire (CFPlus::Channel self, int ticks = -1) 2425expire (DC::Channel self, int ticks = -1)
2320 CODE: 2426 CODE:
2321 Mix_ExpireChannel (self, ticks); 2427 Mix_ExpireChannel (self, ticks);
2322 2428
2323void 2429void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2430fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2431 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2432 Mix_FadeOutChannel (self, ticks);
2327 2433
2328int 2434int
2329volume (CFPlus::Channel self, int volume) 2435volume (DC::Channel self, int volume)
2330 CODE: 2436 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2437 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2438 OUTPUT:
2333 RETVAL 2439 RETVAL
2334 2440
2335void 2441void
2336unregister_all_effects (CFPlus::Channel self) 2442unregister_all_effects (DC::Channel self)
2337 CODE: 2443 CODE:
2338 Mix_UnregisterAllEffects (self); 2444 Mix_UnregisterAllEffects (self);
2339 2445
2340void 2446void
2341set_panning (CFPlus::Channel self, int left, int right) 2447set_panning (DC::Channel self, int left, int right)
2342 CODE: 2448 CODE:
2343 left = CLAMP (left , 0, 255); 2449 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2450 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2451 Mix_SetPanning (self, left, right);
2346 2452
2347void 2453void
2348set_distance (CFPlus::Channel self, int distance) 2454set_distance (DC::Channel self, int distance)
2349 CODE: 2455 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2456 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2457
2352void 2458void
2353set_position (CFPlus::Channel self, int angle, int distance) 2459set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2460 CODE:
2355 2461
2356void 2462void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2464 CODE:
2359{ 2465{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2469}
2364 2470
2365void 2471void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2472set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2473 CODE:
2368 Mix_SetReverseStereo (self, flip); 2474 Mix_SetReverseStereo (self, flip);
2369 2475
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2477
2372PROTOTYPES: DISABLE 2478PROTOTYPES: DISABLE
2373 2479
2374CFPlus::MixChunk 2480DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2481new (SV *class, DC::RW rwops)
2376 CODE: 2482 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2483 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2484 OUTPUT:
2379 RETVAL 2485 RETVAL
2380 2486
2381void 2487void
2382DESTROY (CFPlus::MixChunk self) 2488DESTROY (DC::MixChunk self)
2383 CODE: 2489 CODE:
2384 Mix_FreeChunk (self); 2490 Mix_FreeChunk (self);
2385 2491
2386int 2492int
2387volume (CFPlus::MixChunk self, int volume = -1) 2493volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2494 CODE:
2389 if (items > 1) 2495 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2496 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2497 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2498 OUTPUT:
2393 RETVAL 2499 RETVAL
2394 2500
2395CFPlus::Channel 2501DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2502play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2503 CODE:
2398{ 2504{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2506
2401 if (RETVAL < 0) 2507 if (RETVAL < 0)
2408 } 2514 }
2409} 2515}
2410 OUTPUT: 2516 OUTPUT:
2411 RETVAL 2517 RETVAL
2412 2518
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2520
2415int 2521int
2416volume (int volume = -1) 2522volume (int volume = -1)
2417 PROTOTYPE: ;$ 2523 PROTOTYPE: ;$
2418 CODE: 2524 CODE:
2430void 2536void
2431halt () 2537halt ()
2432 CODE: 2538 CODE:
2433 Mix_HaltMusic (); 2539 Mix_HaltMusic ();
2434 2540
2435CFPlus::MixMusic 2541DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2437 CODE: 2543 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2544 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2545 OUTPUT:
2440 RETVAL 2546 RETVAL
2441 2547
2442void 2548void
2443DESTROY (CFPlus::MixMusic self) 2549DESTROY (DC::MixMusic self)
2444 CODE: 2550 CODE:
2445 Mix_FreeMusic (self); 2551 Mix_FreeMusic (self);
2446 2552
2447int 2553int
2448play (CFPlus::MixMusic self, int loops = -1) 2554play (DC::MixMusic self, int loops = -1)
2449 CODE: 2555 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2556 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2557 OUTPUT:
2452 RETVAL 2558 RETVAL
2453 2559
2454void 2560void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2561fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2562 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2563 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2564
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2565MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2566
2461PROTOTYPES: ENABLE 2567PROTOTYPES: ENABLE
2462 2568
2463BOOT: 2569BOOT:
2464{ 2570{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2571 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2572 static const struct {
2467 const char *name; 2573 const char *name;
2468 IV iv; 2574 IV iv;
2469 } *civ, const_iv[] = { 2575 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2576# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2611 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2612 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2613 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2614 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2615 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2616 const_iv (GL_COMPRESSED_ALPHA_ARB),
2617 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2618 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2619 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2620 const_iv (GL_COMPRESSED_RGB_ARB),
2621 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2622 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2623 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2624 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2625 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2626 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2665 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2666 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2667 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2668 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2669 const_iv (GL_GENERATE_MIPMAP_HINT),
2670 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2671 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2672 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2673 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2674 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2675 const_iv (GL_V3F),
2570 2683
2571 texture_av = newAV (); 2684 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2685 AvREAL_off (texture_av);
2573} 2686}
2574 2687
2688void
2689disable_GL_EXT_blend_func_separate ()
2690 CODE:
2691 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0;
2693
2575char * 2694char *
2576gl_vendor () 2695gl_vendor ()
2577 CODE: 2696 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2697 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2698 OUTPUT:
2700 2819
2701void glRect (float x1, float y1, float x2, float y2) 2820void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2821 CODE:
2703 glRectf (x1, y1, x2, y2); 2822 glRectf (x1, y1, x2, y2);
2704 2823
2824void glRect_lineloop (float x1, float y1, float x2, float y2)
2825 CODE:
2826 glBegin (GL_LINE_LOOP);
2827 glVertex2f (x1, y1);
2828 glVertex2f (x2, y1);
2829 glVertex2f (x2, y2);
2830 glVertex2f (x1, y2);
2831 glEnd ();
2832
2705PROTOTYPES: ENABLE 2833PROTOTYPES: ENABLE
2706 2834
2707void glBegin (int mode) 2835void glBegin (int mode)
2708 2836
2709void glEnd () 2837void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2869void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 2870 CODE:
2743 if (gl.SeparableFilter2D) 2871 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2872 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2873
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2874void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 2875
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2876void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 2877
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2878void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2879
2777 2905
2778void glEndList () 2906void glEndList ()
2779 2907
2780void glCallList (int list) 2908void glCallList (int list)
2781 2909
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 2911
2784PROTOTYPES: DISABLE 2912PROTOTYPES: DISABLE
2785 2913
2786void 2914void
2787find_widget (SV *self, NV x, NV y) 2915find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 2919 XPUSHs (self);
2792} 2920}
2793 2921
2794BOOT: 2922BOOT:
2795{ 2923{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2924 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 2925
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2926 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2927 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2928 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2929 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 2930}
2803 2931
2804void 2932void
2805draw (SV *self) 2933draw (SV *self)
2806 CODE: 2934 CODE:
2810 NV x, y, w, h; 2938 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 2939 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 2940 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 2941 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 2942 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 2943 double draw_x, draw_y;
2817 2944
2818 if (!SvROK (self)) 2945 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2946 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 2947
2821 hv = (HV *)SvRV (self); 2948 hv = (HV *)SvRV (self);
2822 2949
2823 if (SvTYPE (hv) != SVt_PVHV) 2950 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2951 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 2952
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2953 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2954 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 2955
2829 if (!h || !w) 2956 if (!h || !w)
2849 { 2976 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2977 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 2978
2852 if (svp && SvTRUE (*svp)) 2979 if (svp && SvTRUE (*svp))
2853 { 2980 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2981 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 2982 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2983 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 2984 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 2985 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 2986 glVertex2f (w, 0);
2862 glEnd (); 2989 glEnd ();
2863 glDisable (GL_BLEND); 2990 glDisable (GL_BLEND);
2864 } 2991 }
2865 } 2992 }
2866#if 0 2993#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 2994 // draw borders, for debugging
2868 glPushMatrix; 2995 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 2996 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 2997 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 2998 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 2999 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3000 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3001 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3002 glVertex2f (0 , h - 1);
2876 glEnd; 3003 glEnd ();
2877 glPopMatrix; 3004 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3005#endif
2881 PUSHMARK (SP); 3006 PUSHMARK (SP);
2882 XPUSHs (self); 3007 XPUSHs (self);
2883 PUTBACK; 3008 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3009 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines