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.256 by root, Mon Mar 24 00:24:46 2008 UTC

46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
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}
730char * 769char *
731SDL_GetKeyName (int sym) 770SDL_GetKeyName (int sym)
732 771
733int 772int
734SDL_GetAppState () 773SDL_GetAppState ()
774
775int
776SDL_GetModState ()
735 777
736void 778void
737poll_events () 779poll_events ()
738 PPCODE: 780 PPCODE:
739{ 781{
749 { 791 {
750 case SDL_KEYDOWN: 792 case SDL_KEYDOWN:
751 case SDL_KEYUP: 793 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
755 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 799 break;
758 800
759 case SDL_ACTIVEEVENT: 801 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 820 x = ev.motion.x;
779 y = ev.motion.y; 821 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 823 }
782 824
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 826 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 827 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 828 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 829 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 830 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 831 }
790 break; 832 break;
791 833
792 case SDL_MOUSEBUTTONDOWN: 834 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 835 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 837
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 838 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 840 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 841 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 846 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 847 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 848 break;
807 } 849 }
808 850
809 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 851 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810 } 852 }
811} 853}
812 854
813int 855int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 856Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 857 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 858 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 859 Mix_ChannelFinished (channel_finished);
860
861void
862Mix_QuerySpec ()
863 PPCODE:
864{
865 int freq, channels;
866 Uint16 format;
867
868 if (Mix_QuerySpec (&freq, &format, &channels))
869 {
870 EXTEND (SP, 3);
871 PUSHs (sv_2mortal (newSViv (freq)));
872 PUSHs (sv_2mortal (newSViv (format)));
873 PUSHs (sv_2mortal (newSViv (channels)));
874 }
875}
818 876
819void 877void
820Mix_CloseAudio () 878Mix_CloseAudio ()
821 879
822int 880int
956void 1014void
957error (char *message) 1015error (char *message)
958 CODE: 1016 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1017 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1018#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1019 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1020#endif
963 1021
964void 1022void
965fatal (char *message) 1023fatal (char *message)
966 CODE: 1024 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1025 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1026#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1027 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1028#endif
971 _exit (1); 1029 _exit (1);
972 1030
973void 1031void
974_exit (int retval = 0) 1032_exit (int retval = 0)
986#if DEBUG 1044#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1045 VALGRIND_DO_LEAK_CHECK;
988#endif 1046#endif
989} 1047}
990 1048
991MODULE = CFPlus PACKAGE = CFPlus::Font 1049MODULE = Deliantra::Client PACKAGE = DC::Font
992 1050
993PROTOTYPES: DISABLE 1051PROTOTYPES: DISABLE
994 1052
995CFPlus::Font 1053DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1054new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1055 CODE:
998{ 1056{
999 int count; 1057 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1061}
1004 OUTPUT: 1062 OUTPUT:
1005 RETVAL 1063 RETVAL
1006 1064
1007void 1065void
1008DESTROY (CFPlus::Font self) 1066DESTROY (DC::Font self)
1009 CODE: 1067 CODE:
1010 pango_font_description_free (self); 1068 pango_font_description_free (self);
1011 1069
1012void 1070void
1013make_default (CFPlus::Font self) 1071make_default (DC::Font self)
1014 PROTOTYPE: $ 1072 PROTOTYPE: $
1015 CODE: 1073 CODE:
1016 default_font = self; 1074 default_font = self;
1017 1075
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1076MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1077
1020PROTOTYPES: DISABLE 1078PROTOTYPES: DISABLE
1021 1079
1022void 1080void
1023reset_glyph_cache () 1081glyph_cache_backup ()
1024 PROTOTYPE: 1082 PROTOTYPE:
1025 CODE: 1083 CODE:
1084 tc_backup ();
1085
1086void
1087glyph_cache_restore ()
1088 PROTOTYPE:
1089 CODE:
1026 tc_clear (); 1090 tc_restore ();
1027 1091
1028CFPlus::Layout 1092DC::Layout
1029new (SV *class) 1093new (SV *class)
1030 CODE: 1094 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1095 New (0, RETVAL, 1, struct cf_layout);
1032 1096
1033 RETVAL->pl = pango_layout_new (opengl_context); 1097 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1099 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1100 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1101 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1102 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1103 RETVAL->font = 0;
1104 RETVAL->rc = rc_alloc ();
1040 1105
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1106 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1107 layout_update_font (RETVAL);
1043 OUTPUT: 1108 OUTPUT:
1044 RETVAL 1109 RETVAL
1045 1110
1046void 1111void
1047DESTROY (CFPlus::Layout self) 1112DESTROY (DC::Layout self)
1048 CODE: 1113 CODE:
1049 g_object_unref (self->pl); 1114 g_object_unref (self->pl);
1115 rc_free (self->rc);
1050 Safefree (self); 1116 Safefree (self);
1051 1117
1052void 1118void
1053set_text (CFPlus::Layout self, SV *text_) 1119set_text (DC::Layout self, SV *text_)
1054 CODE: 1120 CODE:
1055{ 1121{
1056 STRLEN textlen; 1122 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1058 1124
1059 pango_layout_set_text (self->pl, text, textlen); 1125 pango_layout_set_text (self->pl, text, textlen);
1060} 1126}
1061 1127
1062void 1128void
1063set_markup (CFPlus::Layout self, SV *text_) 1129set_markup (DC::Layout self, SV *text_)
1064 CODE: 1130 CODE:
1065{ 1131{
1066 STRLEN textlen; 1132 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1133 char *text = SvPVutf8 (text_, textlen);
1068 1134
1069 pango_layout_set_markup (self->pl, text, textlen); 1135 pango_layout_set_markup (self->pl, text, textlen);
1070} 1136}
1071 1137
1072void 1138void
1073set_shapes (CFPlus::Layout self, ...) 1139set_shapes (DC::Layout self, ...)
1074 CODE: 1140 CODE:
1075{ 1141{
1076 PangoAttrList *attrs = 0; 1142 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1143 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1144 const char *pos = text;
1113 if (attrs) 1179 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1180 pango_layout_set_attributes (self->pl, attrs);
1115} 1181}
1116 1182
1117void 1183void
1118get_shapes (CFPlus::Layout self) 1184get_shapes (DC::Layout self)
1119 PPCODE: 1185 PPCODE:
1120{ 1186{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1187 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1188
1123 do 1189 do
1124 { 1190 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1191 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1192
1127 if (run && shape_attr_p (run)) 1193 if (run && shape_attr_p (run))
1128 { 1194 {
1129 PangoRectangle extents; 1195 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1196 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1204
1139 pango_layout_iter_free (iter); 1205 pango_layout_iter_free (iter);
1140} 1206}
1141 1207
1142int 1208int
1143has_wrapped (CFPlus::Layout self) 1209has_wrapped (DC::Layout self)
1144 CODE: 1210 CODE:
1145{ 1211{
1146 int lines = 1; 1212 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1213 const char *text = pango_layout_get_text (self->pl);
1148 1214
1153} 1219}
1154 OUTPUT: 1220 OUTPUT:
1155 RETVAL 1221 RETVAL
1156 1222
1157SV * 1223SV *
1158get_text (CFPlus::Layout self) 1224get_text (DC::Layout self)
1159 CODE: 1225 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1226 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1227 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1228 OUTPUT:
1163 RETVAL 1229 RETVAL
1164 1230
1165void 1231void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1232set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1233 CODE:
1168 self->r = r; 1234 self->r = r;
1169 self->g = g; 1235 self->g = g;
1170 self->b = b; 1236 self->b = b;
1171 self->a = a; 1237 self->a = a;
1172 1238
1173void 1239void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1240set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1241 CODE:
1176 if (self->font != font) 1242 if (self->font != font)
1177 { 1243 {
1178 self->font = font; 1244 self->font = font;
1179 layout_update_font (self); 1245 layout_update_font (self);
1180 } 1246 }
1181 1247
1182void 1248void
1183set_height (CFPlus::Layout self, int base_height) 1249set_height (DC::Layout self, int base_height)
1184 CODE: 1250 CODE:
1185 if (self->base_height != base_height) 1251 if (self->base_height != base_height)
1186 { 1252 {
1187 self->base_height = base_height; 1253 self->base_height = base_height;
1188 layout_update_font (self); 1254 layout_update_font (self);
1189 } 1255 }
1190 1256
1191void 1257void
1192set_width (CFPlus::Layout self, int max_width = -1) 1258set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1259 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1260 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1261
1196void 1262void
1197set_indent (CFPlus::Layout self, int indent) 1263set_indent (DC::Layout self, int indent)
1198 CODE: 1264 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1265 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1266
1201void 1267void
1202set_spacing (CFPlus::Layout self, int spacing) 1268set_spacing (DC::Layout self, int spacing)
1203 CODE: 1269 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1270 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1271
1206void 1272void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1273set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1274 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1275 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1276 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1277 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1278 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1279 : PANGO_ELLIPSIZE_NONE
1214 ); 1280 );
1215 1281
1216void 1282void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1283set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1284 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1285 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1286
1221void 1287void
1222size (CFPlus::Layout self) 1288size (DC::Layout self)
1223 PPCODE: 1289 PPCODE:
1224{ 1290{
1225 int w, h; 1291 int w, h;
1226 1292
1227 layout_get_pixel_size (self, &w, &h); 1293 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1296 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1297 PUSHs (sv_2mortal (newSViv (h)));
1232} 1298}
1233 1299
1234int 1300int
1235descent (CFPlus::Layout self) 1301descent (DC::Layout self)
1236 CODE: 1302 CODE:
1237{ 1303{
1238 PangoRectangle rect; 1304 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1305 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1306 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1307 RETVAL = PANGO_DESCENT (rect);
1242} 1308}
1243 OUTPUT: 1309 OUTPUT:
1244 RETVAL 1310 RETVAL
1245 1311
1246int 1312int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1313xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1314 CODE:
1249{ 1315{
1250 int index, trailing; 1316 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1317 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1318 RETVAL = index + trailing;
1253} 1319}
1254 OUTPUT: 1320 OUTPUT:
1255 RETVAL 1321 RETVAL
1256 1322
1257void 1323void
1258cursor_pos (CFPlus::Layout self, int index) 1324cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1325 PPCODE:
1260{ 1326{
1261 PangoRectangle strong_pos; 1327 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1328 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1329
1264 EXTEND (SP, 3); 1330 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1331 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1332 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1333 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1334}
1269 1335
1270void 1336void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1337index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1338 PPCODE:
1273{ 1339{
1274 int line, x; 1340 int line, x;
1275 1341
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1342 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1343#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1344 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1345 --line;
1346#endif
1279 EXTEND (SP, 2); 1347 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1348 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1349 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1350}
1283 1351
1284void 1352void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1353line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1354 PPCODE:
1287{ 1355{
1288 PangoLayoutLine *lp; 1356 PangoLayoutLine *lp;
1289 int index, trailing; 1357 int index, trailing;
1290 1358
1291 if (line < 0) 1359 if (line < 0)
1292 XSRETURN_EMPTY; 1360 XSRETURN_EMPTY;
1293 1361
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1362 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1363 XSRETURN_EMPTY; /* do better */
1296 1364
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1365 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1366
1299 EXTEND (SP, 2); 1367 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1373 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1374 }
1307} 1375}
1308 1376
1309void 1377void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1378render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1379 CODE:
1380 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1381 pango_opengl_render_layout_subpixel (
1313 self->pl, 1382 self->pl,
1383 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1384 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1385 self->r, self->g, self->b, self->a,
1316 flags 1386 flags
1317 ); 1387 );
1388 // we assume that context_change actually clears/frees stuff
1389 // and does not do any recomputation...
1390 pango_layout_context_changed (self->pl);
1318 1391
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1392void
1393draw (DC::Layout self)
1394 CODE:
1395{
1396 glEnable (GL_TEXTURE_2D);
1397 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1398 glEnable (GL_BLEND);
1399 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1400 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1401 glEnable (GL_ALPHA_TEST);
1402 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1403
1404 rc_draw (self->rc);
1405
1406 glDisable (GL_ALPHA_TEST);
1407 glDisable (GL_BLEND);
1408 glDisable (GL_TEXTURE_2D);
1409}
1410
1411MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1412
1321PROTOTYPES: ENABLE 1413PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1414
1325void 1415void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1416pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1417 CODE:
1328{ 1418{
1405 RETVAL = width > 0; 1495 RETVAL = width > 0;
1406} 1496}
1407 OUTPUT: 1497 OUTPUT:
1408 RETVAL 1498 RETVAL
1409 1499
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1500MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1501
1412PROTOTYPES: DISABLE 1502PROTOTYPES: DISABLE
1413 1503
1414CFPlus::Map 1504DC::Map
1415new (SV *class) 1505new (SV *class)
1416 CODE: 1506 CODE:
1417 New (0, RETVAL, 1, struct map); 1507 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1508 RETVAL->x = 0;
1419 RETVAL->y = 0; 1509 RETVAL->y = 0;
1427 RETVAL->row = 0; 1517 RETVAL->row = 0;
1428 OUTPUT: 1518 OUTPUT:
1429 RETVAL 1519 RETVAL
1430 1520
1431void 1521void
1432DESTROY (CFPlus::Map self) 1522DESTROY (DC::Map self)
1433 CODE: 1523 CODE:
1434{ 1524{
1435 map_clear (self); 1525 map_clear (self);
1436 Safefree (self->face2tile); 1526 Safefree (self->face2tile);
1437 Safefree (self->tex); 1527 Safefree (self->tex);
1438 Safefree (self); 1528 Safefree (self);
1439} 1529}
1440 1530
1441void 1531void
1442resize (CFPlus::Map self, int map_width, int map_height) 1532resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1533 CODE:
1444 self->w = map_width; 1534 self->w = map_width;
1445 self->h = map_height; 1535 self->h = map_height;
1446 1536
1447void 1537void
1448clear (CFPlus::Map self) 1538clear (DC::Map self)
1449 CODE: 1539 CODE:
1450 map_clear (self); 1540 map_clear (self);
1451 1541
1452void 1542void
1453set_tileid (CFPlus::Map self, int face, int tile) 1543set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1544 CODE:
1455{ 1545{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1546 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1547 need_texid (self, tile);
1458} 1548}
1459 1549
1460void 1550void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1551set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1552 CODE:
1463{ 1553{
1464 tileid texid; 1554 tileid texid;
1465 maptex *tex; 1555 maptex *tex;
1466 1556
1479 tex->smoothtile = self->face2tile [smooth]; 1569 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1570 tex->smoothlevel = level;
1481} 1571}
1482 1572
1483void 1573void
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) 1574set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485 CODE: 1575 CODE:
1486{ 1576{
1487 need_texid (self, texid); 1577 need_texid (self, texid);
1488 1578
1489 { 1579 {
1509 // from transparent color bleeding and ugly wrapping effects. 1599 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1601}
1512 1602
1513int 1603int
1514ox (CFPlus::Map self) 1604ox (DC::Map self)
1515 ALIAS: 1605 ALIAS:
1516 oy = 1 1606 oy = 1
1517 x = 2 1607 x = 2
1518 y = 3 1608 y = 3
1519 w = 4 1609 w = 4
1530 } 1620 }
1531 OUTPUT: 1621 OUTPUT:
1532 RETVAL 1622 RETVAL
1533 1623
1534void 1624void
1535scroll (CFPlus::Map self, int dx, int dy) 1625scroll (DC::Map self, int dx, int dy)
1536 CODE: 1626 CODE:
1537{ 1627{
1538 if (dx > 0) 1628 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1629 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1630 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1646 self->y += MAP_EXTEND_Y;
1557 } 1647 }
1558} 1648}
1559 1649
1560SV * 1650SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1651map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1652 CODE:
1563{ 1653{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1655 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1656 mapcell *cell;
1655} 1745}
1656 OUTPUT: 1746 OUTPUT:
1657 RETVAL 1747 RETVAL
1658 1748
1659SV * 1749SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1750mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 1751 CODE:
1662{ 1752{
1663 int x1, x; 1753 int x1, x;
1664 int y1, y; 1754 int y1, y;
1665 int z; 1755 int z;
1710} 1800}
1711 OUTPUT: 1801 OUTPUT:
1712 RETVAL 1802 RETVAL
1713 1803
1714void 1804void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1805draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1716 CODE: 1806 CODE:
1717{ 1807{
1808 int x, y, z;
1809
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 1813 smooth_key skey;
1722 int x, y, z; 1814
1723 int last_name; 1815 rc_t *rc = rc_alloc ();
1816 rc_key_t key;
1817 rc_array_t *arr;
1724 1818
1725 // thats current max. sorry. 1819 // thats current max. sorry.
1726 if (sw > 255) sw = 255; 1820 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 1821 if (sh > 255) sh = 255;
1728 1822
1729 // clear key, in case of extra padding 1823 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 1824 memset (&skey, 0, sizeof (skey));
1731 1825
1732 glColor4ub (255, 255, 255, 255); 1826 memset (&key, 0, sizeof (key));
1733 1827 key.r = 255;
1734 glEnable (GL_BLEND); 1828 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1829 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 1830 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1831 key.mode = GL_QUADS;
1738 1832 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1; 1833 key.texname = -1;
1742 1834
1743 mx += self->x; 1835 mx += self->x;
1744 my += self->y; 1836 my += self->y;
1745 1837
1746 // first pass: determine smooth_max 1838 // first pass: determine smooth_max
1762 MAX (self->tex [cell->tile [0]].smoothlevel, 1854 MAX (self->tex [cell->tile [0]].smoothlevel,
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 1855 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 1856 self->tex [cell->tile [2]].smoothlevel));
1765 } 1857 }
1766 } 1858 }
1859
1860 glEnable (GL_BLEND);
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767 1863
1768 for (z = 0; z <= 2; z++) 1864 for (z = 0; z <= 2; z++)
1769 { 1865 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 1866 memset (smooth_level, 0, sizeof (smooth_level));
1771 1867
1783 if (tile) 1879 if (tile)
1784 { 1880 {
1785 maptex tex = self->tex [tile]; 1881 maptex tex = self->tex [tile];
1786 int px, py; 1882 int px, py;
1787 1883
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 1884 if (key.texname != tex.name)
1791 { 1885 {
1792 if (!tex.name) 1886 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 1887 tex = self->tex [2]; /* missing, replace by noface */
1794 1888
1795 glEnd (); 1889 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1890 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 1891 }
1799 1892
1800 px = (x + 1) * T - tex.w; 1893 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h; 1894 py = (y + 1) * T - tex.h;
1802 1895
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1897 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); 1898 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 ); 1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1807 1900
1808 if (cell->flags && z == 2) 1901 if (cell->flags && z == 2)
1809 { 1902 {
1903 // overlays such as the speech bubble, probably more to come
1810 if (cell->flags & 1) 1904 if (cell->flags & 1)
1811 { 1905 {
1812 maptex tex = self->tex [1]; 1906 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32; 1907 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32; 1908 int py = y * T - T * 6 / 32;
1815 1909
1910 if (tex.name)
1816 glEnd (); 1911 {
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818 glBegin (GL_QUADS); 1922 }
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 } 1923 }
1825 } 1924 }
1826 1925
1827 // update smooth hash 1926 // update smooth hash
1828 if (tex.smoothtile) 1927 if (tex.smoothtile)
1864 } 1963 }
1865 } 1964 }
1866 } 1965 }
1867 } 1966 }
1868 1967
1968 rc_draw (rc);
1969 rc_clear (rc);
1970
1869 // go through all smoothlevels, lowest to highest, then draw. 1971 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 1972 // this is basically counting sort
1871 { 1973 {
1872 int w, b; 1974 int w, b;
1873 1975
1976 glEnable (GL_TEXTURE_2D);
1977 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 1978 for (w = 0; w < 256 / 32; ++w)
1875 { 1979 {
1876 uint32_t smask = smooth_level [w]; 1980 uint32_t smask = smooth_level [w];
1877 if (smask) 1981 if (smask)
1878 for (b = 0; b < 32; ++b) 1982 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2001 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2002 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2003 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2004 float dy = tex.t * .5f ; // 2 images/column
1901 2005
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2006 if (tex.name)
1905 { 2007 {
2008 // this time avoiding texture state changes
2009 // save gobs of state changes.
1906 if (!tex.name) 2010 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2011 {
1908
1909 glEnd (); 2012 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2014 glBegin (GL_QUADS);
1912 } 2015 }
1913 2016
1914 if (border) 2017 if (border)
1915 { 2018 {
1916 float ox = border * dx; 2019 float ox = border * dx;
1917 2020
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2025 }
1923 2026
1924 if (corner) 2027 if (corner)
1925 { 2028 {
1926 float ox = corner * dx; 2029 float ox = corner * dx;
1927 2030
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2031 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2035 }
1932 } 2036 }
1933 } 2037 }
1934 } 2038 }
1935 } 2039 }
1936 } 2040 }
2041
2042 glEnd ();
2043 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1;
1937 } 2045 }
1938 2046
1939 hv_clear (smooth); 2047 hv_clear (smooth);
1940 } 2048 }
1941 2049
1942 glEnd ();
1943
1944 glDisable (GL_TEXTURE_2D);
1945 glDisable (GL_BLEND); 2050 glDisable (GL_BLEND);
2051 rc_free (rc);
1946 2052
1947 // top layer: overlays such as the health bar 2053 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2054 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2055 if (0 <= y + my && y + my < self->rows)
1950 { 2056 {
1975 } 2081 }
1976 } 2082 }
1977} 2083}
1978 2084
1979void 2085void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2087 CODE:
1982{ 2088{
1983 static float color[16][3] = { 2089 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2090 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2091 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2141 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2142 glDisable (GL_TEXTURE_2D);
2037} 2143}
2038 2144
2039void 2145void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2146fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2147 PPCODE:
2042{ 2148{
2043 int x, y; 2149 int x, y;
2044 int sw1 = sw + 2; 2150 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2151 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2222 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2223 PUSHs (darkness3_sv);
2118} 2224}
2119 2225
2120SV * 2226SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2227get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2228 CODE:
2123{ 2229{
2124 int x, y, x1, y1; 2230 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2231 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2232 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2191} 2297}
2192 OUTPUT: 2298 OUTPUT:
2193 RETVAL 2299 RETVAL
2194 2300
2195void 2301void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2302set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2197 PPCODE: 2303 PPCODE:
2198{ 2304{
2199 int x, y, z; 2305 int x, y, z;
2200 int w, h; 2306 int w, h;
2201 int x1, y1; 2307 int x1, y1;
2202 2308
2203 if (*data++ != 0) 2309 if (*data++ != 0)
2204 return; /* version mismatch */ 2310 XSRETURN_EMPTY; /* version mismatch */
2205 2311
2206 w = *data++ << 8; w |= *data++; 2312 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2313 h = *data++ << 8; h |= *data++;
2208 2314
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2315 // we need to do this 'cause we don't keep an absolute coord system for rows
2254 } 2360 }
2255 } 2361 }
2256 } 2362 }
2257} 2363}
2258 2364
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2365MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2366
2261CFPlus::RW 2367DC::RW
2262new (SV *class, SV *data_sv) 2368new (SV *class, SV *data_sv)
2263 CODE: 2369 CODE:
2264{ 2370{
2265 STRLEN datalen; 2371 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2372 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2374 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2375}
2270 OUTPUT: 2376 OUTPUT:
2271 RETVAL 2377 RETVAL
2272 2378
2273CFPlus::RW 2379DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2380new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2381 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2382 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2383 OUTPUT:
2278 RETVAL 2384 RETVAL
2279 2385
2280# fails on win32: 2386# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2387# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2388#void
2283#close (CFPlus::RW self) 2389#close (DC::RW self)
2284# CODE: 2390# CODE:
2285# (self->(close)) (self); 2391# (self->(close)) (self);
2286 2392
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2393MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2394
2289PROTOTYPES: DISABLE 2395PROTOTYPES: DISABLE
2290 2396
2291CFPlus::Channel 2397DC::Channel
2292find () 2398find ()
2293 CODE: 2399 CODE:
2294{ 2400{
2295 RETVAL = Mix_GroupAvailable (-1); 2401 RETVAL = Mix_GroupAvailable (-1);
2296 2402
2309} 2415}
2310 OUTPUT: 2416 OUTPUT:
2311 RETVAL 2417 RETVAL
2312 2418
2313void 2419void
2314halt (CFPlus::Channel self) 2420halt (DC::Channel self)
2315 CODE: 2421 CODE:
2316 Mix_HaltChannel (self); 2422 Mix_HaltChannel (self);
2317 2423
2318void 2424void
2319expire (CFPlus::Channel self, int ticks = -1) 2425expire (DC::Channel self, int ticks = -1)
2320 CODE: 2426 CODE:
2321 Mix_ExpireChannel (self, ticks); 2427 Mix_ExpireChannel (self, ticks);
2322 2428
2323void 2429void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2430fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2431 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2432 Mix_FadeOutChannel (self, ticks);
2327 2433
2328int 2434int
2329volume (CFPlus::Channel self, int volume) 2435volume (DC::Channel self, int volume)
2330 CODE: 2436 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2437 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2438 OUTPUT:
2333 RETVAL 2439 RETVAL
2334 2440
2335void 2441void
2336unregister_all_effects (CFPlus::Channel self) 2442unregister_all_effects (DC::Channel self)
2337 CODE: 2443 CODE:
2338 Mix_UnregisterAllEffects (self); 2444 Mix_UnregisterAllEffects (self);
2339 2445
2340void 2446void
2341set_panning (CFPlus::Channel self, int left, int right) 2447set_panning (DC::Channel self, int left, int right)
2342 CODE: 2448 CODE:
2343 left = CLAMP (left , 0, 255); 2449 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2450 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2451 Mix_SetPanning (self, left, right);
2346 2452
2347void 2453void
2348set_distance (CFPlus::Channel self, int distance) 2454set_distance (DC::Channel self, int distance)
2349 CODE: 2455 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2456 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2457
2352void 2458void
2353set_position (CFPlus::Channel self, int angle, int distance) 2459set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2460 CODE:
2355 2461
2356void 2462void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2464 CODE:
2359{ 2465{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2469}
2364 2470
2365void 2471void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2472set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2473 CODE:
2368 Mix_SetReverseStereo (self, flip); 2474 Mix_SetReverseStereo (self, flip);
2369 2475
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2477
2372PROTOTYPES: DISABLE 2478PROTOTYPES: DISABLE
2373 2479
2374CFPlus::MixChunk 2480DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2481new (SV *class, DC::RW rwops)
2376 CODE: 2482 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2483 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2484 OUTPUT:
2379 RETVAL 2485 RETVAL
2380 2486
2381void 2487void
2382DESTROY (CFPlus::MixChunk self) 2488DESTROY (DC::MixChunk self)
2383 CODE: 2489 CODE:
2384 Mix_FreeChunk (self); 2490 Mix_FreeChunk (self);
2385 2491
2386int 2492int
2387volume (CFPlus::MixChunk self, int volume = -1) 2493volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2494 CODE:
2389 if (items > 1) 2495 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2496 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2497 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2498 OUTPUT:
2393 RETVAL 2499 RETVAL
2394 2500
2395CFPlus::Channel 2501DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2502play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2503 CODE:
2398{ 2504{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2506
2401 if (RETVAL < 0) 2507 if (RETVAL < 0)
2408 } 2514 }
2409} 2515}
2410 OUTPUT: 2516 OUTPUT:
2411 RETVAL 2517 RETVAL
2412 2518
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414 2520
2415int 2521int
2416volume (int volume = -1) 2522volume (int volume = -1)
2417 PROTOTYPE: ;$ 2523 PROTOTYPE: ;$
2418 CODE: 2524 CODE:
2430void 2536void
2431halt () 2537halt ()
2432 CODE: 2538 CODE:
2433 Mix_HaltMusic (); 2539 Mix_HaltMusic ();
2434 2540
2435CFPlus::MixMusic 2541DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2542new (SV *class, DC::RW rwops)
2437 CODE: 2543 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2544 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2545 OUTPUT:
2440 RETVAL 2546 RETVAL
2441 2547
2442void 2548void
2443DESTROY (CFPlus::MixMusic self) 2549DESTROY (DC::MixMusic self)
2444 CODE: 2550 CODE:
2445 Mix_FreeMusic (self); 2551 Mix_FreeMusic (self);
2446 2552
2447int 2553int
2448play (CFPlus::MixMusic self, int loops = -1) 2554play (DC::MixMusic self, int loops = -1)
2449 CODE: 2555 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2556 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2557 OUTPUT:
2452 RETVAL 2558 RETVAL
2453 2559
2454void 2560void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2561fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2562 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2563 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2564
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2565MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2566
2461PROTOTYPES: ENABLE 2567PROTOTYPES: ENABLE
2462 2568
2463BOOT: 2569BOOT:
2464{ 2570{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2571 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2572 static const struct {
2467 const char *name; 2573 const char *name;
2468 IV iv; 2574 IV iv;
2469 } *civ, const_iv[] = { 2575 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2576# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2611 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2612 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2613 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2614 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2615 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2616 const_iv (GL_COMPRESSED_ALPHA_ARB),
2617 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2618 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2619 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2620 const_iv (GL_COMPRESSED_RGB_ARB),
2621 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2622 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2623 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2624 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2625 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2626 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2665 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2666 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2667 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2668 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2669 const_iv (GL_GENERATE_MIPMAP_HINT),
2670 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2671 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2672 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2673 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2674 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2675 const_iv (GL_V3F),
2570 2683
2571 texture_av = newAV (); 2684 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2685 AvREAL_off (texture_av);
2573} 2686}
2574 2687
2688void
2689disable_GL_EXT_blend_func_separate ()
2690 CODE:
2691 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0;
2693
2575char * 2694char *
2576gl_vendor () 2695gl_vendor ()
2577 CODE: 2696 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2697 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2698 OUTPUT:
2700 2819
2701void glRect (float x1, float y1, float x2, float y2) 2820void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2821 CODE:
2703 glRectf (x1, y1, x2, y2); 2822 glRectf (x1, y1, x2, y2);
2704 2823
2824void glRect_lineloop (float x1, float y1, float x2, float y2)
2825 CODE:
2826 glBegin (GL_LINE_LOOP);
2827 glVertex2f (x1, y1);
2828 glVertex2f (x2, y1);
2829 glVertex2f (x2, y2);
2830 glVertex2f (x1, y2);
2831 glEnd ();
2832
2705PROTOTYPES: ENABLE 2833PROTOTYPES: ENABLE
2706 2834
2707void glBegin (int mode) 2835void glBegin (int mode)
2708 2836
2709void glEnd () 2837void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2869void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 2870 CODE:
2743 if (gl.SeparableFilter2D) 2871 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2872 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 2873
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2874void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 2875
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2876void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 2877
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 2878void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 2879
2777 2905
2778void glEndList () 2906void glEndList ()
2779 2907
2780void glCallList (int list) 2908void glCallList (int list)
2781 2909
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 2911
2784PROTOTYPES: DISABLE 2912PROTOTYPES: DISABLE
2785 2913
2786void 2914void
2787find_widget (SV *self, NV x, NV y) 2915find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 2919 XPUSHs (self);
2792} 2920}
2793 2921
2794BOOT: 2922BOOT:
2795{ 2923{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2924 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 2925
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2926 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2927 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2928 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2929 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 2930}
2803 2931
2804void 2932void
2805draw (SV *self) 2933draw (SV *self)
2806 CODE: 2934 CODE:
2810 NV x, y, w, h; 2938 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 2939 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 2940 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 2941 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 2942 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 2943 double draw_x, draw_y;
2817 2944
2818 if (!SvROK (self)) 2945 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2946 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 2947
2821 hv = (HV *)SvRV (self); 2948 hv = (HV *)SvRV (self);
2822 2949
2823 if (SvTYPE (hv) != SVt_PVHV) 2950 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2951 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 2952
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2953 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2954 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 2955
2829 if (!h || !w) 2956 if (!h || !w)
2849 { 2976 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2977 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 2978
2852 if (svp && SvTRUE (*svp)) 2979 if (svp && SvTRUE (*svp))
2853 { 2980 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2981 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 2982 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2983 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 2984 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 2985 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 2986 glVertex2f (w, 0);
2862 glEnd (); 2989 glEnd ();
2863 glDisable (GL_BLEND); 2990 glDisable (GL_BLEND);
2864 } 2991 }
2865 } 2992 }
2866#if 0 2993#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 2994 // draw borders, for debugging
2868 glPushMatrix; 2995 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 2996 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 2997 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 2998 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 2999 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3000 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3001 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3002 glVertex2f (0 , h - 1);
2876 glEnd; 3003 glEnd ();
2877 glPopMatrix; 3004 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3005#endif
2881 PUSHMARK (SP); 3006 PUSHMARK (SP);
2882 XPUSHs (self); 3007 XPUSHs (self);
2883 PUTBACK; 3008 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3009 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines