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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
45 57
46#ifndef _WIN32 58#ifndef _WIN32
47# include <sys/types.h> 59# include <sys/types.h>
48# include <sys/socket.h> 60# include <sys/socket.h>
49# include <netinet/in.h> 61# include <netinet/in.h>
58#define MAP_EXTEND_X 32 70#define MAP_EXTEND_X 32
59#define MAP_EXTEND_Y 512 71#define MAP_EXTEND_Y 512
60 72
61#define MIN_FONT_HEIGHT 10 73#define MIN_FONT_HEIGHT 10
62 74
75/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
63#if 0 78#if 0
64# define PARACHUTE SDL_INIT_NOPARACHUTE 79# define PARACHUTE SDL_INIT_NOPARACHUTE
65#else 80#else
66# define PARACHUTE 0 81# define PARACHUTE 0
67#endif 82#endif
109 av_push (texture_av, (SV *)(size_t)name); 124 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 125 glDeleteTextures (1, &name);
111} 126}
112 127
113#include "texcache.c" 128#include "texcache.c"
129#include "rendercache.c"
114 130
115#include "pango-font.c" 131#include "pango-font.c"
116#include "pango-fontmap.c" 132#include "pango-fontmap.c"
117#include "pango-render.c" 133#include "pango-render.c"
118 134
119typedef IV CFPlus__Channel; 135typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 136typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 137typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 138typedef Mix_Music *DC__MixMusic;
123 139
124typedef PangoFontDescription *CFPlus__Font; 140typedef PangoFontDescription *DC__Font;
125 141
126static int 142static int
127shape_attr_p (PangoLayoutRun *run) 143shape_attr_p (PangoLayoutRun *run)
128{ 144{
129 GSList *attrs = run->item->analysis.extra_attrs; 145 GSList *attrs = run->item->analysis.extra_attrs;
143 159
144typedef struct cf_layout { 160typedef struct cf_layout {
145 PangoLayout *pl; 161 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 162 float r, g, b, a; // default color for rgba mode
147 int base_height; 163 int base_height;
148 CFPlus__Font font; 164 DC__Font font;
165 rc_t *rc;
149} *CFPlus__Layout; 166} *DC__Layout;
150 167
151static CFPlus__Font default_font; 168static DC__Font default_font;
152static PangoContext *opengl_context; 169static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 170static PangoFontMap *opengl_fontmap;
154 171
155static void 172static void
156substitute_func (FcPattern *pattern, gpointer data) 173substitute_func (FcPattern *pattern, gpointer data)
161#endif 178#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 179 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 180}
164 181
165static void 182static void
166layout_update_font (CFPlus__Layout self) 183layout_update_font (DC__Layout self)
167{ 184{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 185 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 186 * reasonably well with bitstream vera
170 */ 187 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 188 PangoFontDescription *font = self->font ? self->font : default_font;
175 192
176 pango_layout_set_font_description (self->pl, font); 193 pango_layout_set_font_description (self->pl, font);
177} 194}
178 195
179static void 196static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 197layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 198{
182 PangoRectangle rect; 199 PangoRectangle rect;
183 200
184 // get_pixel_* wrongly rounds down 201 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 202 pango_layout_get_extents (self->pl, 0, &rect);
196 213
197typedef uint16_t tileid; 214typedef uint16_t tileid;
198typedef uint16_t faceid; 215typedef uint16_t faceid;
199 216
200typedef struct { 217typedef struct {
201 int name; 218 GLuint name;
202 int w, h; 219 int w, h;
203 float s, t; 220 float s, t;
204 uint8_t r, g, b, a; 221 uint8_t r, g, b, a;
205 tileid smoothtile; 222 tileid smoothtile;
206 uint8_t smoothlevel; 223 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 241 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 242 int texs; maptex *tex; // [tileid]
226 243
227 int32_t rows; 244 int32_t rows;
228 maprow *row; 245 maprow *row;
229} *CFPlus__Map; 246} *DC__Map;
230 247
231static char * 248static char *
232prepend (char *ptr, int sze, int inc) 249prepend (char *ptr, int sze, int inc)
233{ 250{
234 char *p; 251 char *p;
272 self->texs *= 2; 289 self->texs *= 2;
273 } 290 }
274} 291}
275 292
276static maprow * 293static maprow *
277map_get_row (CFPlus__Map self, int y) 294map_get_row (DC__Map self, int y)
278{ 295{
279 if (0 > y) 296 if (0 > y)
280 { 297 {
281 int extend = - y + MAP_EXTEND_Y; 298 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 299 Prepend (maprow, self->row, self->rows, extend);
320 337
321 return row->col + (x - row->c0); 338 return row->col + (x - row->c0);
322} 339}
323 340
324static mapcell * 341static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 342map_get_cell (DC__Map self, int x, int y)
326{ 343{
327 return row_get_cell (map_get_row (self, y), x); 344 return row_get_cell (map_get_row (self, y), x);
328} 345}
329 346
330static void 347static void
331map_clear (CFPlus__Map self) 348map_clear (DC__Map self)
332{ 349{
333 int r; 350 int r;
334 351
335 for (r = 0; r < self->rows; r++) 352 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 353 Safefree (self->row[r].col);
344 self->row = 0; 361 self->row = 0;
345 self->rows = 0; 362 self->rows = 0;
346} 363}
347 364
348static void 365static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 366map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 367{
351 int x, y; 368 int x, y;
352 maprow *row; 369 maprow *row;
353 mapcell *cell; 370 mapcell *cell;
354 371
433 n |= n >> 16; 450 n |= n >> 16;
434 451
435 return n + 1; 452 return n + 1;
436} 453}
437 454
455static unsigned int
456popcount (unsigned int n)
457{
458 n -= (n >> 1) & 0x55555555U;
459 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
460 n = ((n >> 4) + n) & 0x0f0f0f0fU;
461 n *= 0x01010101U;
462
463 return n >> 24;
464}
465
438/* SDL should provide this, really. */ 466/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 467#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 468#define SDLK_MODIFIER_MAX 314
441 469
442/******************************************************************************/ 470/******************************************************************************/
480 return 0; 508 return 0;
481 509
482 return 1; 510 return 1;
483} 511}
484 512
485MODULE = CFPlus PACKAGE = CFPlus 513MODULE = Deliantra::Client PACKAGE = DC
486 514
487PROTOTYPES: ENABLE 515PROTOTYPES: ENABLE
488 516
489BOOT: 517BOOT:
490{ 518{
491 HV *stash = gv_stashpv ("CFPlus", 1); 519 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 520 static const struct {
493 const char *name; 521 const char *name;
494 IV iv; 522 IV iv;
495 } *civ, const_iv[] = { 523 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 524# define const_iv(name) { # name, (IV)name }
518 546
519 const_iv (SDL_APPINPUTFOCUS), 547 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 548 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 549 const_iv (SDL_APPACTIVE),
522 550
551 const_iv (SDLK_FIRST),
552 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 553 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 554 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 555 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 556 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 557 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 629 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 630 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 631 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 632 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 633 const_iv (KMOD_MODE),
634
635 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 636# undef const_iv
605 }; 637 };
606 638
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 658
627NV floor (NV x) 659NV floor (NV x)
628 660
629NV ceil (NV x) 661NV ceil (NV x)
630 662
663IV minpot (UV n)
664
665IV popcount (UV n)
666
631void 667void
632pango_init () 668pango_init ()
633 CODE: 669 CODE:
634{ 670{
635 opengl_fontmap = pango_opengl_font_map_new (); 671 opengl_fontmap = pango_opengl_font_map_new ();
636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 672 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); 673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif
638} 678}
639 679
640char * 680char *
641SDL_GetError () 681SDL_GetError ()
642 682
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 715
676 if (m && m != (SDL_Rect **)-1) 716 if (m && m != (SDL_Rect **)-1)
677 while (*m) 717 while (*m)
678 { 718 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 719 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 720 {
681 AV *av = newAV (); 721 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 722 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 723 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 724 av_push (av, newSViv (rgb));
708 748
709 if (RETVAL) 749 if (RETVAL)
710 { 750 {
711 av_clear (texture_av); 751 av_clear (texture_av);
712 752
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 753 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 754#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715#include "glfunc.h" 755#include "glfunc.h"
716#undef GL_FUNC 756#undef GL_FUNC
717 } 757 }
718} 758}
744 { 784 {
745 case SDL_KEYDOWN: 785 case SDL_KEYDOWN:
746 case SDL_KEYUP: 786 case SDL_KEYUP:
747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 787 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 788 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 789 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 */ 790 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); 791 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752 break; 792 break;
753 793
754 case SDL_ACTIVEEVENT: 794 case SDL_ACTIVEEVENT:
755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 795 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
773 x = ev.motion.x; 813 x = ev.motion.x;
774 y = ev.motion.y; 814 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 815 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 } 816 }
777 817
778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 818 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779 hv_store (hv, "state", 5, newSViv (state), 0); 819 hv_store (hv, "state", 5, newSViv (state), 0);
780 hv_store (hv, "x", 1, newSViv (x), 0); 820 hv_store (hv, "x", 1, newSViv (x), 0);
781 hv_store (hv, "y", 1, newSViv (y), 0); 821 hv_store (hv, "y", 1, newSViv (y), 0);
782 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 822 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 823 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 } 824 }
785 break; 825 break;
786 826
787 case SDL_MOUSEBUTTONDOWN: 827 case SDL_MOUSEBUTTONDOWN:
788 case SDL_MOUSEBUTTONUP: 828 case SDL_MOUSEBUTTONUP:
789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 829 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790 830
791 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 831 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 832 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 833 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 834 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 839 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 840 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 841 break;
802 } 842 }
803 843
804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 844 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805 } 845 }
806} 846}
807 847
808int 848int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 849Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 850 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 851 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 852 Mix_ChannelFinished (channel_finished);
853
854void
855Mix_QuerySpec ()
856 PPCODE:
857{
858 int freq, channels;
859 Uint16 format;
860
861 if (Mix_QuerySpec (&freq, &format, &channels))
862 {
863 EXTEND (SP, 3);
864 PUSHs (sv_2mortal (newSViv (freq)));
865 PUSHs (sv_2mortal (newSViv (format)));
866 PUSHs (sv_2mortal (newSViv (channels)));
867 }
868}
813 869
814void 870void
815Mix_CloseAudio () 871Mix_CloseAudio ()
816 872
817int 873int
951void 1007void
952error (char *message) 1008error (char *message)
953 CODE: 1009 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 1010 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 1011#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1012 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 1013#endif
958 1014
959void 1015void
960fatal (char *message) 1016fatal (char *message)
961 CODE: 1017 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1018 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1019#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1020 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1021#endif
966 _exit (1); 1022 _exit (1);
967 1023
968void 1024void
969_exit (int retval = 0) 1025_exit (int retval = 0)
981#if DEBUG 1037#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1038 VALGRIND_DO_LEAK_CHECK;
983#endif 1039#endif
984} 1040}
985 1041
986MODULE = CFPlus PACKAGE = CFPlus::Font 1042MODULE = Deliantra::Client PACKAGE = DC::Font
987 1043
988PROTOTYPES: DISABLE 1044PROTOTYPES: DISABLE
989 1045
990CFPlus::Font 1046DC::Font
991new_from_file (SV *class, char *path, int id = 0) 1047new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1048 CODE:
993{ 1049{
994 int count; 1050 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1051 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1054}
999 OUTPUT: 1055 OUTPUT:
1000 RETVAL 1056 RETVAL
1001 1057
1002void 1058void
1003DESTROY (CFPlus::Font self) 1059DESTROY (DC::Font self)
1004 CODE: 1060 CODE:
1005 pango_font_description_free (self); 1061 pango_font_description_free (self);
1006 1062
1007void 1063void
1008make_default (CFPlus::Font self) 1064make_default (DC::Font self)
1009 PROTOTYPE: $ 1065 PROTOTYPE: $
1010 CODE: 1066 CODE:
1011 default_font = self; 1067 default_font = self;
1012 1068
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1069MODULE = Deliantra::Client PACKAGE = DC::Layout
1014 1070
1015PROTOTYPES: DISABLE 1071PROTOTYPES: DISABLE
1016 1072
1017void 1073void
1018reset_glyph_cache () 1074glyph_cache_backup ()
1019 PROTOTYPE: 1075 PROTOTYPE:
1020 CODE: 1076 CODE:
1077 tc_backup ();
1078
1079void
1080glyph_cache_restore ()
1081 PROTOTYPE:
1082 CODE:
1021 tc_clear (); 1083 tc_restore ();
1022 1084
1023CFPlus::Layout 1085DC::Layout
1024new (SV *class) 1086new (SV *class)
1025 CODE: 1087 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1088 New (0, RETVAL, 1, struct cf_layout);
1027 1089
1028 RETVAL->pl = pango_layout_new (opengl_context); 1090 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1092 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1093 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1094 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1095 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1096 RETVAL->font = 0;
1097 RETVAL->rc = rc_alloc ();
1035 1098
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1099 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1100 layout_update_font (RETVAL);
1038 OUTPUT: 1101 OUTPUT:
1039 RETVAL 1102 RETVAL
1040 1103
1041void 1104void
1042DESTROY (CFPlus::Layout self) 1105DESTROY (DC::Layout self)
1043 CODE: 1106 CODE:
1044 g_object_unref (self->pl); 1107 g_object_unref (self->pl);
1108 rc_free (self->rc);
1045 Safefree (self); 1109 Safefree (self);
1046 1110
1047void 1111void
1048set_text (CFPlus::Layout self, SV *text_) 1112set_text (DC::Layout self, SV *text_)
1049 CODE: 1113 CODE:
1050{ 1114{
1051 STRLEN textlen; 1115 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1116 char *text = SvPVutf8 (text_, textlen);
1053 1117
1054 pango_layout_set_text (self->pl, text, textlen); 1118 pango_layout_set_text (self->pl, text, textlen);
1055} 1119}
1056 1120
1057void 1121void
1058set_markup (CFPlus::Layout self, SV *text_) 1122set_markup (DC::Layout self, SV *text_)
1059 CODE: 1123 CODE:
1060{ 1124{
1061 STRLEN textlen; 1125 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1126 char *text = SvPVutf8 (text_, textlen);
1063 1127
1064 pango_layout_set_markup (self->pl, text, textlen); 1128 pango_layout_set_markup (self->pl, text, textlen);
1065} 1129}
1066 1130
1067void 1131void
1068set_shapes (CFPlus::Layout self, ...) 1132set_shapes (DC::Layout self, ...)
1069 CODE: 1133 CODE:
1070{ 1134{
1071 PangoAttrList *attrs = 0; 1135 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1136 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1137 const char *pos = text;
1108 if (attrs) 1172 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1173 pango_layout_set_attributes (self->pl, attrs);
1110} 1174}
1111 1175
1112void 1176void
1113get_shapes (CFPlus::Layout self) 1177get_shapes (DC::Layout self)
1114 PPCODE: 1178 PPCODE:
1115{ 1179{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1180 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1181
1118 do 1182 do
1119 { 1183 {
1120 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1184 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121 1185
1122 if (run && shape_attr_p (run)) 1186 if (run && shape_attr_p (run))
1123 { 1187 {
1124 PangoRectangle extents; 1188 PangoRectangle extents;
1125 pango_layout_iter_get_run_extents (iter, 0, &extents); 1189 pango_layout_iter_get_run_extents (iter, 0, &extents);
1133 1197
1134 pango_layout_iter_free (iter); 1198 pango_layout_iter_free (iter);
1135} 1199}
1136 1200
1137int 1201int
1138has_wrapped (CFPlus::Layout self) 1202has_wrapped (DC::Layout self)
1139 CODE: 1203 CODE:
1140{ 1204{
1141 int lines = 1; 1205 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1206 const char *text = pango_layout_get_text (self->pl);
1143 1207
1148} 1212}
1149 OUTPUT: 1213 OUTPUT:
1150 RETVAL 1214 RETVAL
1151 1215
1152SV * 1216SV *
1153get_text (CFPlus::Layout self) 1217get_text (DC::Layout self)
1154 CODE: 1218 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1219 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1220 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1221 OUTPUT:
1158 RETVAL 1222 RETVAL
1159 1223
1160void 1224void
1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1225set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162 CODE: 1226 CODE:
1163 self->r = r; 1227 self->r = r;
1164 self->g = g; 1228 self->g = g;
1165 self->b = b; 1229 self->b = b;
1166 self->a = a; 1230 self->a = a;
1167 1231
1168void 1232void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1233set_font (DC::Layout self, DC::Font font = 0)
1170 CODE: 1234 CODE:
1171 if (self->font != font) 1235 if (self->font != font)
1172 { 1236 {
1173 self->font = font; 1237 self->font = font;
1174 layout_update_font (self); 1238 layout_update_font (self);
1175 } 1239 }
1176 1240
1177void 1241void
1178set_height (CFPlus::Layout self, int base_height) 1242set_height (DC::Layout self, int base_height)
1179 CODE: 1243 CODE:
1180 if (self->base_height != base_height) 1244 if (self->base_height != base_height)
1181 { 1245 {
1182 self->base_height = base_height; 1246 self->base_height = base_height;
1183 layout_update_font (self); 1247 layout_update_font (self);
1184 } 1248 }
1185 1249
1186void 1250void
1187set_width (CFPlus::Layout self, int max_width = -1) 1251set_width (DC::Layout self, int max_width = -1)
1188 CODE: 1252 CODE:
1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1253 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190 1254
1191void 1255void
1192set_indent (CFPlus::Layout self, int indent) 1256set_indent (DC::Layout self, int indent)
1193 CODE: 1257 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1258 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1259
1196void 1260void
1197set_spacing (CFPlus::Layout self, int spacing) 1261set_spacing (DC::Layout self, int spacing)
1198 CODE: 1262 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1263 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1264
1201void 1265void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1266set_ellipsise (DC::Layout self, int ellipsise)
1203 CODE: 1267 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1268 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1269 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1270 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1271 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1272 : PANGO_ELLIPSIZE_NONE
1209 ); 1273 );
1210 1274
1211void 1275void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1276set_single_paragraph_mode (DC::Layout self, int spm)
1213 CODE: 1277 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1278 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1279
1216void 1280void
1217size (CFPlus::Layout self) 1281size (DC::Layout self)
1218 PPCODE: 1282 PPCODE:
1219{ 1283{
1220 int w, h; 1284 int w, h;
1221 1285
1222 layout_get_pixel_size (self, &w, &h); 1286 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (h)));
1227} 1291}
1228 1292
1229int 1293int
1230descent (CFPlus::Layout self) 1294descent (DC::Layout self)
1231 CODE: 1295 CODE:
1232{ 1296{
1233 PangoRectangle rect; 1297 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1298 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1299 pango_layout_line_get_pixel_extents (line, 0, &rect);
1236 RETVAL = PANGO_DESCENT (rect); 1300 RETVAL = PANGO_DESCENT (rect);
1237} 1301}
1238 OUTPUT: 1302 OUTPUT:
1239 RETVAL 1303 RETVAL
1240 1304
1241int 1305int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1306xy_to_index (DC::Layout self, int x, int y)
1243 CODE: 1307 CODE:
1244{ 1308{
1245 int index, trailing; 1309 int index, trailing;
1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1310 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247 RETVAL = index + trailing; 1311 RETVAL = index + trailing;
1248} 1312}
1249 OUTPUT: 1313 OUTPUT:
1250 RETVAL 1314 RETVAL
1251 1315
1252void 1316void
1253cursor_pos (CFPlus::Layout self, int index) 1317cursor_pos (DC::Layout self, int index)
1254 PPCODE: 1318 PPCODE:
1255{ 1319{
1256 PangoRectangle strong_pos; 1320 PangoRectangle pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1321 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258 1322
1259 EXTEND (SP, 3); 1323 EXTEND (SP, 3);
1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1324 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1325 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263} 1327}
1264 1328
1265void 1329void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1330index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267 PPCODE: 1331 PPCODE:
1268{ 1332{
1269 int line, x; 1333 int line, x;
1270 1334
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1335 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273 1338 --line;
1339#endif
1274 EXTEND (SP, 2); 1340 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1341 PUSHs (sv_2mortal (newSViv (line)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1342 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1343}
1278 1344
1279void 1345void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1346line_x_to_index (DC::Layout self, int line, int x)
1281 PPCODE: 1347 PPCODE:
1282{ 1348{
1283 PangoLayoutLine *lp; 1349 PangoLayoutLine *lp;
1284 int index, trailing; 1350 int index, trailing;
1285 1351
1286 if (line < 0) 1352 if (line < 0)
1287 XSRETURN_EMPTY; 1353 XSRETURN_EMPTY;
1288 1354
1289 if (!(lp = pango_layout_get_line (self->pl, line))) 1355 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */ 1356 XSRETURN_EMPTY; /* do better */
1291 1357
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1358 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293 1359
1294 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1366 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1367 }
1302} 1368}
1303 1369
1304void 1370void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1371render (DC::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1372 CODE:
1373 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1374 pango_opengl_render_layout_subpixel (
1308 self->pl, 1375 self->pl,
1376 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1377 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1378 self->r, self->g, self->b, self->a,
1311 flags 1379 flags
1312 ); 1380 );
1381 // we assume that context_change actually clears/frees stuff
1382 // and does not do any recomputation...
1383 pango_layout_context_changed (self->pl);
1313 1384
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1385void
1386draw (DC::Layout self)
1387 CODE:
1388{
1389 glEnable (GL_TEXTURE_2D);
1390 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1391 glEnable (GL_BLEND);
1392 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1393 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1394 glEnable (GL_ALPHA_TEST);
1395 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1396
1397 rc_draw (self->rc);
1398
1399 glDisable (GL_ALPHA_TEST);
1400 glDisable (GL_BLEND);
1401 glDisable (GL_TEXTURE_2D);
1402}
1403
1404MODULE = Deliantra::Client PACKAGE = DC::Texture
1315 1405
1316PROTOTYPES: ENABLE 1406PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1407
1320void 1408void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1409pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1410 CODE:
1323{ 1411{
1350 HV *hv = (HV *)SvRV (self); 1438 HV *hv = (HV *)SvRV (self);
1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1439 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1440 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1441 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354 1442
1443 if (name <= 0)
1444 XSRETURN_EMPTY;
1445
1355 if (items < 5) 1446 if (items < 5)
1356 { 1447 {
1357 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1448 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1449 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359 } 1450 }
1397 RETVAL = width > 0; 1488 RETVAL = width > 0;
1398} 1489}
1399 OUTPUT: 1490 OUTPUT:
1400 RETVAL 1491 RETVAL
1401 1492
1402MODULE = CFPlus PACKAGE = CFPlus::Map 1493MODULE = Deliantra::Client PACKAGE = DC::Map
1403 1494
1404PROTOTYPES: DISABLE 1495PROTOTYPES: DISABLE
1405 1496
1406CFPlus::Map 1497DC::Map
1407new (SV *class) 1498new (SV *class)
1408 CODE: 1499 CODE:
1409 New (0, RETVAL, 1, struct map); 1500 New (0, RETVAL, 1, struct map);
1410 RETVAL->x = 0; 1501 RETVAL->x = 0;
1411 RETVAL->y = 0; 1502 RETVAL->y = 0;
1419 RETVAL->row = 0; 1510 RETVAL->row = 0;
1420 OUTPUT: 1511 OUTPUT:
1421 RETVAL 1512 RETVAL
1422 1513
1423void 1514void
1424DESTROY (CFPlus::Map self) 1515DESTROY (DC::Map self)
1425 CODE: 1516 CODE:
1426{ 1517{
1427 map_clear (self); 1518 map_clear (self);
1428 Safefree (self->face2tile); 1519 Safefree (self->face2tile);
1429 Safefree (self->tex); 1520 Safefree (self->tex);
1430 Safefree (self); 1521 Safefree (self);
1431} 1522}
1432 1523
1433void 1524void
1434resize (CFPlus::Map self, int map_width, int map_height) 1525resize (DC::Map self, int map_width, int map_height)
1435 CODE: 1526 CODE:
1436 self->w = map_width; 1527 self->w = map_width;
1437 self->h = map_height; 1528 self->h = map_height;
1438 1529
1439void 1530void
1440clear (CFPlus::Map self) 1531clear (DC::Map self)
1441 CODE: 1532 CODE:
1442 map_clear (self); 1533 map_clear (self);
1443 1534
1444void 1535void
1445set_tileid (CFPlus::Map self, int face, int tile) 1536set_tileid (DC::Map self, int face, int tile)
1446 CODE: 1537 CODE:
1447{ 1538{
1448 need_facenum (self, face); self->face2tile [face] = tile; 1539 need_facenum (self, face); self->face2tile [face] = tile;
1449 need_texid (self, tile); 1540 need_texid (self, tile);
1450} 1541}
1451 1542
1452void 1543void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level) 1544set_smooth (DC::Map self, int face, int smooth, int level)
1454 CODE: 1545 CODE:
1455{ 1546{
1456 tileid texid; 1547 tileid texid;
1457 maptex *tex; 1548 maptex *tex;
1458 1549
1471 tex->smoothtile = self->face2tile [smooth]; 1562 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level; 1563 tex->smoothlevel = level;
1473} 1564}
1474 1565
1475void 1566void
1476set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1567set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1477 CODE: 1568 CODE:
1478{ 1569{
1479 need_texid (self, texid); 1570 need_texid (self, texid);
1480 1571
1481 { 1572 {
1501 // from transparent color bleeding and ugly wrapping effects. 1592 // from transparent color bleeding and ugly wrapping effects.
1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1593 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503} 1594}
1504 1595
1505int 1596int
1506ox (CFPlus::Map self) 1597ox (DC::Map self)
1507 ALIAS: 1598 ALIAS:
1508 oy = 1 1599 oy = 1
1509 x = 2 1600 x = 2
1510 y = 3 1601 y = 3
1511 w = 4 1602 w = 4
1522 } 1613 }
1523 OUTPUT: 1614 OUTPUT:
1524 RETVAL 1615 RETVAL
1525 1616
1526void 1617void
1527scroll (CFPlus::Map self, int dx, int dy) 1618scroll (DC::Map self, int dx, int dy)
1528 CODE: 1619 CODE:
1529{ 1620{
1530 if (dx > 0) 1621 if (dx > 0)
1531 map_blank (self, self->x, self->y, dx, self->h); 1622 map_blank (self, self->x, self->y, dx, self->h);
1532 else if (dx < 0) 1623 else if (dx < 0)
1547 self->rows += MAP_EXTEND_Y; 1638 self->rows += MAP_EXTEND_Y;
1548 self->y += MAP_EXTEND_Y; 1639 self->y += MAP_EXTEND_Y;
1549 } 1640 }
1550} 1641}
1551 1642
1552void 1643SV *
1553map1a_update (CFPlus::Map self, SV *data_, int extmap) 1644map1a_update (DC::Map self, SV *data_, int extmap)
1554 CODE: 1645 CODE:
1555{ 1646{
1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1647 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1557 uint8_t *data_end = (uint8_t *)SvEND (data_); 1648 uint8_t *data_end = (uint8_t *)SvEND (data_);
1558 mapcell *cell; 1649 mapcell *cell;
1559 int x, y, flags; 1650 int x, y, z, flags;
1651 AV *missing = newAV ();
1652 RETVAL = newRV_noinc ((SV *)missing);
1560 1653
1561 while (data < data_end - 1) 1654 while (data < data_end - 1)
1562 { 1655 {
1563 flags = (data [0] << 8) + data [1]; data += 2; 1656 flags = (data [0] << 8) + data [1]; data += 2;
1564 1657
1615 } 1708 }
1616 else 1709 else
1617 cell->darkness = *data++ + 1; 1710 cell->darkness = *data++ + 1;
1618 } 1711 }
1619 1712
1713 for (z = 0; z <= 2; ++z)
1620 if (flags & 4) 1714 if (flags & (4 >> z))
1621 { 1715 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2; 1716 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face); 1717 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face]; 1718 cell->tile [z] = self->face2tile [face];
1719
1720 if (cell->tile [z])
1721 {
1722 maptex *tex = self->tex + cell->tile [z];
1723 if (!tex->name)
1724 av_push (missing, newSViv (cell->tile [z]));
1725
1726 if (tex->smoothtile)
1727 {
1728 maptex *smooth = self->tex + tex->smoothtile;
1729 if (!smooth->name)
1730 av_push (missing, newSViv (tex->smoothtile));
1731 }
1732 }
1625 } 1733 }
1626
1627 if (flags & 2)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1632 }
1633
1634 if (flags & 1)
1635 {
1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1639 }
1640 } 1734 }
1641 else 1735 else
1642 cell->darkness = 0; 1736 cell->darkness = 0;
1643 } 1737 }
1644} 1738}
1739 OUTPUT:
1740 RETVAL
1645 1741
1646SV * 1742SV *
1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1743mapmap (DC::Map self, int x0, int y0, int w, int h)
1648 CODE: 1744 CODE:
1649{ 1745{
1650 int x1, x; 1746 int x1, x;
1651 int y1, y; 1747 int y1, y;
1652 int z; 1748 int z;
1697} 1793}
1698 OUTPUT: 1794 OUTPUT:
1699 RETVAL 1795 RETVAL
1700 1796
1701void 1797void
1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1798draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1703 CODE: 1799 CODE:
1704{ 1800{
1801 int x, y, z;
1802
1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1804 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1805 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708 smooth_key skey; 1806 smooth_key skey;
1709 int x, y, z; 1807
1710 int last_name; 1808 rc_t *rc = rc_alloc ();
1809 rc_key_t key;
1810 rc_array_t *arr;
1711 1811
1712 // thats current max. sorry. 1812 // thats current max. sorry.
1713 if (sw > 255) sw = 255; 1813 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255; 1814 if (sh > 255) sh = 255;
1715 1815
1716 // clear key, in case of extra padding 1816 // clear key, in case of extra padding
1717 memset (&skey, 0, sizeof (skey)); 1817 memset (&skey, 0, sizeof (skey));
1718 1818
1719 glColor4ub (255, 255, 255, 255); 1819 memset (&key, 0, sizeof (key));
1720 1820 key.r = 255;
1721 glEnable (GL_BLEND); 1821 key.g = 255;
1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1822 key.b = 255;
1723 glEnable (GL_TEXTURE_2D); 1823 key.a = 255;
1724 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1824 key.mode = GL_QUADS;
1725 1825 key.format = GL_T2F_V3F;
1726 glBegin (GL_QUADS); 1826 key.texname = -1;
1727
1728 last_name = 0;
1729 1827
1730 mx += self->x; 1828 mx += self->x;
1731 my += self->y; 1829 my += self->y;
1732 1830
1733 // first pass: determine smooth_max 1831 // first pass: determine smooth_max
1749 MAX (self->tex [cell->tile [0]].smoothlevel, 1847 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel, 1848 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel)); 1849 self->tex [cell->tile [2]].smoothlevel));
1752 } 1850 }
1753 } 1851 }
1852
1853 glEnable (GL_BLEND);
1854 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1855 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754 1856
1755 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1756 { 1858 {
1757 memset (smooth_level, 0, sizeof (smooth_level)); 1859 memset (smooth_level, 0, sizeof (smooth_level));
1758 1860
1768 tileid tile = cell->tile [z]; 1870 tileid tile = cell->tile [z];
1769 1871
1770 if (tile) 1872 if (tile)
1771 { 1873 {
1772 maptex tex = self->tex [tile]; 1874 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w; 1875 int px, py;
1774 int py = (y + 1) * T - tex.h;
1775 1876
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name) 1877 if (key.texname != tex.name)
1779 { 1878 {
1780 if (!tex.name) 1879 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */ 1880 tex = self->tex [2]; /* missing, replace by noface */
1782 1881
1783 glEnd (); 1882 key.texname = tex.name;
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1883 arr = rc_array (rc, &key);
1785 glBegin (GL_QUADS);
1786 } 1884 }
1787 1885
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1886 px = (x + 1) * T - tex.w;
1887 py = (y + 1) * T - tex.h;
1888
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1890 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1891 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1892 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792 1893
1793 if (cell->flags && z == 2) 1894 if (cell->flags && z == 2)
1794 { 1895 {
1896 // overlays such as the speech bubble, probably more to come
1795 if (cell->flags & 1) 1897 if (cell->flags & 1)
1796 { 1898 {
1797 maptex tex = self->tex [1]; 1899 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32; 1900 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32; 1901 int py = y * T - T * 6 / 32;
1800 1902
1903 if (tex.name)
1801 glEnd (); 1904 {
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1905 if (key.texname != tex.name)
1906 {
1907 key.texname = tex.name;
1908 arr = rc_array (rc, &key);
1909 }
1910
1911 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803 glBegin (GL_QUADS); 1915 }
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 } 1916 }
1810 } 1917 }
1811 1918
1812 // update smooth hash 1919 // update smooth hash
1813 if (tex.smoothtile) 1920 if (tex.smoothtile)
1849 } 1956 }
1850 } 1957 }
1851 } 1958 }
1852 } 1959 }
1853 1960
1961 rc_draw (rc);
1962 rc_clear (rc);
1963
1854 // go through all smoothlevels, lowest to highest, then draw. 1964 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort 1965 // this is basically counting sort
1856 { 1966 {
1857 int w, b; 1967 int w, b;
1858 1968
1969 glEnable (GL_TEXTURE_2D);
1970 glBegin (GL_QUADS);
1859 for (w = 0; w < 256 / 32; ++w) 1971 for (w = 0; w < 256 / 32; ++w)
1860 { 1972 {
1861 uint32_t smask = smooth_level [w]; 1973 uint32_t smask = smooth_level [w];
1862 if (smask) 1974 if (smask)
1863 for (b = 0; b < 32; ++b) 1975 for (b = 0; b < 32; ++b)
1882 int border = bits & 15; 1994 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1995 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row 1996 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column 1997 float dy = tex.t * .5f ; // 2 images/column
1886 1998
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name) 1999 if (tex.name)
1890 { 2000 {
2001 // this time avoiding texture state changes
2002 // save gobs of state changes.
1891 if (!tex.name) 2003 if (key.texname != tex.name)
1892 continue; // smoothing not yet available 2004 {
1893
1894 glEnd (); 2005 glEnd ();
1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2006 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896 glBegin (GL_QUADS); 2007 glBegin (GL_QUADS);
1897 } 2008 }
1898 2009
1899 if (border) 2010 if (border)
1900 { 2011 {
1901 float ox = border * dx; 2012 float ox = border * dx;
1902 2013
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2014 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2015 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2016 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2017 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907 } 2018 }
1908 2019
1909 if (corner) 2020 if (corner)
1910 { 2021 {
1911 float ox = corner * dx; 2022 float ox = corner * dx;
1912 2023
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2024 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2025 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2026 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2027 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2028 }
1917 } 2029 }
1918 } 2030 }
1919 } 2031 }
1920 } 2032 }
1921 } 2033 }
2034
2035 glEnd ();
2036 glDisable (GL_TEXTURE_2D);
2037 key.texname = -1;
1922 } 2038 }
1923 2039
1924 hv_clear (smooth); 2040 hv_clear (smooth);
1925 } 2041 }
1926 2042
1927 glEnd ();
1928
1929 glDisable (GL_TEXTURE_2D);
1930 glDisable (GL_BLEND); 2043 glDisable (GL_BLEND);
2044 rc_free (rc);
1931 2045
1932 // top layer: overlays such as the health bar 2046 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++) 2047 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows) 2048 if (0 <= y + my && y + my < self->rows)
1935 { 2049 {
1960 } 2074 }
1961 } 2075 }
1962} 2076}
1963 2077
1964void 2078void
1965draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2079draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966 CODE: 2080 CODE:
1967{ 2081{
1968 static float color[16][3] = { 2082 static float color[16][3] = {
1969 { 0.00F, 0.00F, 0.00F }, 2083 { 0.00F, 0.00F, 0.00F },
1970 { 1.00F, 1.00F, 1.00F }, 2084 { 1.00F, 1.00F, 1.00F },
2020 glDisable (GL_BLEND); 2134 glDisable (GL_BLEND);
2021 glDisable (GL_TEXTURE_2D); 2135 glDisable (GL_TEXTURE_2D);
2022} 2136}
2023 2137
2024void 2138void
2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2139fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026 PPCODE: 2140 PPCODE:
2027{ 2141{
2028 int x, y; 2142 int x, y;
2029 int sw1 = sw + 2; 2143 int sw1 = sw + 2;
2030 int sh1 = sh + 2; 2144 int sh1 = sh + 2;
2101 PUSHs (sv_2mortal (newSViv (sh3))); 2215 PUSHs (sv_2mortal (newSViv (sh3)));
2102 PUSHs (darkness3_sv); 2216 PUSHs (darkness3_sv);
2103} 2217}
2104 2218
2105SV * 2219SV *
2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2220get_rect (DC::Map self, int x0, int y0, int w, int h)
2107 CODE: 2221 CODE:
2108{ 2222{
2109 int x, y, x1, y1; 2223 int x, y, x1, y1;
2110 SV *data_sv = newSV (w * h * 7 + 5); 2224 SV *data_sv = newSV (w * h * 7 + 5);
2111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2225 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2176} 2290}
2177 OUTPUT: 2291 OUTPUT:
2178 RETVAL 2292 RETVAL
2179 2293
2180void 2294void
2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2295set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2182 PPCODE: 2296 PPCODE:
2183{ 2297{
2184 int x, y, z; 2298 int x, y, z;
2185 int w, h; 2299 int w, h;
2186 int x1, y1; 2300 int x1, y1;
2187 2301
2188 if (*data++ != 0) 2302 if (*data++ != 0)
2189 return; /* version mismatch */ 2303 XSRETURN_EMPTY; /* version mismatch */
2190 2304
2191 w = *data++ << 8; w |= *data++; 2305 w = *data++ << 8; w |= *data++;
2192 h = *data++ << 8; h |= *data++; 2306 h = *data++ << 8; h |= *data++;
2193 2307
2194 // we need to do this 'cause we don't keep an absolute coord system for rows 2308 // we need to do this 'cause we don't keep an absolute coord system for rows
2239 } 2353 }
2240 } 2354 }
2241 } 2355 }
2242} 2356}
2243 2357
2244MODULE = CFPlus PACKAGE = CFPlus::RW 2358MODULE = Deliantra::Client PACKAGE = DC::RW
2245 2359
2246CFPlus::RW 2360DC::RW
2247new (SV *class, SV *data_sv) 2361new (SV *class, SV *data_sv)
2248 CODE: 2362 CODE:
2249{ 2363{
2250 STRLEN datalen; 2364 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen); 2365 char *data = SvPVbyte (data_sv, datalen);
2253 RETVAL = SDL_RWFromConstMem (data, datalen); 2367 RETVAL = SDL_RWFromConstMem (data, datalen);
2254} 2368}
2255 OUTPUT: 2369 OUTPUT:
2256 RETVAL 2370 RETVAL
2257 2371
2258CFPlus::RW 2372DC::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb") 2373new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE: 2374 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode); 2375 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT: 2376 OUTPUT:
2263 RETVAL 2377 RETVAL
2264 2378
2265# fails on win32: 2379# fails on win32:
2266# CFPlus.xs(2268) : error C2059: syntax error : '(' 2380# dc.xs(2268) : error C2059: syntax error : '('
2267#void 2381#void
2268#close (CFPlus::RW self) 2382#close (DC::RW self)
2269# CODE: 2383# CODE:
2270# (self->(close)) (self); 2384# (self->(close)) (self);
2271 2385
2272MODULE = CFPlus PACKAGE = CFPlus::Channel 2386MODULE = Deliantra::Client PACKAGE = DC::Channel
2273 2387
2274PROTOTYPES: DISABLE 2388PROTOTYPES: DISABLE
2275 2389
2276CFPlus::Channel 2390DC::Channel
2277find () 2391find ()
2278 CODE: 2392 CODE:
2279{ 2393{
2280 RETVAL = Mix_GroupAvailable (-1); 2394 RETVAL = Mix_GroupAvailable (-1);
2281 2395
2294} 2408}
2295 OUTPUT: 2409 OUTPUT:
2296 RETVAL 2410 RETVAL
2297 2411
2298void 2412void
2299halt (CFPlus::Channel self) 2413halt (DC::Channel self)
2300 CODE: 2414 CODE:
2301 Mix_HaltChannel (self); 2415 Mix_HaltChannel (self);
2302 2416
2303void 2417void
2304expire (CFPlus::Channel self, int ticks = -1) 2418expire (DC::Channel self, int ticks = -1)
2305 CODE: 2419 CODE:
2306 Mix_ExpireChannel (self, ticks); 2420 Mix_ExpireChannel (self, ticks);
2307 2421
2308void 2422void
2309fade_out (CFPlus::Channel self, int ticks = -1) 2423fade_out (DC::Channel self, int ticks = -1)
2310 CODE: 2424 CODE:
2311 Mix_FadeOutChannel (self, ticks); 2425 Mix_FadeOutChannel (self, ticks);
2312 2426
2313int 2427int
2314volume (CFPlus::Channel self, int volume) 2428volume (DC::Channel self, int volume)
2315 CODE: 2429 CODE:
2316 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2430 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317 OUTPUT: 2431 OUTPUT:
2318 RETVAL 2432 RETVAL
2319 2433
2320void 2434void
2321unregister_all_effects (CFPlus::Channel self) 2435unregister_all_effects (DC::Channel self)
2322 CODE: 2436 CODE:
2323 Mix_UnregisterAllEffects (self); 2437 Mix_UnregisterAllEffects (self);
2324 2438
2325void 2439void
2326set_panning (CFPlus::Channel self, int left, int right) 2440set_panning (DC::Channel self, int left, int right)
2327 CODE: 2441 CODE:
2328 left = CLAMP (left , 0, 255); 2442 left = CLAMP (left , 0, 255);
2329 right = CLAMP (right, 0, 255); 2443 right = CLAMP (right, 0, 255);
2330 Mix_SetPanning (self, left, right); 2444 Mix_SetPanning (self, left, right);
2331 2445
2332void 2446void
2333set_distance (CFPlus::Channel self, int distance) 2447set_distance (DC::Channel self, int distance)
2334 CODE: 2448 CODE:
2335 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2449 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336 2450
2337void 2451void
2338set_position (CFPlus::Channel self, int angle, int distance) 2452set_position (DC::Channel self, int angle, int distance)
2339 CODE: 2453 CODE:
2454
2455void
2456set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457 CODE:
2458{
2459 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2461 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462}
2341 2463
2342void 2464void
2343set_reverse_stereo (CFPlus::Channel self, int flip) 2465set_reverse_stereo (DC::Channel self, int flip)
2344 CODE: 2466 CODE:
2345 Mix_SetReverseStereo (self, flip); 2467 Mix_SetReverseStereo (self, flip);
2346 2468
2347MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2469MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348 2470
2349PROTOTYPES: DISABLE 2471PROTOTYPES: DISABLE
2350 2472
2351CFPlus::MixChunk 2473DC::MixChunk
2352new (SV *class, CFPlus::RW rwops) 2474new (SV *class, DC::RW rwops)
2353 CODE: 2475 CODE:
2354 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2476 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355 OUTPUT: 2477 OUTPUT:
2356 RETVAL 2478 RETVAL
2357 2479
2358void 2480void
2359DESTROY (CFPlus::MixChunk self) 2481DESTROY (DC::MixChunk self)
2360 CODE: 2482 CODE:
2361 Mix_FreeChunk (self); 2483 Mix_FreeChunk (self);
2362 2484
2363int 2485int
2364volume (CFPlus::MixChunk self, int volume = -1) 2486volume (DC::MixChunk self, int volume = -1)
2365 CODE: 2487 CODE:
2366 if (items > 1) 2488 if (items > 1)
2367 volume = CLAMP (volume, 0, 128); 2489 volume = CLAMP (volume, 0, 128);
2368 RETVAL = Mix_VolumeChunk (self, volume); 2490 RETVAL = Mix_VolumeChunk (self, volume);
2369 OUTPUT: 2491 OUTPUT:
2370 RETVAL 2492 RETVAL
2371 2493
2372CFPlus::Channel 2494DC::Channel
2373play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2495play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374 CODE: 2496 CODE:
2375{ 2497{
2376 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2498 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377 2499
2378 if (RETVAL < 0) 2500 if (RETVAL < 0)
2385 } 2507 }
2386} 2508}
2387 OUTPUT: 2509 OUTPUT:
2388 RETVAL 2510 RETVAL
2389 2511
2390MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2512MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391 2513
2392int 2514int
2393volume (int volume = -1) 2515volume (int volume = -1)
2394 PROTOTYPE: ;$ 2516 PROTOTYPE: ;$
2395 CODE: 2517 CODE:
2407void 2529void
2408halt () 2530halt ()
2409 CODE: 2531 CODE:
2410 Mix_HaltMusic (); 2532 Mix_HaltMusic ();
2411 2533
2412CFPlus::MixMusic 2534DC::MixMusic
2413new (SV *class, CFPlus::RW rwops) 2535new (SV *class, DC::RW rwops)
2414 CODE: 2536 CODE:
2415 RETVAL = Mix_LoadMUS_RW (rwops); 2537 RETVAL = Mix_LoadMUS_RW (rwops);
2416 OUTPUT: 2538 OUTPUT:
2417 RETVAL 2539 RETVAL
2418 2540
2419void 2541void
2420DESTROY (CFPlus::MixMusic self) 2542DESTROY (DC::MixMusic self)
2421 CODE: 2543 CODE:
2422 Mix_FreeMusic (self); 2544 Mix_FreeMusic (self);
2423 2545
2424int 2546int
2425play (CFPlus::MixMusic self, int loops = -1) 2547play (DC::MixMusic self, int loops = -1)
2426 CODE: 2548 CODE:
2427 RETVAL = Mix_PlayMusic (self, loops); 2549 RETVAL = Mix_PlayMusic (self, loops);
2428 OUTPUT: 2550 OUTPUT:
2429 RETVAL 2551 RETVAL
2430 2552
2431void 2553void
2432fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2554fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433 CODE: 2555 CODE:
2434 Mix_FadeInMusicPos (self, loops, ms, position); 2556 Mix_FadeInMusicPos (self, loops, ms, position);
2435 2557
2436MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2558MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437 2559
2438PROTOTYPES: ENABLE 2560PROTOTYPES: ENABLE
2439 2561
2440BOOT: 2562BOOT:
2441{ 2563{
2442 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2564 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443 static const struct { 2565 static const struct {
2444 const char *name; 2566 const char *name;
2445 IV iv; 2567 IV iv;
2446 } *civ, const_iv[] = { 2568 } *civ, const_iv[] = {
2447# define const_iv(name) { # name, (IV)name } 2569# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_INTENSITY), 2604 const_iv (GL_INTENSITY),
2483 const_iv (GL_LUMINANCE), 2605 const_iv (GL_LUMINANCE),
2484 const_iv (GL_LUMINANCE_ALPHA), 2606 const_iv (GL_LUMINANCE_ALPHA),
2485 const_iv (GL_FLOAT), 2607 const_iv (GL_FLOAT),
2486 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2608 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2609 const_iv (GL_COMPRESSED_ALPHA_ARB),
2610 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2611 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2612 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2613 const_iv (GL_COMPRESSED_RGB_ARB),
2614 const_iv (GL_COMPRESSED_RGBA_ARB),
2487 const_iv (GL_COMPILE), 2615 const_iv (GL_COMPILE),
2488 const_iv (GL_PROXY_TEXTURE_1D), 2616 const_iv (GL_PROXY_TEXTURE_1D),
2489 const_iv (GL_PROXY_TEXTURE_2D), 2617 const_iv (GL_PROXY_TEXTURE_2D),
2490 const_iv (GL_TEXTURE_1D), 2618 const_iv (GL_TEXTURE_1D),
2491 const_iv (GL_TEXTURE_2D), 2619 const_iv (GL_TEXTURE_2D),
2530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2658 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531 const_iv (GL_POINT_SMOOTH_HINT), 2659 const_iv (GL_POINT_SMOOTH_HINT),
2532 const_iv (GL_LINE_SMOOTH_HINT), 2660 const_iv (GL_LINE_SMOOTH_HINT),
2533 const_iv (GL_POLYGON_SMOOTH_HINT), 2661 const_iv (GL_POLYGON_SMOOTH_HINT),
2534 const_iv (GL_GENERATE_MIPMAP_HINT), 2662 const_iv (GL_GENERATE_MIPMAP_HINT),
2663 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535 const_iv (GL_FASTEST), 2664 const_iv (GL_FASTEST),
2536 const_iv (GL_DONT_CARE), 2665 const_iv (GL_DONT_CARE),
2537 const_iv (GL_NICEST), 2666 const_iv (GL_NICEST),
2538 const_iv (GL_V2F), 2667 const_iv (GL_V2F),
2539 const_iv (GL_V3F), 2668 const_iv (GL_V3F),
2547 2676
2548 texture_av = newAV (); 2677 texture_av = newAV ();
2549 AvREAL_off (texture_av); 2678 AvREAL_off (texture_av);
2550} 2679}
2551 2680
2681void
2682disable_GL_EXT_blend_func_separate ()
2683 CODE:
2684 gl.BlendFuncSeparate = 0;
2685 gl.BlendFuncSeparateEXT = 0;
2686
2552char * 2687char *
2553gl_vendor () 2688gl_vendor ()
2554 CODE: 2689 CODE:
2555 RETVAL = (char *)glGetString (GL_VENDOR); 2690 RETVAL = (char *)glGetString (GL_VENDOR);
2556 OUTPUT: 2691 OUTPUT:
2677 2812
2678void glRect (float x1, float y1, float x2, float y2) 2813void glRect (float x1, float y1, float x2, float y2)
2679 CODE: 2814 CODE:
2680 glRectf (x1, y1, x2, y2); 2815 glRectf (x1, y1, x2, y2);
2681 2816
2817void glRect_lineloop (float x1, float y1, float x2, float y2)
2818 CODE:
2819 glBegin (GL_LINE_LOOP);
2820 glVertex2f (x1, y1);
2821 glVertex2f (x2, y1);
2822 glVertex2f (x2, y2);
2823 glVertex2f (x1, y2);
2824 glEnd ();
2825
2682PROTOTYPES: ENABLE 2826PROTOTYPES: ENABLE
2683 2827
2684void glBegin (int mode) 2828void glBegin (int mode)
2685 2829
2686void glEnd () 2830void glEnd ()
2718void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2862void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2719 CODE: 2863 CODE:
2720 if (gl.SeparableFilter2D) 2864 if (gl.SeparableFilter2D)
2721 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2865 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722 2866
2723void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2867void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724 2868
2725void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2869void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726 2870
2727void glDrawPixels (int width, int height, int format, int type, char *pixels) 2871void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728 2872
2754 2898
2755void glEndList () 2899void glEndList ()
2756 2900
2757void glCallList (int list) 2901void glCallList (int list)
2758 2902
2759MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2903MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760 2904
2761PROTOTYPES: DISABLE 2905PROTOTYPES: DISABLE
2762 2906
2763void 2907void
2764find_widget (SV *self, NV x, NV y) 2908find_widget (SV *self, NV x, NV y)
2768 XPUSHs (self); 2912 XPUSHs (self);
2769} 2913}
2770 2914
2771BOOT: 2915BOOT:
2772{ 2916{
2773 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2917 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774 2918
2775 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2919 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2776 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2920 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2777 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2921 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2778 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2922 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779} 2923}
2780 2924
2781void 2925void
2782draw (SV *self) 2926draw (SV *self)
2783 CODE: 2927 CODE:
2787 NV x, y, w, h; 2931 NV x, y, w, h;
2788 SV *draw_x_sv = GvSV (draw_x_gv); 2932 SV *draw_x_sv = GvSV (draw_x_gv);
2789 SV *draw_y_sv = GvSV (draw_y_gv); 2933 SV *draw_y_sv = GvSV (draw_y_gv);
2790 SV *draw_w_sv = GvSV (draw_w_gv); 2934 SV *draw_w_sv = GvSV (draw_w_gv);
2791 SV *draw_h_sv = GvSV (draw_h_gv); 2935 SV *draw_h_sv = GvSV (draw_h_gv);
2792 SV *hover;
2793 double draw_x, draw_y, draw_w, draw_h; 2936 double draw_x, draw_y;
2794 2937
2795 if (!SvROK (self)) 2938 if (!SvROK (self))
2796 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2939 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797 2940
2798 hv = (HV *)SvRV (self); 2941 hv = (HV *)SvRV (self);
2799 2942
2800 if (SvTYPE (hv) != SVt_PVHV) 2943 if (SvTYPE (hv) != SVt_PVHV)
2801 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2944 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802 2945
2803 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2946 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2804 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2947 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805 2948
2806 if (!h || !w) 2949 if (!h || !w)
2826 { 2969 {
2827 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2970 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828 2971
2829 if (svp && SvTRUE (*svp)) 2972 if (svp && SvTRUE (*svp))
2830 { 2973 {
2831 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2974 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832 glEnable (GL_BLEND); 2975 glEnable (GL_BLEND);
2833 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2976 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834 glBegin (GL_QUADS); 2977 glBegin (GL_QUADS);
2835 glVertex2f (0, 0); 2978 glVertex2f (0, 0);
2836 glVertex2f (w, 0); 2979 glVertex2f (w, 0);
2839 glEnd (); 2982 glEnd ();
2840 glDisable (GL_BLEND); 2983 glDisable (GL_BLEND);
2841 } 2984 }
2842 } 2985 }
2843#if 0 2986#if 0
2844 if ($ENV{CFPLUS_DEBUG} & 1) { 2987 // draw borders, for debugging
2845 glPushMatrix; 2988 glPushMatrix ();
2846 glColor 1, 1, 0, 1; 2989 glColor4f (1., 1., 0., 1.);
2847 glTranslate 0.375, 0.375; 2990 glTranslatef (.5, .5, 0.);
2848 glBegin GL_LINE_LOOP; 2991 glBegin (GL_LINE_LOOP);
2849 glVertex 0 , 0; 2992 glVertex2f (0 , 0);
2850 glVertex $self->{w} - 1, 0; 2993 glVertex2f (w - 1, 0);
2851 glVertex $self->{w} - 1, $self->{h} - 1; 2994 glVertex2f (w - 1, h - 1);
2852 glVertex 0 , $self->{h} - 1; 2995 glVertex2f (0 , h - 1);
2853 glEnd; 2996 glEnd ();
2854 glPopMatrix; 2997 glPopMatrix ();
2855 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856 }
2857#endif 2998#endif
2858 PUSHMARK (SP); 2999 PUSHMARK (SP);
2859 XPUSHs (self); 3000 XPUSHs (self);
2860 PUTBACK; 3001 PUTBACK;
2861 call_method ("_draw", G_VOID | G_DISCARD); 3002 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines