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.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.255 by root, Sun Jan 6 18:25:59 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines