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