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.213 by root, Sun Jul 29 04:14:45 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>
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#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
45 57
46#ifndef _WIN32 58#ifndef _WIN32
47# include <sys/types.h> 59# include <sys/types.h>
48# include <sys/socket.h> 60# include <sys/socket.h>
49# include <netinet/in.h> 61# include <netinet/in.h>
109 av_push (texture_av, (SV *)(size_t)name); 121 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 122 glDeleteTextures (1, &name);
111} 123}
112 124
113#include "texcache.c" 125#include "texcache.c"
126#include "rendercache.c"
114 127
115#include "pango-font.c" 128#include "pango-font.c"
116#include "pango-fontmap.c" 129#include "pango-fontmap.c"
117#include "pango-render.c" 130#include "pango-render.c"
118 131
119typedef IV CFPlus__Channel; 132typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 133typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 134typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 135typedef Mix_Music *DC__MixMusic;
123 136
124typedef PangoFontDescription *CFPlus__Font; 137typedef PangoFontDescription *DC__Font;
125 138
126static int 139static int
127shape_attr_p (PangoLayoutRun *run) 140shape_attr_p (PangoLayoutRun *run)
128{ 141{
129 GSList *attrs = run->item->analysis.extra_attrs; 142 GSList *attrs = run->item->analysis.extra_attrs;
143 156
144typedef struct cf_layout { 157typedef struct cf_layout {
145 PangoLayout *pl; 158 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 159 float r, g, b, a; // default color for rgba mode
147 int base_height; 160 int base_height;
148 CFPlus__Font font; 161 DC__Font font;
162 rc_t *rc;
149} *CFPlus__Layout; 163} *DC__Layout;
150 164
151static CFPlus__Font default_font; 165static DC__Font default_font;
152static PangoContext *opengl_context; 166static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 167static PangoFontMap *opengl_fontmap;
154 168
155static void 169static void
156substitute_func (FcPattern *pattern, gpointer data) 170substitute_func (FcPattern *pattern, gpointer data)
161#endif 175#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 176 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 177}
164 178
165static void 179static void
166layout_update_font (CFPlus__Layout self) 180layout_update_font (DC__Layout self)
167{ 181{
168 /* 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
169 * reasonably well with bitstream vera 183 * reasonably well with bitstream vera
170 */ 184 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 185 PangoFontDescription *font = self->font ? self->font : default_font;
175 189
176 pango_layout_set_font_description (self->pl, font); 190 pango_layout_set_font_description (self->pl, font);
177} 191}
178 192
179static void 193static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 194layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 195{
182 PangoRectangle rect; 196 PangoRectangle rect;
183 197
184 // get_pixel_* wrongly rounds down 198 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 199 pango_layout_get_extents (self->pl, 0, &rect);
196 210
197typedef uint16_t tileid; 211typedef uint16_t tileid;
198typedef uint16_t faceid; 212typedef uint16_t faceid;
199 213
200typedef struct { 214typedef struct {
201 int name; 215 GLuint name;
202 int w, h; 216 int w, h;
203 float s, t; 217 float s, t;
204 uint8_t r, g, b, a; 218 uint8_t r, g, b, a;
205 tileid smoothtile; 219 tileid smoothtile;
206 uint8_t smoothlevel; 220 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 238 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 239 int texs; maptex *tex; // [tileid]
226 240
227 int32_t rows; 241 int32_t rows;
228 maprow *row; 242 maprow *row;
229} *CFPlus__Map; 243} *DC__Map;
230 244
231static char * 245static char *
232prepend (char *ptr, int sze, int inc) 246prepend (char *ptr, int sze, int inc)
233{ 247{
234 char *p; 248 char *p;
272 self->texs *= 2; 286 self->texs *= 2;
273 } 287 }
274} 288}
275 289
276static maprow * 290static maprow *
277map_get_row (CFPlus__Map self, int y) 291map_get_row (DC__Map self, int y)
278{ 292{
279 if (0 > y) 293 if (0 > y)
280 { 294 {
281 int extend = - y + MAP_EXTEND_Y; 295 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 296 Prepend (maprow, self->row, self->rows, extend);
320 334
321 return row->col + (x - row->c0); 335 return row->col + (x - row->c0);
322} 336}
323 337
324static mapcell * 338static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 339map_get_cell (DC__Map self, int x, int y)
326{ 340{
327 return row_get_cell (map_get_row (self, y), x); 341 return row_get_cell (map_get_row (self, y), x);
328} 342}
329 343
330static void 344static void
331map_clear (CFPlus__Map self) 345map_clear (DC__Map self)
332{ 346{
333 int r; 347 int r;
334 348
335 for (r = 0; r < self->rows; r++) 349 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 350 Safefree (self->row[r].col);
344 self->row = 0; 358 self->row = 0;
345 self->rows = 0; 359 self->rows = 0;
346} 360}
347 361
348static void 362static void
349map_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)
350{ 364{
351 int x, y; 365 int x, y;
352 maprow *row; 366 maprow *row;
353 mapcell *cell; 367 mapcell *cell;
354 368
433 n |= n >> 16; 447 n |= n >> 16;
434 448
435 return n + 1; 449 return n + 1;
436} 450}
437 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
438/* SDL should provide this, really. */ 463/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 464#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 465#define SDLK_MODIFIER_MAX 314
441 466
442/******************************************************************************/ 467/******************************************************************************/
480 return 0; 505 return 0;
481 506
482 return 1; 507 return 1;
483} 508}
484 509
485MODULE = CFPlus PACKAGE = CFPlus 510MODULE = Deliantra::Client PACKAGE = DC
486 511
487PROTOTYPES: ENABLE 512PROTOTYPES: ENABLE
488 513
489BOOT: 514BOOT:
490{ 515{
491 HV *stash = gv_stashpv ("CFPlus", 1); 516 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 517 static const struct {
493 const char *name; 518 const char *name;
494 IV iv; 519 IV iv;
495 } *civ, const_iv[] = { 520 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 521# define const_iv(name) { # name, (IV)name }
518 543
519 const_iv (SDL_APPINPUTFOCUS), 544 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 545 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 546 const_iv (SDL_APPACTIVE),
522 547
548 const_iv (SDLK_FIRST),
549 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 550 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 551 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 552 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 553 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 554 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 626 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 627 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 628 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 629 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 630 const_iv (KMOD_MODE),
631
632 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 633# undef const_iv
605 }; 634 };
606 635
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
626 655
627NV floor (NV x) 656NV floor (NV x)
628 657
629NV ceil (NV x) 658NV ceil (NV x)
630 659
660IV minpot (UV n)
661
662IV popcount (UV n)
663
631void 664void
632pango_init () 665pango_init ()
633 CODE: 666 CODE:
634{ 667{
635 opengl_fontmap = pango_opengl_font_map_new (); 668 opengl_fontmap = pango_opengl_font_map_new ();
636 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);
637 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
638} 675}
639 676
640char * 677char *
641SDL_GetError () 678SDL_GetError ()
642 679
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 712
676 if (m && m != (SDL_Rect **)-1) 713 if (m && m != (SDL_Rect **)-1)
677 while (*m) 714 while (*m)
678 { 715 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 716 if ((*m)->w >= 800 && (*m)->h >= 480)
680 { 717 {
681 AV *av = newAV (); 718 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 719 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 720 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 721 av_push (av, newSViv (rgb));
708 745
709 if (RETVAL) 746 if (RETVAL)
710 { 747 {
711 av_clear (texture_av); 748 av_clear (texture_av);
712 749
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 750 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 752#include "glfunc.h"
716#undef GL_FUNC 753#undef GL_FUNC
717 } 754 }
718} 755}
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 836 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 837 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 838 break;
802 } 839 }
803 840
804 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))));
805 } 842 }
806} 843}
807 844
808int 845int
809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 846Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810 POSTCALL: 847 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 848 Mix_HookMusicFinished (music_finished);
812 Mix_ChannelFinished (channel_finished); 849 Mix_ChannelFinished (channel_finished);
813 850
814void 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
815Mix_CloseAudio () 868Mix_CloseAudio ()
816 869
817int 870int
818Mix_AllocateChannels (int numchans = -1) 871Mix_AllocateChannels (int numchans = -1)
872
873const char *
874Mix_GetError ()
819 875
820void 876void
821lowdelay (int fd, int val = 1) 877lowdelay (int fd, int val = 1)
822 CODE: 878 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 879 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
948void 1004void
949error (char *message) 1005error (char *message)
950 CODE: 1006 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 1007 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 1008#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1009 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 1010#endif
955 1011
956void 1012void
957fatal (char *message) 1013fatal (char *message)
958 CODE: 1014 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1015 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1016#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1017 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1018#endif
963 _exit (1); 1019 _exit (1);
964 1020
965void 1021void
966_exit (int retval = 0) 1022_exit (int retval = 0)
978#if DEBUG 1034#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1035 VALGRIND_DO_LEAK_CHECK;
980#endif 1036#endif
981} 1037}
982 1038
983MODULE = CFPlus PACKAGE = CFPlus::Font 1039MODULE = Deliantra::Client PACKAGE = DC::Font
984 1040
985PROTOTYPES: DISABLE 1041PROTOTYPES: DISABLE
986 1042
987CFPlus::Font 1043DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1044new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1045 CODE:
990{ 1046{
991 int count; 1047 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1048 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1051}
996 OUTPUT: 1052 OUTPUT:
997 RETVAL 1053 RETVAL
998 1054
999void 1055void
1000DESTROY (CFPlus::Font self) 1056DESTROY (DC::Font self)
1001 CODE: 1057 CODE:
1002 pango_font_description_free (self); 1058 pango_font_description_free (self);
1003 1059
1004void 1060void
1005make_default (CFPlus::Font self) 1061make_default (DC::Font self)
1006 PROTOTYPE: $ 1062 PROTOTYPE: $
1007 CODE: 1063 CODE:
1008 default_font = self; 1064 default_font = self;
1009 1065
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1066MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1067
1012PROTOTYPES: DISABLE 1068PROTOTYPES: DISABLE
1013 1069
1014void 1070void
1015reset_glyph_cache () 1071glyph_cache_backup ()
1016 PROTOTYPE: 1072 PROTOTYPE:
1017 CODE: 1073 CODE:
1074 tc_backup ();
1075
1076void
1077glyph_cache_restore ()
1078 PROTOTYPE:
1079 CODE:
1018 tc_clear (); 1080 tc_restore ();
1019 1081
1020CFPlus::Layout 1082DC::Layout
1021new (SV *class) 1083new (SV *class)
1022 CODE: 1084 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1085 New (0, RETVAL, 1, struct cf_layout);
1024 1086
1025 RETVAL->pl = pango_layout_new (opengl_context); 1087 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1089 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1090 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1091 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1092 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1093 RETVAL->font = 0;
1094 RETVAL->rc = rc_alloc ();
1032 1095
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1096 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1097 layout_update_font (RETVAL);
1035 OUTPUT: 1098 OUTPUT:
1036 RETVAL 1099 RETVAL
1037 1100
1038void 1101void
1039DESTROY (CFPlus::Layout self) 1102DESTROY (DC::Layout self)
1040 CODE: 1103 CODE:
1041 g_object_unref (self->pl); 1104 g_object_unref (self->pl);
1105 rc_free (self->rc);
1042 Safefree (self); 1106 Safefree (self);
1043 1107
1044void 1108void
1045set_text (CFPlus::Layout self, SV *text_) 1109set_text (DC::Layout self, SV *text_)
1046 CODE: 1110 CODE:
1047{ 1111{
1048 STRLEN textlen; 1112 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1113 char *text = SvPVutf8 (text_, textlen);
1050 1114
1051 pango_layout_set_text (self->pl, text, textlen); 1115 pango_layout_set_text (self->pl, text, textlen);
1052} 1116}
1053 1117
1054void 1118void
1055set_markup (CFPlus::Layout self, SV *text_) 1119set_markup (DC::Layout self, SV *text_)
1056 CODE: 1120 CODE:
1057{ 1121{
1058 STRLEN textlen; 1122 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
1060 1124
1061 pango_layout_set_markup (self->pl, text, textlen); 1125 pango_layout_set_markup (self->pl, text, textlen);
1062} 1126}
1063 1127
1064void 1128void
1065set_shapes (CFPlus::Layout self, ...) 1129set_shapes (DC::Layout self, ...)
1066 CODE: 1130 CODE:
1067{ 1131{
1068 PangoAttrList *attrs = 0; 1132 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1133 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1134 const char *pos = text;
1105 if (attrs) 1169 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1170 pango_layout_set_attributes (self->pl, attrs);
1107} 1171}
1108 1172
1109void 1173void
1110get_shapes (CFPlus::Layout self) 1174get_shapes (DC::Layout self)
1111 PPCODE: 1175 PPCODE:
1112{ 1176{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1177 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1178
1115 do 1179 do
1116 { 1180 {
1117 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1181 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118 1182
1119 if (run && shape_attr_p (run)) 1183 if (run && shape_attr_p (run))
1120 { 1184 {
1121 PangoRectangle extents; 1185 PangoRectangle extents;
1122 pango_layout_iter_get_run_extents (iter, 0, &extents); 1186 pango_layout_iter_get_run_extents (iter, 0, &extents);
1130 1194
1131 pango_layout_iter_free (iter); 1195 pango_layout_iter_free (iter);
1132} 1196}
1133 1197
1134int 1198int
1135has_wrapped (CFPlus::Layout self) 1199has_wrapped (DC::Layout self)
1136 CODE: 1200 CODE:
1137{ 1201{
1138 int lines = 1; 1202 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1203 const char *text = pango_layout_get_text (self->pl);
1140 1204
1145} 1209}
1146 OUTPUT: 1210 OUTPUT:
1147 RETVAL 1211 RETVAL
1148 1212
1149SV * 1213SV *
1150get_text (CFPlus::Layout self) 1214get_text (DC::Layout self)
1151 CODE: 1215 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1216 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1217 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1218 OUTPUT:
1155 RETVAL 1219 RETVAL
1156 1220
1157void 1221void
1158set_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.)
1159 CODE: 1223 CODE:
1160 self->r = r; 1224 self->r = r;
1161 self->g = g; 1225 self->g = g;
1162 self->b = b; 1226 self->b = b;
1163 self->a = a; 1227 self->a = a;
1164 1228
1165void 1229void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1230set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1231 CODE:
1168 if (self->font != font) 1232 if (self->font != font)
1169 { 1233 {
1170 self->font = font; 1234 self->font = font;
1171 layout_update_font (self); 1235 layout_update_font (self);
1172 } 1236 }
1173 1237
1174void 1238void
1175set_height (CFPlus::Layout self, int base_height) 1239set_height (DC::Layout self, int base_height)
1176 CODE: 1240 CODE:
1177 if (self->base_height != base_height) 1241 if (self->base_height != base_height)
1178 { 1242 {
1179 self->base_height = base_height; 1243 self->base_height = base_height;
1180 layout_update_font (self); 1244 layout_update_font (self);
1181 } 1245 }
1182 1246
1183void 1247void
1184set_width (CFPlus::Layout self, int max_width = -1) 1248set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1249 CODE:
1186 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);
1187 1251
1188void 1252void
1189set_indent (CFPlus::Layout self, int indent) 1253set_indent (DC::Layout self, int indent)
1190 CODE: 1254 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1255 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1256
1193void 1257void
1194set_spacing (CFPlus::Layout self, int spacing) 1258set_spacing (DC::Layout self, int spacing)
1195 CODE: 1259 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1260 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1261
1198void 1262void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1263set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1264 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1265 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1266 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1267 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1268 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1269 : PANGO_ELLIPSIZE_NONE
1206 ); 1270 );
1207 1271
1208void 1272void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1273set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1274 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1275 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1276
1213void 1277void
1214size (CFPlus::Layout self) 1278size (DC::Layout self)
1215 PPCODE: 1279 PPCODE:
1216{ 1280{
1217 int w, h; 1281 int w, h;
1218 1282
1219 layout_get_pixel_size (self, &w, &h); 1283 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1286 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1287 PUSHs (sv_2mortal (newSViv (h)));
1224} 1288}
1225 1289
1226int 1290int
1227descent (CFPlus::Layout self) 1291descent (DC::Layout self)
1228 CODE: 1292 CODE:
1229{ 1293{
1230 PangoRectangle rect; 1294 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1295 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1296 pango_layout_line_get_pixel_extents (line, 0, &rect);
1233 RETVAL = PANGO_DESCENT (rect); 1297 RETVAL = PANGO_DESCENT (rect);
1234} 1298}
1235 OUTPUT: 1299 OUTPUT:
1236 RETVAL 1300 RETVAL
1237 1301
1238int 1302int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1303xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1304 CODE:
1241{ 1305{
1242 int index, trailing; 1306 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1308 RETVAL = index + trailing;
1245} 1309}
1246 OUTPUT: 1310 OUTPUT:
1247 RETVAL 1311 RETVAL
1248 1312
1249void 1313void
1250cursor_pos (CFPlus::Layout self, int index) 1314cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1315 PPCODE:
1252{ 1316{
1253 PangoRectangle strong_pos; 1317 PangoRectangle pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1318 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255 1319
1256 EXTEND (SP, 3); 1320 EXTEND (SP, 3);
1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260} 1324}
1261 1325
1262void 1326void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1327index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1328 PPCODE:
1265{ 1329{
1266 int line, x; 1330 int line, x;
1267 1331
1268 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))
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1335 --line;
1336#endif
1271 EXTEND (SP, 2); 1337 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1338 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1339 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1340}
1275 1341
1276void 1342void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1343line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1344 PPCODE:
1279{ 1345{
1280 PangoLayoutLine *lp; 1346 PangoLayoutLine *lp;
1281 int index, trailing; 1347 int index, trailing;
1282 1348
1283 if (line < 0) 1349 if (line < 0)
1284 XSRETURN_EMPTY; 1350 XSRETURN_EMPTY;
1285 1351
1286 if (!(lp = pango_layout_get_line (self->pl, line))) 1352 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */ 1353 XSRETURN_EMPTY; /* do better */
1288 1354
1289 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);
1290 1356
1291 EXTEND (SP, 2); 1357 EXTEND (SP, 2);
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1363 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1364 }
1299} 1365}
1300 1366
1301void 1367void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1368render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1369 CODE:
1370 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1371 pango_opengl_render_layout_subpixel (
1305 self->pl, 1372 self->pl,
1373 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1374 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1375 self->r, self->g, self->b, self->a,
1308 flags 1376 flags
1309 ); 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);
1310 1381
1311MODULE = 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
1312 1402
1313PROTOTYPES: ENABLE 1403PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1404
1317void 1405void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1406pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1407 CODE:
1320{ 1408{
1347 HV *hv = (HV *)SvRV (self); 1435 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1436 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1437 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1438 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1439
1440 if (name <= 0)
1441 XSRETURN_EMPTY;
1442
1352 if (items < 5) 1443 if (items < 5)
1353 { 1444 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1445 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1446 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1447 }
1394 RETVAL = width > 0; 1485 RETVAL = width > 0;
1395} 1486}
1396 OUTPUT: 1487 OUTPUT:
1397 RETVAL 1488 RETVAL
1398 1489
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1490MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1491
1401PROTOTYPES: DISABLE 1492PROTOTYPES: DISABLE
1402 1493
1403CFPlus::Map 1494DC::Map
1404new (SV *class) 1495new (SV *class)
1405 CODE: 1496 CODE:
1406 New (0, RETVAL, 1, struct map); 1497 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1498 RETVAL->x = 0;
1408 RETVAL->y = 0; 1499 RETVAL->y = 0;
1416 RETVAL->row = 0; 1507 RETVAL->row = 0;
1417 OUTPUT: 1508 OUTPUT:
1418 RETVAL 1509 RETVAL
1419 1510
1420void 1511void
1421DESTROY (CFPlus::Map self) 1512DESTROY (DC::Map self)
1422 CODE: 1513 CODE:
1423{ 1514{
1424 map_clear (self); 1515 map_clear (self);
1425 Safefree (self->face2tile); 1516 Safefree (self->face2tile);
1426 Safefree (self->tex); 1517 Safefree (self->tex);
1427 Safefree (self); 1518 Safefree (self);
1428} 1519}
1429 1520
1430void 1521void
1431resize (CFPlus::Map self, int map_width, int map_height) 1522resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1523 CODE:
1433 self->w = map_width; 1524 self->w = map_width;
1434 self->h = map_height; 1525 self->h = map_height;
1435 1526
1436void 1527void
1437clear (CFPlus::Map self) 1528clear (DC::Map self)
1438 CODE: 1529 CODE:
1439 map_clear (self); 1530 map_clear (self);
1440 1531
1441void 1532void
1442set_tileid (CFPlus::Map self, int face, int tile) 1533set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1534 CODE:
1444{ 1535{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1536 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1537 need_texid (self, tile);
1447} 1538}
1448 1539
1449void 1540void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1541set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1542 CODE:
1452{ 1543{
1453 tileid texid; 1544 tileid texid;
1454 maptex *tex; 1545 maptex *tex;
1455 1546
1468 tex->smoothtile = self->face2tile [smooth]; 1559 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1560 tex->smoothlevel = level;
1470} 1561}
1471 1562
1472void 1563void
1473set_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)
1474 CODE: 1565 CODE:
1475{ 1566{
1476 need_texid (self, texid); 1567 need_texid (self, texid);
1477 1568
1478 { 1569 {
1498 // from transparent color bleeding and ugly wrapping effects. 1589 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1590 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1591}
1501 1592
1502int 1593int
1503ox (CFPlus::Map self) 1594ox (DC::Map self)
1504 ALIAS: 1595 ALIAS:
1505 oy = 1 1596 oy = 1
1506 x = 2 1597 x = 2
1507 y = 3 1598 y = 3
1508 w = 4 1599 w = 4
1519 } 1610 }
1520 OUTPUT: 1611 OUTPUT:
1521 RETVAL 1612 RETVAL
1522 1613
1523void 1614void
1524scroll (CFPlus::Map self, int dx, int dy) 1615scroll (DC::Map self, int dx, int dy)
1525 CODE: 1616 CODE:
1526{ 1617{
1527 if (dx > 0) 1618 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1619 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1620 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1635 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1636 self->y += MAP_EXTEND_Y;
1546 } 1637 }
1547} 1638}
1548 1639
1549void 1640SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1641map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1642 CODE:
1552{ 1643{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1644 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1645 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1646 mapcell *cell;
1556 int x, y, flags; 1647 int x, y, z, flags;
1648 AV *missing = newAV ();
1649 RETVAL = newRV_noinc ((SV *)missing);
1557 1650
1558 while (data < data_end - 1) 1651 while (data < data_end - 1)
1559 { 1652 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1653 flags = (data [0] << 8) + data [1]; data += 2;
1561 1654
1612 } 1705 }
1613 else 1706 else
1614 cell->darkness = *data++ + 1; 1707 cell->darkness = *data++ + 1;
1615 } 1708 }
1616 1709
1710 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1711 if (flags & (4 >> z))
1618 { 1712 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1713 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1714 need_facenum (self, face);
1621 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 }
1622 } 1730 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1731 }
1638 else 1732 else
1639 cell->darkness = 0; 1733 cell->darkness = 0;
1640 } 1734 }
1641} 1735}
1736 OUTPUT:
1737 RETVAL
1642 1738
1643SV * 1739SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1740mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1741 CODE:
1646{ 1742{
1647 int x1, x; 1743 int x1, x;
1648 int y1, y; 1744 int y1, y;
1649 int z; 1745 int z;
1694} 1790}
1695 OUTPUT: 1791 OUTPUT:
1696 RETVAL 1792 RETVAL
1697 1793
1698void 1794void
1699draw (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)
1700 CODE: 1796 CODE:
1701{ 1797{
1798 int x, y, z;
1799
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 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
1704 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)
1705 smooth_key skey; 1803 smooth_key skey;
1706 int x, y, z; 1804
1707 int last_name; 1805 rc_t *rc = rc_alloc ();
1806 rc_key_t key;
1807 rc_array_t *arr;
1708 1808
1709 // thats current max. sorry. 1809 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1810 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1811 if (sh > 255) sh = 255;
1712 1812
1713 // clear key, in case of extra padding 1813 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1814 memset (&skey, 0, sizeof (skey));
1715 1815
1716 glColor4ub (255, 255, 255, 255); 1816 memset (&key, 0, sizeof (key));
1717 1817 key.r = 255;
1718 glEnable (GL_BLEND); 1818 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1819 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1820 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1821 key.mode = GL_QUADS;
1722 1822 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1823 key.texname = -1;
1724
1725 last_name = 0;
1726 1824
1727 mx += self->x; 1825 mx += self->x;
1728 my += self->y; 1826 my += self->y;
1729 1827
1730 // first pass: determine smooth_max 1828 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1844 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1845 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1846 self->tex [cell->tile [2]].smoothlevel));
1749 } 1847 }
1750 } 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);
1751 1853
1752 for (z = 0; z <= 2; z++) 1854 for (z = 0; z <= 2; z++)
1753 { 1855 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1856 memset (smooth_level, 0, sizeof (smooth_level));
1755 1857
1765 tileid tile = cell->tile [z]; 1867 tileid tile = cell->tile [z];
1766 1868
1767 if (tile) 1869 if (tile)
1768 { 1870 {
1769 maptex tex = self->tex [tile]; 1871 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1872 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1873
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1874 if (key.texname != tex.name)
1776 { 1875 {
1777 if (!tex.name) 1876 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1877 tex = self->tex [2]; /* missing, replace by noface */
1779 1878
1780 glEnd (); 1879 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1880 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1881 }
1784 1882
1785 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);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787 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);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1890
1790 if (cell->flags && z == 2) 1891 if (cell->flags && z == 2)
1791 { 1892 {
1893 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1894 if (cell->flags & 1)
1793 { 1895 {
1794 maptex tex = self->tex [1]; 1896 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1897 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1898 int py = y * T - T * 6 / 32;
1797 1899
1900 if (tex.name)
1798 glEnd (); 1901 {
1799 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);
1800 glBegin (GL_QUADS); 1912 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1913 }
1807 } 1914 }
1808 1915
1809 // update smooth hash 1916 // update smooth hash
1810 if (tex.smoothtile) 1917 if (tex.smoothtile)
1846 } 1953 }
1847 } 1954 }
1848 } 1955 }
1849 } 1956 }
1850 1957
1958 rc_draw (rc);
1959 rc_clear (rc);
1960
1851 // go through all smoothlevels, lowest to highest, then draw. 1961 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1962 // this is basically counting sort
1853 { 1963 {
1854 int w, b; 1964 int w, b;
1855 1965
1966 glEnable (GL_TEXTURE_2D);
1967 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1968 for (w = 0; w < 256 / 32; ++w)
1857 { 1969 {
1858 uint32_t smask = smooth_level [w]; 1970 uint32_t smask = smooth_level [w];
1859 if (smask) 1971 if (smask)
1860 for (b = 0; b < 32; ++b) 1972 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1991 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1992 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1993 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1994 float dy = tex.t * .5f ; // 2 images/column
1883 1995
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1996 if (tex.name)
1887 { 1997 {
1998 // this time avoiding texture state changes
1999 // save gobs of state changes.
1888 if (!tex.name) 2000 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 2001 {
1890
1891 glEnd (); 2002 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2003 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 2004 glBegin (GL_QUADS);
1894 } 2005 }
1895 2006
1896 if (border) 2007 if (border)
1897 { 2008 {
1898 float ox = border * dx; 2009 float ox = border * dx;
1899 2010
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2011 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2014 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2015 }
1905 2016
1906 if (corner) 2017 if (corner)
1907 { 2018 {
1908 float ox = corner * dx; 2019 float ox = corner * dx;
1909 2020
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2021 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2022 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2023 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2024 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2025 }
1914 } 2026 }
1915 } 2027 }
1916 } 2028 }
1917 } 2029 }
1918 } 2030 }
2031
2032 glEnd ();
2033 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1;
1919 } 2035 }
1920 2036
1921 hv_clear (smooth); 2037 hv_clear (smooth);
1922 } 2038 }
1923 2039
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2040 glDisable (GL_BLEND);
2041 rc_free (rc);
1928 2042
1929 // top layer: overlays such as the health bar 2043 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2044 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2045 if (0 <= y + my && y + my < self->rows)
1932 { 2046 {
1957 } 2071 }
1958 } 2072 }
1959} 2073}
1960 2074
1961void 2075void
1962draw_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)
1963 CODE: 2077 CODE:
1964{ 2078{
1965 static float color[16][3] = { 2079 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2080 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2081 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2131 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2132 glDisable (GL_TEXTURE_2D);
2019} 2133}
2020 2134
2021void 2135void
2022fow_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)
2023 PPCODE: 2137 PPCODE:
2024{ 2138{
2025 int x, y; 2139 int x, y;
2026 int sw1 = sw + 2; 2140 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2141 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2212 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2213 PUSHs (darkness3_sv);
2100} 2214}
2101 2215
2102SV * 2216SV *
2103get_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)
2104 CODE: 2218 CODE:
2105{ 2219{
2106 int x, y, x1, y1; 2220 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2221 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2222 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2287}
2174 OUTPUT: 2288 OUTPUT:
2175 RETVAL 2289 RETVAL
2176 2290
2177void 2291void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2292set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2293 PPCODE:
2180{ 2294{
2181 int x, y, z; 2295 int x, y, z;
2182 int w, h; 2296 int w, h;
2183 int x1, y1; 2297 int x1, y1;
2184 2298
2185 if (*data++ != 0) 2299 if (*data++ != 0)
2186 return; /* version mismatch */ 2300 XSRETURN_EMPTY; /* version mismatch */
2187 2301
2188 w = *data++ << 8; w |= *data++; 2302 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2303 h = *data++ << 8; h |= *data++;
2190 2304
2191 // 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
2236 } 2350 }
2237 } 2351 }
2238 } 2352 }
2239} 2353}
2240 2354
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2355MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2356
2243CFPlus::RW 2357DC::RW
2244new (SV *class, SV *data_sv) 2358new (SV *class, SV *data_sv)
2245 CODE: 2359 CODE:
2246{ 2360{
2247 STRLEN datalen; 2361 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2362 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2364 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2365}
2252 OUTPUT: 2366 OUTPUT:
2253 RETVAL 2367 RETVAL
2254 2368
2255CFPlus::RW 2369DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2370new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2371 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2372 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2373 OUTPUT:
2260 RETVAL 2374 RETVAL
2261 2375
2376# fails on win32:
2377# dc.xs(2268) : error C2059: syntax error : '('
2262void 2378#void
2263close (CFPlus::RW self) 2379#close (DC::RW self)
2264 CODE: 2380# CODE:
2265 SDL_RWclose (self); 2381# (self->(close)) (self);
2266 2382
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2383MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2384
2269PROTOTYPES: DISABLE 2385PROTOTYPES: DISABLE
2270 2386
2271void 2387DC::Channel
2272halt (CFPlus::Channel self) 2388find ()
2273 CODE: 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
2274 Mix_HaltChannel (self); 2400 Mix_HaltChannel (RETVAL);
2401 }
2275 2402
2276void 2403 Mix_UnregisterAllEffects (RETVAL);
2277expire (CFPlus::Channel self, int ticks = -1) 2404 Mix_Volume (RETVAL, 128);
2278 CODE: 2405}
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT: 2406 OUTPUT:
2291 RETVAL 2407 RETVAL
2292 2408
2293void 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
2294unregister_all_effects (CFPlus::Channel self) 2432unregister_all_effects (DC::Channel self)
2295 CODE: 2433 CODE:
2296 Mix_UnregisterAllEffects (self); 2434 Mix_UnregisterAllEffects (self);
2297 2435
2298void 2436void
2299set_panning (CFPlus::Channel self, int left, int right) 2437set_panning (DC::Channel self, int left, int right)
2300 CODE: 2438 CODE:
2439 left = CLAMP (left , 0, 255);
2440 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2441 Mix_SetPanning (self, left, right);
2302 2442
2303void 2443void
2304set_distance (CFPlus::Channel self, int distance) 2444set_distance (DC::Channel self, int distance)
2305 CODE: 2445 CODE:
2306 Mix_SetDistance (self, distance); 2446 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2447
2308void 2448void
2309set_position (CFPlus::Channel self, int angle, int distance) 2449set_position (DC::Channel self, int angle, int distance)
2310 CODE: 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);
2311 Mix_SetPosition (self, angle, distance); 2458 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2459}
2312 2460
2313void 2461void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2462set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2463 CODE:
2316 Mix_SetReverseStereo (self, flip); 2464 Mix_SetReverseStereo (self, flip);
2317 2465
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2466MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2467
2320PROTOTYPES: DISABLE 2468PROTOTYPES: DISABLE
2321 2469
2322CFPlus::MixChunk 2470DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2471new (SV *class, DC::RW rwops)
2324 CODE: 2472 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2473 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2474 OUTPUT:
2327 RETVAL 2475 RETVAL
2328 2476
2329void 2477void
2330DESTROY (CFPlus::MixChunk self) 2478DESTROY (DC::MixChunk self)
2331 CODE: 2479 CODE:
2332 Mix_FreeChunk (self); 2480 Mix_FreeChunk (self);
2333 2481
2334int 2482int
2335volume (CFPlus::MixChunk self, int volume = -1) 2483volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2484 CODE:
2485 if (items > 1)
2486 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2487 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2488 OUTPUT:
2339 RETVAL 2489 RETVAL
2340 2490
2341CFPlus::Channel 2491DC::Channel
2342play (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)
2343 CODE: 2493 CODE:
2494{
2344 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 {
2345 Mix_UnregisterAllEffects (RETVAL); 2502 Mix_UnregisterAllEffects (RETVAL);
2503 Mix_Volume (RETVAL, 128);
2504 }
2505}
2346 OUTPUT: 2506 OUTPUT:
2347 RETVAL 2507 RETVAL
2348 2508
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2509MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2510
2351int 2511int
2352volume (int volume = -1) 2512volume (int volume = -1)
2353 PROTOTYPE: ;$ 2513 PROTOTYPE: ;$
2354 CODE: 2514 CODE:
2515 if (items > 0)
2516 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2517 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2518 OUTPUT:
2357 RETVAL 2519 RETVAL
2358 2520
2359void 2521void
2364void 2526void
2365halt () 2527halt ()
2366 CODE: 2528 CODE:
2367 Mix_HaltMusic (); 2529 Mix_HaltMusic ();
2368 2530
2369CFPlus::MixMusic 2531DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2532new (SV *class, DC::RW rwops)
2371 CODE: 2533 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2534 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2535 OUTPUT:
2374 RETVAL 2536 RETVAL
2375 2537
2376void 2538void
2377DESTROY (CFPlus::MixMusic self) 2539DESTROY (DC::MixMusic self)
2378 CODE: 2540 CODE:
2379 Mix_FreeMusic (self); 2541 Mix_FreeMusic (self);
2380 2542
2381int 2543int
2382play (CFPlus::MixMusic self, int loops = -1) 2544play (DC::MixMusic self, int loops = -1)
2383 CODE: 2545 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2546 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2547 OUTPUT:
2386 RETVAL 2548 RETVAL
2387 2549
2388void 2550void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2551fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2552 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2553 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2554
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2555MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2556
2395PROTOTYPES: ENABLE 2557PROTOTYPES: ENABLE
2396 2558
2397BOOT: 2559BOOT:
2398{ 2560{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2561 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2562 static const struct {
2401 const char *name; 2563 const char *name;
2402 IV iv; 2564 IV iv;
2403 } *civ, const_iv[] = { 2565 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2566# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2601 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2602 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2603 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2604 const_iv (GL_FLOAT),
2443 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),
2444 const_iv (GL_COMPILE), 2612 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2613 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2614 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2615 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2616 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2655 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2656 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2657 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2658 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2659 const_iv (GL_GENERATE_MIPMAP_HINT),
2660 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2661 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2662 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2663 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2664 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2665 const_iv (GL_V3F),
2504 2673
2505 texture_av = newAV (); 2674 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2675 AvREAL_off (texture_av);
2507} 2676}
2508 2677
2678void
2679disable_GL_EXT_blend_func_separate ()
2680 CODE:
2681 gl.BlendFuncSeparate = 0;
2682 gl.BlendFuncSeparateEXT = 0;
2683
2509char * 2684char *
2510gl_vendor () 2685gl_vendor ()
2511 CODE: 2686 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2687 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2688 OUTPUT:
2634 2809
2635void glRect (float x1, float y1, float x2, float y2) 2810void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2811 CODE:
2637 glRectf (x1, y1, x2, y2); 2812 glRectf (x1, y1, x2, y2);
2638 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
2639PROTOTYPES: ENABLE 2823PROTOTYPES: ENABLE
2640 2824
2641void glBegin (int mode) 2825void glBegin (int mode)
2642 2826
2643void glEnd () 2827void glEnd ()
2675void 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)
2676 CODE: 2860 CODE:
2677 if (gl.SeparableFilter2D) 2861 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2862 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2863
2680void 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)
2681 2865
2682void 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)
2683 2867
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2868void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2869
2711 2895
2712void glEndList () 2896void glEndList ()
2713 2897
2714void glCallList (int list) 2898void glCallList (int list)
2715 2899
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2900MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 2901
2718PROTOTYPES: DISABLE 2902PROTOTYPES: DISABLE
2719 2903
2720void 2904void
2721find_widget (SV *self, NV x, NV y) 2905find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 2909 XPUSHs (self);
2726} 2910}
2727 2911
2728BOOT: 2912BOOT:
2729{ 2913{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2914 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 2915
2732 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);
2733 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);
2734 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);
2735 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);
2736} 2920}
2737 2921
2738void 2922void
2739draw (SV *self) 2923draw (SV *self)
2740 CODE: 2924 CODE:
2744 NV x, y, w, h; 2928 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2929 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2930 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2931 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2932 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2933 double draw_x, draw_y;
2751 2934
2752 if (!SvROK (self)) 2935 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2936 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2937
2755 hv = (HV *)SvRV (self); 2938 hv = (HV *)SvRV (self);
2756 2939
2757 if (SvTYPE (hv) != SVt_PVHV) 2940 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2941 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 2942
2760 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.;
2761 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.;
2762 2945
2763 if (!h || !w) 2946 if (!h || !w)
2783 { 2966 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2967 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2968
2786 if (svp && SvTRUE (*svp)) 2969 if (svp && SvTRUE (*svp))
2787 { 2970 {
2788 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);
2789 glEnable (GL_BLEND); 2972 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2973 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2974 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2975 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2976 glVertex2f (w, 0);
2796 glEnd (); 2979 glEnd ();
2797 glDisable (GL_BLEND); 2980 glDisable (GL_BLEND);
2798 } 2981 }
2799 } 2982 }
2800#if 0 2983#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2984 // draw borders, for debugging
2802 glPushMatrix; 2985 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2986 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2987 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2988 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2989 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2990 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2991 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2992 glVertex2f (0 , h - 1);
2810 glEnd; 2993 glEnd ();
2811 glPopMatrix; 2994 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 2995#endif
2815 PUSHMARK (SP); 2996 PUSHMARK (SP);
2816 XPUSHs (self); 2997 XPUSHs (self);
2817 PUTBACK; 2998 PUTBACK;
2818 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