ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.254 by root, Sun Jan 6 18:12:20 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines