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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.252 by root, Fri Dec 28 17:30:33 2007 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
38#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
39 46
40#include <glib/gmacros.h> 47#include <glib/gmacros.h>
41 48
42#include <pango/pango.h> 49#include <pango/pango.h>
50
51#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
56#endif
43 57
44#ifndef _WIN32 58#ifndef _WIN32
45# include <sys/types.h> 59# include <sys/types.h>
46# include <sys/socket.h> 60# include <sys/socket.h>
47# include <netinet/in.h> 61# include <netinet/in.h>
107 av_push (texture_av, (SV *)(size_t)name); 121 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 122 glDeleteTextures (1, &name);
109} 123}
110 124
111#include "texcache.c" 125#include "texcache.c"
126#include "rendercache.c"
112 127
113#include "pango-font.c" 128#include "pango-font.c"
114#include "pango-fontmap.c" 129#include "pango-fontmap.c"
115#include "pango-render.c" 130#include "pango-render.c"
116 131
132typedef IV DC__Channel;
133typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 134typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 135typedef Mix_Music *DC__MixMusic;
119 136
120typedef PangoFontDescription *CFPlus__Font; 137typedef PangoFontDescription *DC__Font;
121 138
122static int 139static int
123shape_attr_p (PangoLayoutRun *run) 140shape_attr_p (PangoLayoutRun *run)
124{ 141{
125 GSList *attrs = run->item->analysis.extra_attrs; 142 GSList *attrs = run->item->analysis.extra_attrs;
139 156
140typedef struct cf_layout { 157typedef struct cf_layout {
141 PangoLayout *pl; 158 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 159 float r, g, b, a; // default color for rgba mode
143 int base_height; 160 int base_height;
144 CFPlus__Font font; 161 DC__Font font;
162 rc_t *rc;
145} *CFPlus__Layout; 163} *DC__Layout;
146 164
147static CFPlus__Font default_font; 165static DC__Font default_font;
148static PangoContext *opengl_context; 166static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 167static PangoFontMap *opengl_fontmap;
150 168
151static void 169static void
152substitute_func (FcPattern *pattern, gpointer data) 170substitute_func (FcPattern *pattern, gpointer data)
157#endif 175#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 176 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 177}
160 178
161static void 179static void
162layout_update_font (CFPlus__Layout self) 180layout_update_font (DC__Layout self)
163{ 181{
164 /* use a random scale factor to account for unknown descenders, 0.8 works 182 /* use a random scale factor to account for unknown descenders, 0.8 works
165 * reasonably well with bitstream vera 183 * reasonably well with bitstream vera
166 */ 184 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 185 PangoFontDescription *font = self->font ? self->font : default_font;
171 189
172 pango_layout_set_font_description (self->pl, font); 190 pango_layout_set_font_description (self->pl, font);
173} 191}
174 192
175static void 193static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 194layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 195{
178 PangoRectangle rect; 196 PangoRectangle rect;
179 197
180 // get_pixel_* wrongly rounds down 198 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 199 pango_layout_get_extents (self->pl, 0, &rect);
192 210
193typedef uint16_t tileid; 211typedef uint16_t tileid;
194typedef uint16_t faceid; 212typedef uint16_t faceid;
195 213
196typedef struct { 214typedef struct {
197 int name; 215 GLuint name;
198 int w, h; 216 int w, h;
199 float s, t; 217 float s, t;
200 uint8_t r, g, b, a; 218 uint8_t r, g, b, a;
201 tileid smoothtile; 219 tileid smoothtile;
202 uint8_t smoothlevel; 220 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 238 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 239 int texs; maptex *tex; // [tileid]
222 240
223 int32_t rows; 241 int32_t rows;
224 maprow *row; 242 maprow *row;
225} *CFPlus__Map; 243} *DC__Map;
226 244
227static char * 245static char *
228prepend (char *ptr, int sze, int inc) 246prepend (char *ptr, int sze, int inc)
229{ 247{
230 char *p; 248 char *p;
268 self->texs *= 2; 286 self->texs *= 2;
269 } 287 }
270} 288}
271 289
272static maprow * 290static maprow *
273map_get_row (CFPlus__Map self, int y) 291map_get_row (DC__Map self, int y)
274{ 292{
275 if (0 > y) 293 if (0 > y)
276 { 294 {
277 int extend = - y + MAP_EXTEND_Y; 295 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 296 Prepend (maprow, self->row, self->rows, extend);
316 334
317 return row->col + (x - row->c0); 335 return row->col + (x - row->c0);
318} 336}
319 337
320static mapcell * 338static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 339map_get_cell (DC__Map self, int x, int y)
322{ 340{
323 return row_get_cell (map_get_row (self, y), x); 341 return row_get_cell (map_get_row (self, y), x);
324} 342}
325 343
326static void 344static void
327map_clear (CFPlus__Map self) 345map_clear (DC__Map self)
328{ 346{
329 int r; 347 int r;
330 348
331 for (r = 0; r < self->rows; r++) 349 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 350 Safefree (self->row[r].col);
340 self->row = 0; 358 self->row = 0;
341 self->rows = 0; 359 self->rows = 0;
342} 360}
343 361
344static void 362static void
345map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 363map_blank (DC__Map self, int x0, int y0, int w, int h)
346{ 364{
347 int x, y; 365 int x, y;
348 maprow *row; 366 maprow *row;
349 mapcell *cell; 367 mapcell *cell;
350 368
429 n |= n >> 16; 447 n |= n >> 16;
430 448
431 return n + 1; 449 return n + 1;
432} 450}
433 451
452static unsigned int
453popcount (unsigned int n)
454{
455 n -= (n >> 1) & 0x55555555U;
456 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
457 n = ((n >> 4) + n) & 0x0f0f0f0fU;
458 n *= 0x01010101U;
459
460 return n >> 24;
461}
462
434/* SDL should provide this, really. */ 463/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 464#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 465#define SDLK_MODIFIER_MAX 314
437 466
438/******************************************************************************/ 467/******************************************************************************/
476 return 0; 505 return 0;
477 506
478 return 1; 507 return 1;
479} 508}
480 509
481MODULE = CFPlus PACKAGE = CFPlus 510MODULE = Deliantra::Client PACKAGE = DC
482 511
483PROTOTYPES: ENABLE 512PROTOTYPES: ENABLE
484 513
485BOOT: 514BOOT:
486{ 515{
487 HV *stash = gv_stashpv ("CFPlus", 1); 516 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 517 static const struct {
489 const char *name; 518 const char *name;
490 IV iv; 519 IV iv;
491 } *civ, const_iv[] = { 520 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 521# define const_iv(name) { # name, (IV)name }
514 543
515 const_iv (SDL_APPINPUTFOCUS), 544 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 545 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 546 const_iv (SDL_APPACTIVE),
518 547
548 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 550 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 551 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 552 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 553 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 554 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 626 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 627 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 628 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 629 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 630 const_iv (KMOD_MODE),
631
632 const_iv (MIX_DEFAULT_FORMAT),
600# undef const_iv 633# undef const_iv
601 }; 634 };
602 635
603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 655
623NV floor (NV x) 656NV floor (NV x)
624 657
625NV ceil (NV x) 658NV ceil (NV x)
626 659
660IV minpot (UV n)
661
662IV popcount (UV n)
663
627void 664void
628pango_init () 665pango_init ()
629 CODE: 666 CODE:
630{ 667{
631 opengl_fontmap = pango_opengl_font_map_new (); 668 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif
634} 675}
635 676
636char * 677char *
637SDL_GetError () 678SDL_GetError ()
638 679
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 712
672 if (m && m != (SDL_Rect **)-1) 713 if (m && m != (SDL_Rect **)-1)
673 while (*m) 714 while (*m)
674 { 715 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 716 if ((*m)->w >= 800 && (*m)->h >= 480)
676 { 717 {
677 AV *av = newAV (); 718 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 719 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 720 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 721 av_push (av, newSViv (rgb));
704 745
705 if (RETVAL) 746 if (RETVAL)
706 { 747 {
707 av_clear (texture_av); 748 av_clear (texture_av);
708 749
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 751#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 752#include "glfunc.h"
712#undef GL_FUNC 753#undef GL_FUNC
713 } 754 }
714} 755}
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 836 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 837 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 838 break;
798 } 839 }
799 840
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 841 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 842 }
802} 843}
803 844
804int 845int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 847 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 848 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 849 Mix_ChannelFinished (channel_finished);
809 850
810void 851void
852Mix_QuerySpec ()
853 PPCODE:
854{
855 int freq, channels;
856 Uint16 format;
857
858 if (Mix_QuerySpec (&freq, &format, &channels))
859 {
860 EXTEND (SP, 3);
861 PUSHs (sv_2mortal (newSViv (freq)));
862 PUSHs (sv_2mortal (newSViv (format)));
863 PUSHs (sv_2mortal (newSViv (channels)));
864 }
865}
866
867void
811Mix_CloseAudio () 868Mix_CloseAudio ()
812 869
813int 870int
814Mix_AllocateChannels (int numchans = -1) 871Mix_AllocateChannels (int numchans = -1)
872
873const char *
874Mix_GetError ()
815 875
816void 876void
817lowdelay (int fd, int val = 1) 877lowdelay (int fd, int val = 1)
818 CODE: 878 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 879 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
861 STRLEN image_len; 921 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 922 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 923 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 924 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 925 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 926 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 927 : SDL_RWFromConstMem (image, image_len);
868 928
869 if (!rw) 929 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 930 croak ("load_image: %s", SDL_GetError ());
871 931
944void 1004void
945error (char *message) 1005error (char *message)
946 CODE: 1006 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1007 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1008#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1009 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1010#endif
951 1011
952void 1012void
953fatal (char *message) 1013fatal (char *message)
954 CODE: 1014 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1015 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1016#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1017 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1018#endif
959 _exit (1); 1019 _exit (1);
960 1020
961void 1021void
962_exit (int retval = 0) 1022_exit (int retval = 0)
974#if DEBUG 1034#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1035 VALGRIND_DO_LEAK_CHECK;
976#endif 1036#endif
977} 1037}
978 1038
979MODULE = CFPlus PACKAGE = CFPlus::Font 1039MODULE = Deliantra::Client PACKAGE = DC::Font
980 1040
981PROTOTYPES: DISABLE 1041PROTOTYPES: DISABLE
982 1042
983CFPlus::Font 1043DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1044new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1045 CODE:
986{ 1046{
987 int count; 1047 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1051}
992 OUTPUT: 1052 OUTPUT:
993 RETVAL 1053 RETVAL
994 1054
995void 1055void
996DESTROY (CFPlus::Font self) 1056DESTROY (DC::Font self)
997 CODE: 1057 CODE:
998 pango_font_description_free (self); 1058 pango_font_description_free (self);
999 1059
1000void 1060void
1001make_default (CFPlus::Font self) 1061make_default (DC::Font self)
1002 PROTOTYPE: $ 1062 PROTOTYPE: $
1003 CODE: 1063 CODE:
1004 default_font = self; 1064 default_font = self;
1005 1065
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1066MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1067
1008PROTOTYPES: DISABLE 1068PROTOTYPES: DISABLE
1009 1069
1010void 1070void
1011reset_glyph_cache () 1071glyph_cache_backup ()
1012 PROTOTYPE: 1072 PROTOTYPE:
1013 CODE: 1073 CODE:
1074 tc_backup ();
1075
1076void
1077glyph_cache_restore ()
1078 PROTOTYPE:
1079 CODE:
1014 tc_clear (); 1080 tc_restore ();
1015 1081
1016CFPlus::Layout 1082DC::Layout
1017new (SV *class) 1083new (SV *class)
1018 CODE: 1084 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1085 New (0, RETVAL, 1, struct cf_layout);
1020 1086
1021 RETVAL->pl = pango_layout_new (opengl_context); 1087 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1089 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1090 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1091 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1092 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1093 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1028 1095
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1097 layout_update_font (RETVAL);
1031 OUTPUT: 1098 OUTPUT:
1032 RETVAL 1099 RETVAL
1033 1100
1034void 1101void
1035DESTROY (CFPlus::Layout self) 1102DESTROY (DC::Layout self)
1036 CODE: 1103 CODE:
1037 g_object_unref (self->pl); 1104 g_object_unref (self->pl);
1105 rc_free (self->rc);
1038 Safefree (self); 1106 Safefree (self);
1039 1107
1040void 1108void
1041set_text (CFPlus::Layout self, SV *text_) 1109set_text (DC::Layout self, SV *text_)
1042 CODE: 1110 CODE:
1043{ 1111{
1044 STRLEN textlen; 1112 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1113 char *text = SvPVutf8 (text_, textlen);
1046 1114
1047 pango_layout_set_text (self->pl, text, textlen); 1115 pango_layout_set_text (self->pl, text, textlen);
1048} 1116}
1049 1117
1050void 1118void
1051set_markup (CFPlus::Layout self, SV *text_) 1119set_markup (DC::Layout self, SV *text_)
1052 CODE: 1120 CODE:
1053{ 1121{
1054 STRLEN textlen; 1122 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1056 1124
1057 pango_layout_set_markup (self->pl, text, textlen); 1125 pango_layout_set_markup (self->pl, text, textlen);
1058} 1126}
1059 1127
1060void 1128void
1061set_shapes (CFPlus::Layout self, ...) 1129set_shapes (DC::Layout self, ...)
1062 CODE: 1130 CODE:
1063{ 1131{
1064 PangoAttrList *attrs = 0; 1132 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1133 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1134 const char *pos = text;
1101 if (attrs) 1169 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1170 pango_layout_set_attributes (self->pl, attrs);
1103} 1171}
1104 1172
1105void 1173void
1106get_shapes (CFPlus::Layout self) 1174get_shapes (DC::Layout self)
1107 PPCODE: 1175 PPCODE:
1108{ 1176{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1177 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1178
1111 do 1179 do
1112 { 1180 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1181 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1182
1115 if (run && shape_attr_p (run)) 1183 if (run && shape_attr_p (run))
1116 { 1184 {
1117 PangoRectangle extents; 1185 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1186 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1194
1127 pango_layout_iter_free (iter); 1195 pango_layout_iter_free (iter);
1128} 1196}
1129 1197
1130int 1198int
1131has_wrapped (CFPlus::Layout self) 1199has_wrapped (DC::Layout self)
1132 CODE: 1200 CODE:
1133{ 1201{
1134 int lines = 1; 1202 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1203 const char *text = pango_layout_get_text (self->pl);
1136 1204
1141} 1209}
1142 OUTPUT: 1210 OUTPUT:
1143 RETVAL 1211 RETVAL
1144 1212
1145SV * 1213SV *
1146get_text (CFPlus::Layout self) 1214get_text (DC::Layout self)
1147 CODE: 1215 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1216 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1217 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1218 OUTPUT:
1151 RETVAL 1219 RETVAL
1152 1220
1153void 1221void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1222set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1223 CODE:
1156 self->r = r; 1224 self->r = r;
1157 self->g = g; 1225 self->g = g;
1158 self->b = b; 1226 self->b = b;
1159 self->a = a; 1227 self->a = a;
1160 1228
1161void 1229void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1230set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1231 CODE:
1164 if (self->font != font) 1232 if (self->font != font)
1165 { 1233 {
1166 self->font = font; 1234 self->font = font;
1167 layout_update_font (self); 1235 layout_update_font (self);
1168 } 1236 }
1169 1237
1170void 1238void
1171set_height (CFPlus::Layout self, int base_height) 1239set_height (DC::Layout self, int base_height)
1172 CODE: 1240 CODE:
1173 if (self->base_height != base_height) 1241 if (self->base_height != base_height)
1174 { 1242 {
1175 self->base_height = base_height; 1243 self->base_height = base_height;
1176 layout_update_font (self); 1244 layout_update_font (self);
1177 } 1245 }
1178 1246
1179void 1247void
1180set_width (CFPlus::Layout self, int max_width = -1) 1248set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1249 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1250 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1251
1184void 1252void
1185set_indent (CFPlus::Layout self, int indent) 1253set_indent (DC::Layout self, int indent)
1186 CODE: 1254 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1255 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1256
1189void 1257void
1190set_spacing (CFPlus::Layout self, int spacing) 1258set_spacing (DC::Layout self, int spacing)
1191 CODE: 1259 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1260 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1261
1194void 1262void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1263set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1264 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1265 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1266 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1267 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1268 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1269 : PANGO_ELLIPSIZE_NONE
1202 ); 1270 );
1203 1271
1204void 1272void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1273set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1274 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1275 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1276
1209void 1277void
1210size (CFPlus::Layout self) 1278size (DC::Layout self)
1211 PPCODE: 1279 PPCODE:
1212{ 1280{
1213 int w, h; 1281 int w, h;
1214 1282
1215 layout_get_pixel_size (self, &w, &h); 1283 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1286 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1287 PUSHs (sv_2mortal (newSViv (h)));
1220} 1288}
1221 1289
1222int 1290int
1223descent (CFPlus::Layout self) 1291descent (DC::Layout self)
1224 CODE: 1292 CODE:
1225{ 1293{
1226 PangoRectangle rect; 1294 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1295 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1296 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1297 RETVAL = PANGO_DESCENT (rect);
1230} 1298}
1231 OUTPUT: 1299 OUTPUT:
1232 RETVAL 1300 RETVAL
1233 1301
1234int 1302int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1303xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1304 CODE:
1237{ 1305{
1238 int index, trailing; 1306 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1307 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1308 RETVAL = index + trailing;
1241} 1309}
1242 OUTPUT: 1310 OUTPUT:
1243 RETVAL 1311 RETVAL
1244 1312
1245void 1313void
1246cursor_pos (CFPlus::Layout self, int index) 1314cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1315 PPCODE:
1248{ 1316{
1249 PangoRectangle strong_pos; 1317 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1318 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1319
1252 EXTEND (SP, 3); 1320 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1324}
1257 1325
1258void 1326void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1327index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1328 PPCODE:
1261{ 1329{
1262 int line, x; 1330 int line, x;
1263 1331
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1335 --line;
1336#endif
1267 EXTEND (SP, 2); 1337 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1338 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1339 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1340}
1271 1341
1272void 1342void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1343line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1344 PPCODE:
1275{ 1345{
1276 PangoLayoutLine *lp; 1346 PangoLayoutLine *lp;
1277 int index, trailing; 1347 int index, trailing;
1278 1348
1279 if (line < 0) 1349 if (line < 0)
1280 XSRETURN_EMPTY; 1350 XSRETURN_EMPTY;
1281 1351
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1352 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1353 XSRETURN_EMPTY; /* do better */
1284 1354
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1355 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1356
1287 EXTEND (SP, 2); 1357 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1363 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1364 }
1295} 1365}
1296 1366
1297void 1367void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1368render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1369 CODE:
1370 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1371 pango_opengl_render_layout_subpixel (
1301 self->pl, 1372 self->pl,
1373 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1374 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1375 self->r, self->g, self->b, self->a,
1304 flags 1376 flags
1305 ); 1377 );
1378 // we assume that context_change actually clears/frees stuff
1379 // and does not do any recomputation...
1380 pango_layout_context_changed (self->pl);
1306 1381
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1382void
1383draw (DC::Layout self)
1384 CODE:
1385{
1386 glEnable (GL_TEXTURE_2D);
1387 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1388 glEnable (GL_BLEND);
1389 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1390 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1391 glEnable (GL_ALPHA_TEST);
1392 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1393
1394 rc_draw (self->rc);
1395
1396 glDisable (GL_ALPHA_TEST);
1397 glDisable (GL_BLEND);
1398 glDisable (GL_TEXTURE_2D);
1399}
1400
1401MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1402
1309PROTOTYPES: ENABLE 1403PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1404
1313void 1405void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1406pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1407 CODE:
1316{ 1408{
1343 HV *hv = (HV *)SvRV (self); 1435 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1436 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1437 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1438 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1439
1440 if (name <= 0)
1441 XSRETURN_EMPTY;
1442
1348 if (items < 5) 1443 if (items < 5)
1349 { 1444 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1445 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1446 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1447 }
1390 RETVAL = width > 0; 1485 RETVAL = width > 0;
1391} 1486}
1392 OUTPUT: 1487 OUTPUT:
1393 RETVAL 1488 RETVAL
1394 1489
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1490MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1491
1397PROTOTYPES: DISABLE 1492PROTOTYPES: DISABLE
1398 1493
1399CFPlus::Map 1494DC::Map
1400new (SV *class) 1495new (SV *class)
1401 CODE: 1496 CODE:
1402 New (0, RETVAL, 1, struct map); 1497 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1498 RETVAL->x = 0;
1404 RETVAL->y = 0; 1499 RETVAL->y = 0;
1412 RETVAL->row = 0; 1507 RETVAL->row = 0;
1413 OUTPUT: 1508 OUTPUT:
1414 RETVAL 1509 RETVAL
1415 1510
1416void 1511void
1417DESTROY (CFPlus::Map self) 1512DESTROY (DC::Map self)
1418 CODE: 1513 CODE:
1419{ 1514{
1420 map_clear (self); 1515 map_clear (self);
1421 Safefree (self->face2tile); 1516 Safefree (self->face2tile);
1422 Safefree (self->tex); 1517 Safefree (self->tex);
1423 Safefree (self); 1518 Safefree (self);
1424} 1519}
1425 1520
1426void 1521void
1427resize (CFPlus::Map self, int map_width, int map_height) 1522resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1523 CODE:
1429 self->w = map_width; 1524 self->w = map_width;
1430 self->h = map_height; 1525 self->h = map_height;
1431 1526
1432void 1527void
1433clear (CFPlus::Map self) 1528clear (DC::Map self)
1434 CODE: 1529 CODE:
1435 map_clear (self); 1530 map_clear (self);
1436 1531
1437void 1532void
1438set_tileid (CFPlus::Map self, int face, int tile) 1533set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1534 CODE:
1440{ 1535{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1536 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1537 need_texid (self, tile);
1443} 1538}
1444 1539
1445void 1540void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1541set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1542 CODE:
1448{ 1543{
1449 tileid texid; 1544 tileid texid;
1450 maptex *tex; 1545 maptex *tex;
1451 1546
1464 tex->smoothtile = self->face2tile [smooth]; 1559 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1560 tex->smoothlevel = level;
1466} 1561}
1467 1562
1468void 1563void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1564set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1565 CODE:
1471{ 1566{
1472 need_texid (self, texid); 1567 need_texid (self, texid);
1473 1568
1474 { 1569 {
1494 // from transparent color bleeding and ugly wrapping effects. 1589 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1591}
1497 1592
1498int 1593int
1499ox (CFPlus::Map self) 1594ox (DC::Map self)
1500 ALIAS: 1595 ALIAS:
1501 oy = 1 1596 oy = 1
1502 x = 2 1597 x = 2
1503 y = 3 1598 y = 3
1504 w = 4 1599 w = 4
1515 } 1610 }
1516 OUTPUT: 1611 OUTPUT:
1517 RETVAL 1612 RETVAL
1518 1613
1519void 1614void
1520scroll (CFPlus::Map self, int dx, int dy) 1615scroll (DC::Map self, int dx, int dy)
1521 CODE: 1616 CODE:
1522{ 1617{
1523 if (dx > 0) 1618 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1619 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1620 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1635 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1636 self->y += MAP_EXTEND_Y;
1542 } 1637 }
1543} 1638}
1544 1639
1545void 1640SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1641map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1642 CODE:
1548{ 1643{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1645 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1646 mapcell *cell;
1552 int x, y, flags; 1647 int x, y, z, flags;
1648 AV *missing = newAV ();
1649 RETVAL = newRV_noinc ((SV *)missing);
1553 1650
1554 while (data < data_end - 1) 1651 while (data < data_end - 1)
1555 { 1652 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1653 flags = (data [0] << 8) + data [1]; data += 2;
1557 1654
1608 } 1705 }
1609 else 1706 else
1610 cell->darkness = *data++ + 1; 1707 cell->darkness = *data++ + 1;
1611 } 1708 }
1612 1709
1710 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1711 if (flags & (4 >> z))
1614 { 1712 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1713 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1714 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 1715 cell->tile [z] = self->face2tile [face];
1716
1717 if (cell->tile [z])
1718 {
1719 maptex *tex = self->tex + cell->tile [z];
1720 if (!tex->name)
1721 av_push (missing, newSViv (cell->tile [z]));
1722
1723 if (tex->smoothtile)
1724 {
1725 maptex *smooth = self->tex + tex->smoothtile;
1726 if (!smooth->name)
1727 av_push (missing, newSViv (tex->smoothtile));
1728 }
1729 }
1618 } 1730 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1731 }
1634 else 1732 else
1635 cell->darkness = 0; 1733 cell->darkness = 0;
1636 } 1734 }
1637} 1735}
1736 OUTPUT:
1737 RETVAL
1638 1738
1639SV * 1739SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1740mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1741 CODE:
1642{ 1742{
1643 int x1, x; 1743 int x1, x;
1644 int y1, y; 1744 int y1, y;
1645 int z; 1745 int z;
1690} 1790}
1691 OUTPUT: 1791 OUTPUT:
1692 RETVAL 1792 RETVAL
1693 1793
1694void 1794void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1795draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1696 CODE: 1796 CODE:
1697{ 1797{
1798 int x, y, z;
1799
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 1803 smooth_key skey;
1702 int x, y, z; 1804
1703 int last_name; 1805 rc_t *rc = rc_alloc ();
1806 rc_key_t key;
1807 rc_array_t *arr;
1704 1808
1705 // thats current max. sorry. 1809 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1810 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1811 if (sh > 255) sh = 255;
1708 1812
1709 // clear key, in case of extra padding 1813 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1814 memset (&skey, 0, sizeof (skey));
1711 1815
1712 glColor4ub (255, 255, 255, 255); 1816 memset (&key, 0, sizeof (key));
1713 1817 key.r = 255;
1714 glEnable (GL_BLEND); 1818 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1819 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1820 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1821 key.mode = GL_QUADS;
1718 1822 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1823 key.texname = -1;
1720
1721 last_name = 0;
1722 1824
1723 mx += self->x; 1825 mx += self->x;
1724 my += self->y; 1826 my += self->y;
1725 1827
1726 // first pass: determine smooth_max 1828 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1844 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1845 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1846 self->tex [cell->tile [2]].smoothlevel));
1745 } 1847 }
1746 } 1848 }
1849
1850 glEnable (GL_BLEND);
1851 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1852 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747 1853
1748 for (z = 0; z <= 2; z++) 1854 for (z = 0; z <= 2; z++)
1749 { 1855 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1856 memset (smooth_level, 0, sizeof (smooth_level));
1751 1857
1761 tileid tile = cell->tile [z]; 1867 tileid tile = cell->tile [z];
1762 1868
1763 if (tile) 1869 if (tile)
1764 { 1870 {
1765 maptex tex = self->tex [tile]; 1871 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1872 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 1873
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1874 if (key.texname != tex.name)
1772 { 1875 {
1773 if (!tex.name) 1876 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1877 tex = self->tex [2]; /* missing, replace by noface */
1775 1878
1776 glEnd (); 1879 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1880 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1881 }
1780 1882
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1883 px = (x + 1) * T - tex.w;
1884 py = (y + 1) * T - tex.h;
1885
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1785 1890
1786 if (cell->flags && z == 2) 1891 if (cell->flags && z == 2)
1787 { 1892 {
1893 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1894 if (cell->flags & 1)
1789 { 1895 {
1790 maptex tex = self->tex [1]; 1896 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1897 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1898 int py = y * T - T * 6 / 32;
1793 1899
1900 if (tex.name)
1794 glEnd (); 1901 {
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1902 if (key.texname != tex.name)
1903 {
1904 key.texname = tex.name;
1905 arr = rc_array (rc, &key);
1906 }
1907
1908 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1909 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1910 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1911 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796 glBegin (GL_QUADS); 1912 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 1913 }
1803 } 1914 }
1804 1915
1805 // update smooth hash 1916 // update smooth hash
1806 if (tex.smoothtile) 1917 if (tex.smoothtile)
1842 } 1953 }
1843 } 1954 }
1844 } 1955 }
1845 } 1956 }
1846 1957
1958 rc_draw (rc);
1959 rc_clear (rc);
1960
1847 // go through all smoothlevels, lowest to highest, then draw. 1961 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 1962 // this is basically counting sort
1849 { 1963 {
1850 int w, b; 1964 int w, b;
1851 1965
1966 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 1968 for (w = 0; w < 256 / 32; ++w)
1853 { 1969 {
1854 uint32_t smask = smooth_level [w]; 1970 uint32_t smask = smooth_level [w];
1855 if (smask) 1971 if (smask)
1856 for (b = 0; b < 32; ++b) 1972 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 1991 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1992 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 1993 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 1994 float dy = tex.t * .5f ; // 2 images/column
1879 1995
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 1996 if (tex.name)
1883 { 1997 {
1998 // this time avoiding texture state changes
1999 // save gobs of state changes.
1884 if (!tex.name) 2000 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2001 {
1886
1887 glEnd (); 2002 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2004 glBegin (GL_QUADS);
1890 } 2005 }
1891 2006
1892 if (border) 2007 if (border)
1893 { 2008 {
1894 float ox = border * dx; 2009 float ox = border * dx;
1895 2010
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2015 }
1901 2016
1902 if (corner) 2017 if (corner)
1903 { 2018 {
1904 float ox = corner * dx; 2019 float ox = corner * dx;
1905 2020
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2021 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2025 }
1910 } 2026 }
1911 } 2027 }
1912 } 2028 }
1913 } 2029 }
1914 } 2030 }
2031
2032 glEnd ();
2033 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1;
1915 } 2035 }
1916 2036
1917 hv_clear (smooth); 2037 hv_clear (smooth);
1918 } 2038 }
1919 2039
1920 glEnd ();
1921
1922 glDisable (GL_TEXTURE_2D);
1923 glDisable (GL_BLEND); 2040 glDisable (GL_BLEND);
2041 rc_free (rc);
1924 2042
1925 // top layer: overlays such as the health bar 2043 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2044 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2045 if (0 <= y + my && y + my < self->rows)
1928 { 2046 {
1953 } 2071 }
1954 } 2072 }
1955} 2073}
1956 2074
1957void 2075void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2076draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE: 2077 CODE:
1960{ 2078{
1961 static float color[16][3] = { 2079 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2080 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2081 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2131 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2132 glDisable (GL_TEXTURE_2D);
2015} 2133}
2016 2134
2017void 2135void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2136fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2137 PPCODE:
2020{ 2138{
2021 int x, y; 2139 int x, y;
2022 int sw1 = sw + 2; 2140 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2141 int sh1 = sh + 2;
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2212 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2213 PUSHs (darkness3_sv);
2096} 2214}
2097 2215
2098SV * 2216SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2217get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2218 CODE:
2101{ 2219{
2102 int x, y, x1, y1; 2220 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2221 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2222 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2169} 2287}
2170 OUTPUT: 2288 OUTPUT:
2171 RETVAL 2289 RETVAL
2172 2290
2173void 2291void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2292set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2175 PPCODE: 2293 PPCODE:
2176{ 2294{
2177 int x, y, z; 2295 int x, y, z;
2178 int w, h; 2296 int w, h;
2179 int x1, y1; 2297 int x1, y1;
2180 2298
2181 if (*data++ != 0) 2299 if (*data++ != 0)
2182 return; /* version mismatch */ 2300 XSRETURN_EMPTY; /* version mismatch */
2183 2301
2184 w = *data++ << 8; w |= *data++; 2302 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2303 h = *data++ << 8; h |= *data++;
2186 2304
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2305 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 } 2350 }
2233 } 2351 }
2234 } 2352 }
2235} 2353}
2236 2354
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2355MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2356
2239PROTOTYPES: DISABLE 2357DC::RW
2240 2358new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2359 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2360{
2361 STRLEN datalen;
2362 char *data = SvPVbyte (data_sv, datalen);
2363
2364 RETVAL = SDL_RWFromConstMem (data, datalen);
2365}
2245 OUTPUT: 2366 OUTPUT:
2246 RETVAL 2367 RETVAL
2247 2368
2369DC::RW
2370new_from_file (SV *class, const char *path, const char *mode = "rb")
2371 CODE:
2372 RETVAL = SDL_RWFromFile (path, mode);
2373 OUTPUT:
2374 RETVAL
2375
2376# fails on win32:
2377# dc.xs(2268) : error C2059: syntax error : '('
2248void 2378#void
2379#close (DC::RW self)
2380# CODE:
2381# (self->(close)) (self);
2382
2383MODULE = Deliantra::Client PACKAGE = DC::Channel
2384
2385PROTOTYPES: DISABLE
2386
2387DC::Channel
2388find ()
2389 CODE:
2390{
2391 RETVAL = Mix_GroupAvailable (-1);
2392
2393 if (RETVAL < 0)
2394 {
2395 RETVAL = Mix_GroupOldest (-1);
2396
2397 if (RETVAL < 0)
2398 XSRETURN_UNDEF;
2399
2400 Mix_HaltChannel (RETVAL);
2401 }
2402
2403 Mix_UnregisterAllEffects (RETVAL);
2404 Mix_Volume (RETVAL, 128);
2405}
2406 OUTPUT:
2407 RETVAL
2408
2409void
2410halt (DC::Channel self)
2411 CODE:
2412 Mix_HaltChannel (self);
2413
2414void
2415expire (DC::Channel self, int ticks = -1)
2416 CODE:
2417 Mix_ExpireChannel (self, ticks);
2418
2419void
2420fade_out (DC::Channel self, int ticks = -1)
2421 CODE:
2422 Mix_FadeOutChannel (self, ticks);
2423
2424int
2425volume (DC::Channel self, int volume)
2426 CODE:
2427 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2428 OUTPUT:
2429 RETVAL
2430
2431void
2432unregister_all_effects (DC::Channel self)
2433 CODE:
2434 Mix_UnregisterAllEffects (self);
2435
2436void
2437set_panning (DC::Channel self, int left, int right)
2438 CODE:
2439 left = CLAMP (left , 0, 255);
2440 right = CLAMP (right, 0, 255);
2441 Mix_SetPanning (self, left, right);
2442
2443void
2444set_distance (DC::Channel self, int distance)
2445 CODE:
2446 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2447
2448void
2449set_position (DC::Channel self, int angle, int distance)
2450 CODE:
2451
2452void
2453set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2454 CODE:
2455{
2456 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2457 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459}
2460
2461void
2462set_reverse_stereo (DC::Channel self, int flip)
2463 CODE:
2464 Mix_SetReverseStereo (self, flip);
2465
2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2467
2468PROTOTYPES: DISABLE
2469
2470DC::MixChunk
2471new (SV *class, DC::RW rwops)
2472 CODE:
2473 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2474 OUTPUT:
2475 RETVAL
2476
2477void
2249DESTROY (CFPlus::MixChunk self) 2478DESTROY (DC::MixChunk self)
2250 CODE: 2479 CODE:
2251 Mix_FreeChunk (self); 2480 Mix_FreeChunk (self);
2252 2481
2253int 2482int
2254volume (CFPlus::MixChunk self, int volume = -1) 2483volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2484 CODE:
2485 if (items > 1)
2486 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2487 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2488 OUTPUT:
2258 RETVAL 2489 RETVAL
2259 2490
2260int 2491DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2492play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2493 CODE:
2494{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2496
2497 if (RETVAL < 0)
2498 XSRETURN_UNDEF;
2499
2500 if (channel < 0)
2501 {
2502 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128);
2504 }
2505}
2264 OUTPUT: 2506 OUTPUT:
2265 RETVAL 2507 RETVAL
2266 2508
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2510
2269int 2511int
2270volume (int volume = -1) 2512volume (int volume = -1)
2271 PROTOTYPE: ;$ 2513 PROTOTYPE: ;$
2272 CODE: 2514 CODE:
2515 if (items > 0)
2516 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2517 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2518 OUTPUT:
2275 RETVAL 2519 RETVAL
2276 2520
2277int 2521void
2278fade_out (int ms) 2522fade_out (int ms)
2279 CODE: 2523 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2524 Mix_FadeOutMusic (ms);
2525
2526void
2527halt ()
2528 CODE:
2529 Mix_HaltMusic ();
2530
2531DC::MixMusic
2532new (SV *class, DC::RW rwops)
2533 CODE:
2534 RETVAL = Mix_LoadMUS_RW (rwops);
2281 OUTPUT: 2535 OUTPUT:
2282 RETVAL 2536 RETVAL
2283 2537
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void 2538void
2292DESTROY (CFPlus::MixMusic self) 2539DESTROY (DC::MixMusic self)
2293 CODE: 2540 CODE:
2294 Mix_FreeMusic (self); 2541 Mix_FreeMusic (self);
2295 2542
2296int 2543int
2297play (CFPlus::MixMusic self, int loops = -1) 2544play (DC::MixMusic self, int loops = -1)
2298 CODE: 2545 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2546 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2547 OUTPUT:
2301 RETVAL 2548 RETVAL
2302 2549
2303int 2550void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2551fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2552 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2553 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2554
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2555MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2556
2312PROTOTYPES: ENABLE 2557PROTOTYPES: ENABLE
2313 2558
2314BOOT: 2559BOOT:
2315{ 2560{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2561 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2562 static const struct {
2318 const char *name; 2563 const char *name;
2319 IV iv; 2564 IV iv;
2320 } *civ, const_iv[] = { 2565 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2566# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2601 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2602 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2603 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2604 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2605 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2606 const_iv (GL_COMPRESSED_ALPHA_ARB),
2607 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2608 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2609 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2610 const_iv (GL_COMPRESSED_RGB_ARB),
2611 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 2612 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2613 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2614 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2615 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2616 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2655 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2656 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2657 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2658 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2659 const_iv (GL_GENERATE_MIPMAP_HINT),
2660 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2661 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2662 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2663 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2664 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2665 const_iv (GL_V3F),
2421 2673
2422 texture_av = newAV (); 2674 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2675 AvREAL_off (texture_av);
2424} 2676}
2425 2677
2678void
2679disable_GL_EXT_blend_func_separate ()
2680 CODE:
2681 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0;
2683
2426char * 2684char *
2427gl_vendor () 2685gl_vendor ()
2428 CODE: 2686 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2687 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2688 OUTPUT:
2547 2805
2548void glTexCoord (float s, float t) 2806void glTexCoord (float s, float t)
2549 CODE: 2807 CODE:
2550 glTexCoord2f (s, t); 2808 glTexCoord2f (s, t);
2551 2809
2810void glRect (float x1, float y1, float x2, float y2)
2811 CODE:
2812 glRectf (x1, y1, x2, y2);
2813
2814void glRect_lineloop (float x1, float y1, float x2, float y2)
2815 CODE:
2816 glBegin (GL_LINE_LOOP);
2817 glVertex2f (x1, y1);
2818 glVertex2f (x2, y1);
2819 glVertex2f (x2, y2);
2820 glVertex2f (x1, y2);
2821 glEnd ();
2822
2552PROTOTYPES: ENABLE 2823PROTOTYPES: ENABLE
2553 2824
2554void glBegin (int mode) 2825void glBegin (int mode)
2555 2826
2556void glEnd () 2827void glEnd ()
2588void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2859void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2589 CODE: 2860 CODE:
2590 if (gl.SeparableFilter2D) 2861 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2862 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 2863
2593void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2864void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2594 2865
2595void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2866void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2596 2867
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 2868void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 2869
2624 2895
2625void glEndList () 2896void glEndList ()
2626 2897
2627void glCallList (int list) 2898void glCallList (int list)
2628 2899
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 2901
2631PROTOTYPES: DISABLE 2902PROTOTYPES: DISABLE
2632 2903
2633void 2904void
2634find_widget (SV *self, NV x, NV y) 2905find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 2909 XPUSHs (self);
2639} 2910}
2640 2911
2641BOOT: 2912BOOT:
2642{ 2913{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2914 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 2915
2645 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2916 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2646 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2917 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2647 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2918 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2648 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2919 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2649} 2920}
2650 2921
2651void 2922void
2652draw (SV *self) 2923draw (SV *self)
2653 CODE: 2924 CODE:
2657 NV x, y, w, h; 2928 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 2929 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 2930 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 2931 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 2932 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 2933 double draw_x, draw_y;
2664 2934
2665 if (!SvROK (self)) 2935 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2936 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 2937
2668 hv = (HV *)SvRV (self); 2938 hv = (HV *)SvRV (self);
2669 2939
2670 if (SvTYPE (hv) != SVt_PVHV) 2940 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2941 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 2942
2673 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2943 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2674 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2944 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2675 2945
2676 if (!h || !w) 2946 if (!h || !w)
2696 { 2966 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2967 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 2968
2699 if (svp && SvTRUE (*svp)) 2969 if (svp && SvTRUE (*svp))
2700 { 2970 {
2701 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2971 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2702 glEnable (GL_BLEND); 2972 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2973 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 2974 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 2975 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 2976 glVertex2f (w, 0);
2709 glEnd (); 2979 glEnd ();
2710 glDisable (GL_BLEND); 2980 glDisable (GL_BLEND);
2711 } 2981 }
2712 } 2982 }
2713#if 0 2983#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 2984 // draw borders, for debugging
2715 glPushMatrix; 2985 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 2986 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 2987 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 2988 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 2989 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 2990 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 2991 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 2992 glVertex2f (0 , h - 1);
2723 glEnd; 2993 glEnd ();
2724 glPopMatrix; 2994 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 2995#endif
2728 PUSHMARK (SP); 2996 PUSHMARK (SP);
2729 XPUSHs (self); 2997 XPUSHs (self);
2730 PUTBACK; 2998 PUTBACK;
2731 call_method ("_draw", G_VOID | G_DISCARD); 2999 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines