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.224 by root, Sat Aug 11 11:21:46 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC

… …
120 120
121#include "pango-font.c" 121#include "pango-font.c"
122#include "pango-fontmap.c" 122#include "pango-fontmap.c"
123#include "pango-render.c" 123#include "pango-render.c"
124 124
125typedef IV CFPlus__Channel; 125typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 126typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *DC__MixMusic;
129 129
130typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *DC__Font;
131 131
132static int 132static int
133shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
134{ 134{
135 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
… …
149 149
150typedef struct cf_layout { 150typedef struct cf_layout {
151 PangoLayout *pl; 151 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
153 int base_height; 153 int base_height;
154 CFPlus__Font font; 154 DC__Font font;
155 rc_t *rc;
155} *CFPlus__Layout; 156} *DC__Layout;
156 157
157static CFPlus__Font default_font; 158static DC__Font default_font;
158static PangoContext *opengl_context; 159static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
160 161
161static void 162static void
162substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
… …
167#endif 168#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 170}
170 171
171static void 172static void
172layout_update_font (CFPlus__Layout self) 173layout_update_font (DC__Layout self)
173{ 174{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 175 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
176 */ 177 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
… …
181 182
182 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
183} 184}
184 185
185static void 186static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 188{
188 PangoRectangle rect; 189 PangoRectangle rect;
189 190
190 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
… …
202 203
203typedef uint16_t tileid; 204typedef uint16_t tileid;
204typedef uint16_t faceid; 205typedef uint16_t faceid;
205 206
206typedef struct { 207typedef struct {
207 int name; 208 GLuint name;
208 int w, h; 209 int w, h;
209 float s, t; 210 float s, t;
210 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
211 tileid smoothtile; 212 tileid smoothtile;
212 uint8_t smoothlevel; 213 uint8_t smoothlevel;
… …
230 int faces; tileid *face2tile; // [faceid] 231 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 232 int texs; maptex *tex; // [tileid]
232 233
233 int32_t rows; 234 int32_t rows;
234 maprow *row; 235 maprow *row;
235} *CFPlus__Map; 236} *DC__Map;
236 237
237static char * 238static char *
238prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
239{ 240{
240 char *p; 241 char *p;
… …
278 self->texs *= 2; 279 self->texs *= 2;
279 } 280 }
280} 281}
281 282
282static maprow * 283static maprow *
283map_get_row (CFPlus__Map self, int y) 284map_get_row (DC__Map self, int y)
284{ 285{
285 if (0 > y) 286 if (0 > y)
286 { 287 {
287 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
… …
326 327
327 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
328} 329}
329 330
330static mapcell * 331static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (DC__Map self, int x, int y)
332{ 333{
333 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
334} 335}
335 336
336static void 337static void
337map_clear (CFPlus__Map self) 338map_clear (DC__Map self)
338{ 339{
339 int r; 340 int r;
340 341
341 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
… …
350 self->row = 0; 351 self->row = 0;
351 self->rows = 0; 352 self->rows = 0;
352} 353}
353 354
354static void 355static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 356map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 357{
357 int x, y; 358 int x, y;
358 maprow *row; 359 maprow *row;
359 mapcell *cell; 360 mapcell *cell;
360 361
… …
439 n |= n >> 16; 440 n |= n >> 16;
440 441
441 return n + 1; 442 return n + 1;
442} 443}
443 444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
454}
455
444/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
447 459
448/******************************************************************************/ 460/******************************************************************************/
… …
486 return 0; 498 return 0;
487 499
488 return 1; 500 return 1;
489} 501}
490 502
491MODULE = CFPlus PACKAGE = CFPlus 503MODULE = Deliantra::Client PACKAGE = DC
492 504
493PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
494 506
495BOOT: 507BOOT:
496{ 508{
497 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 510 static const struct {
499 const char *name; 511 const char *name;
500 IV iv; 512 IV iv;
501 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
… …
524 536
525 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
528 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
… …
605 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
610# undef const_iv 626# undef const_iv
611 }; 627 };
612 628
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
631 RETVAL 647 RETVAL
632 648
633NV floor (NV x) 649NV floor (NV x)
634 650
635NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
636 656
637void 657void
638pango_init () 658pango_init ()
639 CODE: 659 CODE:
640{ 660{
… …
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 701
682 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
683 while (*m) 703 while (*m)
684 { 704 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 480)
686 { 706 {
687 AV *av = newAV (); 707 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
… …
714 734
715 if (RETVAL) 735 if (RETVAL)
716 { 736 {
717 av_clear (texture_av); 737 av_clear (texture_av);
718 738
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 740#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 741#include "glfunc.h"
722#undef GL_FUNC 742#undef GL_FUNC
723 } 743 }
724} 744}
… …
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 827 break;
808 } 828 }
809 829
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 830 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 831 }
812} 832}
813 833
814int 834int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 836 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
839
840void
841Mix_QuerySpec ()
842 PPCODE:
843{
844 int freq, channels;
845 Uint16 format;
846
847 if (Mix_QuerySpec (&freq, &format, &channels))
848 {
849 EXTEND (SP, 3);
850 PUSHs (sv_2mortal (newSViv (freq)));
851 PUSHs (sv_2mortal (newSViv (format)));
852 PUSHs (sv_2mortal (newSViv (channels)));
853 }
854}
819 855
820void 856void
821Mix_CloseAudio () 857Mix_CloseAudio ()
822 858
823int 859int
… …
957void 993void
958error (char *message) 994error (char *message)
959 CODE: 995 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 997#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 999#endif
964 1000
965void 1001void
966fatal (char *message) 1002fatal (char *message)
967 CODE: 1003 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1005#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1007#endif
972 _exit (1); 1008 _exit (1);
973 1009
974void 1010void
975_exit (int retval = 0) 1011_exit (int retval = 0)
… …
987#if DEBUG 1023#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1024 VALGRIND_DO_LEAK_CHECK;
989#endif 1025#endif
990} 1026}
991 1027
992MODULE = CFPlus PACKAGE = CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = DC::Font
993 1029
994PROTOTYPES: DISABLE 1030PROTOTYPES: DISABLE
995 1031
996CFPlus::Font 1032DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1034 CODE:
999{ 1035{
1000 int count; 1036 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
1004} 1040}
1005 OUTPUT: 1041 OUTPUT:
1006 RETVAL 1042 RETVAL
1007 1043
1008void 1044void
1009DESTROY (CFPlus::Font self) 1045DESTROY (DC::Font self)
1010 CODE: 1046 CODE:
1011 pango_font_description_free (self); 1047 pango_font_description_free (self);
1012 1048
1013void 1049void
1014make_default (CFPlus::Font self) 1050make_default (DC::Font self)
1015 PROTOTYPE: $ 1051 PROTOTYPE: $
1016 CODE: 1052 CODE:
1017 default_font = self; 1053 default_font = self;
1018 1054
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1056
1021PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1022 1058
1023void 1059void
1024reset_glyph_cache () 1060glyph_cache_backup ()
1025 PROTOTYPE: 1061 PROTOTYPE:
1026 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1027 tc_clear (); 1069 tc_restore ();
1028 1070
1029CFPlus::Layout 1071DC::Layout
1030new (SV *class) 1072new (SV *class)
1031 CODE: 1073 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
1033 1075
1034 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
… …
1036 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1041 1084
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1044 OUTPUT: 1087 OUTPUT:
1045 RETVAL 1088 RETVAL
1046 1089
1047void 1090void
1048DESTROY (CFPlus::Layout self) 1091DESTROY (DC::Layout self)
1049 CODE: 1092 CODE:
1050 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1051 Safefree (self); 1095 Safefree (self);
1052 1096
1053void 1097void
1054set_text (CFPlus::Layout self, SV *text_) 1098set_text (DC::Layout self, SV *text_)
1055 CODE: 1099 CODE:
1056{ 1100{
1057 STRLEN textlen; 1101 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
1059 1103
1060 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
1061} 1105}
1062 1106
1063void 1107void
1064set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (DC::Layout self, SV *text_)
1065 CODE: 1109 CODE:
1066{ 1110{
1067 STRLEN textlen; 1111 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
1069 1113
1070 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
1071} 1115}
1072 1116
1073void 1117void
1074set_shapes (CFPlus::Layout self, ...) 1118set_shapes (DC::Layout self, ...)
1075 CODE: 1119 CODE:
1076{ 1120{
1077 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1123 const char *pos = text;
… …
1114 if (attrs) 1158 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
1116} 1160}
1117 1161
1118void 1162void
1119get_shapes (CFPlus::Layout self) 1163get_shapes (DC::Layout self)
1120 PPCODE: 1164 PPCODE:
1121{ 1165{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1167
1124 do 1168 do
… …
1139 1183
1140 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
1141} 1185}
1142 1186
1143int 1187int
1144has_wrapped (CFPlus::Layout self) 1188has_wrapped (DC::Layout self)
1145 CODE: 1189 CODE:
1146{ 1190{
1147 int lines = 1; 1191 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1149 1193
… …
1154} 1198}
1155 OUTPUT: 1199 OUTPUT:
1156 RETVAL 1200 RETVAL
1157 1201
1158SV * 1202SV *
1159get_text (CFPlus::Layout self) 1203get_text (DC::Layout self)
1160 CODE: 1204 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1207 OUTPUT:
1164 RETVAL 1208 RETVAL
1165 1209
1166void 1210void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1211set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1212 CODE:
1169 self->r = r; 1213 self->r = r;
1170 self->g = g; 1214 self->g = g;
1171 self->b = b; 1215 self->b = b;
1172 self->a = a; 1216 self->a = a;
1173 1217
1174void 1218void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1220 CODE:
1177 if (self->font != font) 1221 if (self->font != font)
1178 { 1222 {
1179 self->font = font; 1223 self->font = font;
1180 layout_update_font (self); 1224 layout_update_font (self);
1181 } 1225 }
1182 1226
1183void 1227void
1184set_height (CFPlus::Layout self, int base_height) 1228set_height (DC::Layout self, int base_height)
1185 CODE: 1229 CODE:
1186 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
1187 { 1231 {
1188 self->base_height = base_height; 1232 self->base_height = base_height;
1189 layout_update_font (self); 1233 layout_update_font (self);
1190 } 1234 }
1191 1235
1192void 1236void
1193set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1238 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1239 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1240
1197void 1241void
1198set_indent (CFPlus::Layout self, int indent) 1242set_indent (DC::Layout self, int indent)
1199 CODE: 1243 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1245
1202void 1246void
1203set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (DC::Layout self, int spacing)
1204 CODE: 1248 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1250
1207void 1251void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1253 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1215 ); 1259 );
1216 1260
1217void 1261void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1263 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1265
1222void 1266void
1223size (CFPlus::Layout self) 1267size (DC::Layout self)
1224 PPCODE: 1268 PPCODE:
1225{ 1269{
1226 int w, h; 1270 int w, h;
1227 1271
1228 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
… …
1231 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1233} 1277}
1234 1278
1235int 1279int
1236descent (CFPlus::Layout self) 1280descent (DC::Layout self)
1237 CODE: 1281 CODE:
1238{ 1282{
1239 PangoRectangle rect; 1283 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
… …
1243} 1287}
1244 OUTPUT: 1288 OUTPUT:
1245 RETVAL 1289 RETVAL
1246 1290
1247int 1291int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1293 CODE:
1250{ 1294{
1251 int index, trailing; 1295 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1296 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1297 RETVAL = index + trailing;
1254} 1298}
1255 OUTPUT: 1299 OUTPUT:
1256 RETVAL 1300 RETVAL
1257 1301
1258void 1302void
1259cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1304 PPCODE:
1261{ 1305{
1262 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1264 1308
… …
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1269} 1313}
1270 1314
1271void 1315void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1316index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1317 PPCODE:
1274{ 1318{
1275 int line, x; 1319 int line, x;
1276 1320
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line;
1326#endif
1279 1327
1280 EXTEND (SP, 2); 1328 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1329 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1331}
1284 1332
1285void 1333void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1334line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1335 PPCODE:
1288{ 1336{
1289 PangoLayoutLine *lp; 1337 PangoLayoutLine *lp;
1290 int index, trailing; 1338 int index, trailing;
1291 1339
… …
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1354 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1355 }
1308} 1356}
1309 1357
1310void 1358void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1359render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1360 CODE:
1361 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1362 pango_opengl_render_layout_subpixel (
1314 self->pl, 1363 self->pl,
1364 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1365 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1366 self->r, self->g, self->b, self->a,
1317 flags 1367 flags
1318 ); 1368 );
1369 // we assume that context_change actually clears/frees stuff
1370 // and does not do any recomputation...
1371 pango_layout_context_changed (self->pl);
1319 1372
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1373void
1374draw (DC::Layout self)
1375 CODE:
1376{
1377 glEnable (GL_TEXTURE_2D);
1378 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1379 glEnable (GL_BLEND);
1380 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1381 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1382 glEnable (GL_ALPHA_TEST);
1383 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1384
1385 rc_draw (self->rc);
1386
1387 glDisable (GL_ALPHA_TEST);
1388 glDisable (GL_BLEND);
1389 glDisable (GL_TEXTURE_2D);
1390}
1391
1392MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1393
1322PROTOTYPES: ENABLE 1394PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1395
1326void 1396void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1397pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1398 CODE:
1329{ 1399{
… …
1406 RETVAL = width > 0; 1476 RETVAL = width > 0;
1407} 1477}
1408 OUTPUT: 1478 OUTPUT:
1409 RETVAL 1479 RETVAL
1410 1480
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1481MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1482
1413PROTOTYPES: DISABLE 1483PROTOTYPES: DISABLE
1414 1484
1415CFPlus::Map 1485DC::Map
1416new (SV *class) 1486new (SV *class)
1417 CODE: 1487 CODE:
1418 New (0, RETVAL, 1, struct map); 1488 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1489 RETVAL->x = 0;
1420 RETVAL->y = 0; 1490 RETVAL->y = 0;
… …
1428 RETVAL->row = 0; 1498 RETVAL->row = 0;
1429 OUTPUT: 1499 OUTPUT:
1430 RETVAL 1500 RETVAL
1431 1501
1432void 1502void
1433DESTROY (CFPlus::Map self) 1503DESTROY (DC::Map self)
1434 CODE: 1504 CODE:
1435{ 1505{
1436 map_clear (self); 1506 map_clear (self);
1437 Safefree (self->face2tile); 1507 Safefree (self->face2tile);
1438 Safefree (self->tex); 1508 Safefree (self->tex);
1439 Safefree (self); 1509 Safefree (self);
1440} 1510}
1441 1511
1442void 1512void
1443resize (CFPlus::Map self, int map_width, int map_height) 1513resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1514 CODE:
1445 self->w = map_width; 1515 self->w = map_width;
1446 self->h = map_height; 1516 self->h = map_height;
1447 1517
1448void 1518void
1449clear (CFPlus::Map self) 1519clear (DC::Map self)
1450 CODE: 1520 CODE:
1451 map_clear (self); 1521 map_clear (self);
1452 1522
1453void 1523void
1454set_tileid (CFPlus::Map self, int face, int tile) 1524set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1525 CODE:
1456{ 1526{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1527 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1528 need_texid (self, tile);
1459} 1529}
1460 1530
1461void 1531void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1532set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1533 CODE:
1464{ 1534{
1465 tileid texid; 1535 tileid texid;
1466 maptex *tex; 1536 maptex *tex;
1467 1537
… …
1480 tex->smoothtile = self->face2tile [smooth]; 1550 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1551 tex->smoothlevel = level;
1482} 1552}
1483 1553
1484void 1554void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1555set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1556 CODE:
1487{ 1557{
1488 need_texid (self, texid); 1558 need_texid (self, texid);
1489 1559
1490 { 1560 {
… …
1510 // from transparent color bleeding and ugly wrapping effects. 1580 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1582}
1513 1583
1514int 1584int
1515ox (CFPlus::Map self) 1585ox (DC::Map self)
1516 ALIAS: 1586 ALIAS:
1517 oy = 1 1587 oy = 1
1518 x = 2 1588 x = 2
1519 y = 3 1589 y = 3
1520 w = 4 1590 w = 4
… …
1531 } 1601 }
1532 OUTPUT: 1602 OUTPUT:
1533 RETVAL 1603 RETVAL
1534 1604
1535void 1605void
1536scroll (CFPlus::Map self, int dx, int dy) 1606scroll (DC::Map self, int dx, int dy)
1537 CODE: 1607 CODE:
1538{ 1608{
1539 if (dx > 0) 1609 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1610 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1611 else if (dx < 0)
… …
1557 self->y += MAP_EXTEND_Y; 1627 self->y += MAP_EXTEND_Y;
1558 } 1628 }
1559} 1629}
1560 1630
1561SV * 1631SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1632map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1633 CODE:
1564{ 1634{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1636 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1637 mapcell *cell;
… …
1656} 1726}
1657 OUTPUT: 1727 OUTPUT:
1658 RETVAL 1728 RETVAL
1659 1729
1660SV * 1730SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1731mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 1732 CODE:
1663{ 1733{
1664 int x1, x; 1734 int x1, x;
1665 int y1, y; 1735 int y1, y;
1666 int z; 1736 int z;
… …
1711} 1781}
1712 OUTPUT: 1782 OUTPUT:
1713 RETVAL 1783 RETVAL
1714 1784
1715void 1785void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1786draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1717 CODE: 1787 CODE:
1718{ 1788{
1719 int x, y, z; 1789 int x, y, z;
1720 1790
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1792 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1793 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 1794 smooth_key skey;
1725 1795
1726 rc_t *rc = rc_alloc (); 1796 rc_t *rc = rc_alloc ();
1727 rc_key_t key; 1797 rc_key_t key;
1728 rc_array_t *arr; 1798 rc_array_t *arr;
… …
1790 if (tile) 1860 if (tile)
1791 { 1861 {
1792 maptex tex = self->tex [tile]; 1862 maptex tex = self->tex [tile];
1793 int px, py; 1863 int px, py;
1794 1864
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 1865 if (key.texname != tex.name)
1798 { 1866 {
1799 if (!tex.name) 1867 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 1868 tex = self->tex [2]; /* missing, replace by noface */
1801 1869
… …
1884 // go through all smoothlevels, lowest to highest, then draw. 1952 // go through all smoothlevels, lowest to highest, then draw.
1885 // this is basically counting sort 1953 // this is basically counting sort
1886 { 1954 {
1887 int w, b; 1955 int w, b;
1888 1956
1957 glEnable (GL_TEXTURE_2D);
1958 glBegin (GL_QUADS);
1889 for (w = 0; w < 256 / 32; ++w) 1959 for (w = 0; w < 256 / 32; ++w)
1890 { 1960 {
1891 uint32_t smask = smooth_level [w]; 1961 uint32_t smask = smooth_level [w];
1892 if (smask) 1962 if (smask)
1893 for (b = 0; b < 32; ++b) 1963 for (b = 0; b < 32; ++b)
… …
1918 { 1988 {
1919 // this time avoiding texture state changes 1989 // this time avoiding texture state changes
1920 // save gobs of state changes. 1990 // save gobs of state changes.
1921 if (key.texname != tex.name) 1991 if (key.texname != tex.name)
1922 { 1992 {
1993 glEnd ();
1923 key.texname = tex.name; 1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1924 arr = rc_array (rc, &key); 1995 glBegin (GL_QUADS);
1925 } 1996 }
1926 1997
1927 if (border) 1998 if (border)
1928 { 1999 {
1929 float ox = border * dx; 2000 float ox = border * dx;
1930 2001
1931 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1932 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1933 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1934 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1935 } 2006 }
1936 2007
1937 if (corner) 2008 if (corner)
1938 { 2009 {
1939 float ox = corner * dx; 2010 float ox = corner * dx;
1940 2011
1941 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1942 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1943 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1944 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1945 } 2016 }
1946 } 2017 }
1947 } 2018 }
1948 } 2019 }
1949 } 2020 }
1950 } 2021 }
2022
2023 glEnd ();
2024 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1;
1951 } 2026 }
1952 2027
1953 hv_clear (smooth); 2028 hv_clear (smooth);
1954 rc_draw (rc);
1955 rc_clear (rc);
1956 } 2029 }
1957 2030
1958 glDisable (GL_BLEND); 2031 glDisable (GL_BLEND);
1959 rc_free (rc); 2032 rc_free (rc);
1960 2033
… …
1989 } 2062 }
1990 } 2063 }
1991} 2064}
1992 2065
1993void 2066void
1994draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2067draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1995 CODE: 2068 CODE:
1996{ 2069{
1997 static float color[16][3] = { 2070 static float color[16][3] = {
1998 { 0.00F, 0.00F, 0.00F }, 2071 { 0.00F, 0.00F, 0.00F },
1999 { 1.00F, 1.00F, 1.00F }, 2072 { 1.00F, 1.00F, 1.00F },
… …
2049 glDisable (GL_BLEND); 2122 glDisable (GL_BLEND);
2050 glDisable (GL_TEXTURE_2D); 2123 glDisable (GL_TEXTURE_2D);
2051} 2124}
2052 2125
2053void 2126void
2054fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2127fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2055 PPCODE: 2128 PPCODE:
2056{ 2129{
2057 int x, y; 2130 int x, y;
2058 int sw1 = sw + 2; 2131 int sw1 = sw + 2;
2059 int sh1 = sh + 2; 2132 int sh1 = sh + 2;
… …
2130 PUSHs (sv_2mortal (newSViv (sh3))); 2203 PUSHs (sv_2mortal (newSViv (sh3)));
2131 PUSHs (darkness3_sv); 2204 PUSHs (darkness3_sv);
2132} 2205}
2133 2206
2134SV * 2207SV *
2135get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2208get_rect (DC::Map self, int x0, int y0, int w, int h)
2136 CODE: 2209 CODE:
2137{ 2210{
2138 int x, y, x1, y1; 2211 int x, y, x1, y1;
2139 SV *data_sv = newSV (w * h * 7 + 5); 2212 SV *data_sv = newSV (w * h * 7 + 5);
2140 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2213 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2205} 2278}
2206 OUTPUT: 2279 OUTPUT:
2207 RETVAL 2280 RETVAL
2208 2281
2209void 2282void
2210set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2283set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2211 PPCODE: 2284 PPCODE:
2212{ 2285{
2213 int x, y, z; 2286 int x, y, z;
2214 int w, h; 2287 int w, h;
2215 int x1, y1; 2288 int x1, y1;
2216 2289
2217 if (*data++ != 0) 2290 if (*data++ != 0)
2218 return; /* version mismatch */ 2291 XSRETURN_EMPTY; /* version mismatch */
2219 2292
2220 w = *data++ << 8; w |= *data++; 2293 w = *data++ << 8; w |= *data++;
2221 h = *data++ << 8; h |= *data++; 2294 h = *data++ << 8; h |= *data++;
2222 2295
2223 // we need to do this 'cause we don't keep an absolute coord system for rows 2296 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2268 } 2341 }
2269 } 2342 }
2270 } 2343 }
2271} 2344}
2272 2345
2273MODULE = CFPlus PACKAGE = CFPlus::RW 2346MODULE = Deliantra::Client PACKAGE = DC::RW
2274 2347
2275CFPlus::RW 2348DC::RW
2276new (SV *class, SV *data_sv) 2349new (SV *class, SV *data_sv)
2277 CODE: 2350 CODE:
2278{ 2351{
2279 STRLEN datalen; 2352 STRLEN datalen;
2280 char *data = SvPVbyte (data_sv, datalen); 2353 char *data = SvPVbyte (data_sv, datalen);
… …
2282 RETVAL = SDL_RWFromConstMem (data, datalen); 2355 RETVAL = SDL_RWFromConstMem (data, datalen);
2283} 2356}
2284 OUTPUT: 2357 OUTPUT:
2285 RETVAL 2358 RETVAL
2286 2359
2287CFPlus::RW 2360DC::RW
2288new_from_file (SV *class, const char *path, const char *mode = "rb") 2361new_from_file (SV *class, const char *path, const char *mode = "rb")
2289 CODE: 2362 CODE:
2290 RETVAL = SDL_RWFromFile (path, mode); 2363 RETVAL = SDL_RWFromFile (path, mode);
2291 OUTPUT: 2364 OUTPUT:
2292 RETVAL 2365 RETVAL
2293 2366
2294# fails on win32: 2367# fails on win32:
2295# CFPlus.xs(2268) : error C2059: syntax error : '(' 2368# dc.xs(2268) : error C2059: syntax error : '('
2296#void 2369#void
2297#close (CFPlus::RW self) 2370#close (DC::RW self)
2298# CODE: 2371# CODE:
2299# (self->(close)) (self); 2372# (self->(close)) (self);
2300 2373
2301MODULE = CFPlus PACKAGE = CFPlus::Channel 2374MODULE = Deliantra::Client PACKAGE = DC::Channel
2302 2375
2303PROTOTYPES: DISABLE 2376PROTOTYPES: DISABLE
2304 2377
2305CFPlus::Channel 2378DC::Channel
2306find () 2379find ()
2307 CODE: 2380 CODE:
2308{ 2381{
2309 RETVAL = Mix_GroupAvailable (-1); 2382 RETVAL = Mix_GroupAvailable (-1);
2310 2383
… …
2323} 2396}
2324 OUTPUT: 2397 OUTPUT:
2325 RETVAL 2398 RETVAL
2326 2399
2327void 2400void
2328halt (CFPlus::Channel self) 2401halt (DC::Channel self)
2329 CODE: 2402 CODE:
2330 Mix_HaltChannel (self); 2403 Mix_HaltChannel (self);
2331 2404
2332void 2405void
2333expire (CFPlus::Channel self, int ticks = -1) 2406expire (DC::Channel self, int ticks = -1)
2334 CODE: 2407 CODE:
2335 Mix_ExpireChannel (self, ticks); 2408 Mix_ExpireChannel (self, ticks);
2336 2409
2337void 2410void
2338fade_out (CFPlus::Channel self, int ticks = -1) 2411fade_out (DC::Channel self, int ticks = -1)
2339 CODE: 2412 CODE:
2340 Mix_FadeOutChannel (self, ticks); 2413 Mix_FadeOutChannel (self, ticks);
2341 2414
2342int 2415int
2343volume (CFPlus::Channel self, int volume) 2416volume (DC::Channel self, int volume)
2344 CODE: 2417 CODE:
2345 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2418 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2346 OUTPUT: 2419 OUTPUT:
2347 RETVAL 2420 RETVAL
2348 2421
2349void 2422void
2350unregister_all_effects (CFPlus::Channel self) 2423unregister_all_effects (DC::Channel self)
2351 CODE: 2424 CODE:
2352 Mix_UnregisterAllEffects (self); 2425 Mix_UnregisterAllEffects (self);
2353 2426
2354void 2427void
2355set_panning (CFPlus::Channel self, int left, int right) 2428set_panning (DC::Channel self, int left, int right)
2356 CODE: 2429 CODE:
2357 left = CLAMP (left , 0, 255); 2430 left = CLAMP (left , 0, 255);
2358 right = CLAMP (right, 0, 255); 2431 right = CLAMP (right, 0, 255);
2359 Mix_SetPanning (self, left, right); 2432 Mix_SetPanning (self, left, right);
2360 2433
2361void 2434void
2362set_distance (CFPlus::Channel self, int distance) 2435set_distance (DC::Channel self, int distance)
2363 CODE: 2436 CODE:
2364 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2437 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2365 2438
2366void 2439void
2367set_position (CFPlus::Channel self, int angle, int distance) 2440set_position (DC::Channel self, int angle, int distance)
2368 CODE: 2441 CODE:
2369 2442
2370void 2443void
2371set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2372 CODE: 2445 CODE:
2373{ 2446{
2374 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2447 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2375 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2448 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2376 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2377} 2450}
2378 2451
2379void 2452void
2380set_reverse_stereo (CFPlus::Channel self, int flip) 2453set_reverse_stereo (DC::Channel self, int flip)
2381 CODE: 2454 CODE:
2382 Mix_SetReverseStereo (self, flip); 2455 Mix_SetReverseStereo (self, flip);
2383 2456
2384MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2385 2458
2386PROTOTYPES: DISABLE 2459PROTOTYPES: DISABLE
2387 2460
2388CFPlus::MixChunk 2461DC::MixChunk
2389new (SV *class, CFPlus::RW rwops) 2462new (SV *class, DC::RW rwops)
2390 CODE: 2463 CODE:
2391 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2464 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2392 OUTPUT: 2465 OUTPUT:
2393 RETVAL 2466 RETVAL
2394 2467
2395void 2468void
2396DESTROY (CFPlus::MixChunk self) 2469DESTROY (DC::MixChunk self)
2397 CODE: 2470 CODE:
2398 Mix_FreeChunk (self); 2471 Mix_FreeChunk (self);
2399 2472
2400int 2473int
2401volume (CFPlus::MixChunk self, int volume = -1) 2474volume (DC::MixChunk self, int volume = -1)
2402 CODE: 2475 CODE:
2403 if (items > 1) 2476 if (items > 1)
2404 volume = CLAMP (volume, 0, 128); 2477 volume = CLAMP (volume, 0, 128);
2405 RETVAL = Mix_VolumeChunk (self, volume); 2478 RETVAL = Mix_VolumeChunk (self, volume);
2406 OUTPUT: 2479 OUTPUT:
2407 RETVAL 2480 RETVAL
2408 2481
2409CFPlus::Channel 2482DC::Channel
2410play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2483play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2411 CODE: 2484 CODE:
2412{ 2485{
2413 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2486 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2414 2487
2415 if (RETVAL < 0) 2488 if (RETVAL < 0)
… …
2422 } 2495 }
2423} 2496}
2424 OUTPUT: 2497 OUTPUT:
2425 RETVAL 2498 RETVAL
2426 2499
2427MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2428 2501
2429int 2502int
2430volume (int volume = -1) 2503volume (int volume = -1)
2431 PROTOTYPE: ;$ 2504 PROTOTYPE: ;$
2432 CODE: 2505 CODE:
… …
2444void 2517void
2445halt () 2518halt ()
2446 CODE: 2519 CODE:
2447 Mix_HaltMusic (); 2520 Mix_HaltMusic ();
2448 2521
2449CFPlus::MixMusic 2522DC::MixMusic
2450new (SV *class, CFPlus::RW rwops) 2523new (SV *class, DC::RW rwops)
2451 CODE: 2524 CODE:
2452 RETVAL = Mix_LoadMUS_RW (rwops); 2525 RETVAL = Mix_LoadMUS_RW (rwops);
2453 OUTPUT: 2526 OUTPUT:
2454 RETVAL 2527 RETVAL
2455 2528
2456void 2529void
2457DESTROY (CFPlus::MixMusic self) 2530DESTROY (DC::MixMusic self)
2458 CODE: 2531 CODE:
2459 Mix_FreeMusic (self); 2532 Mix_FreeMusic (self);
2460 2533
2461int 2534int
2462play (CFPlus::MixMusic self, int loops = -1) 2535play (DC::MixMusic self, int loops = -1)
2463 CODE: 2536 CODE:
2464 RETVAL = Mix_PlayMusic (self, loops); 2537 RETVAL = Mix_PlayMusic (self, loops);
2465 OUTPUT: 2538 OUTPUT:
2466 RETVAL 2539 RETVAL
2467 2540
2468void 2541void
2469fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2542fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2470 CODE: 2543 CODE:
2471 Mix_FadeInMusicPos (self, loops, ms, position); 2544 Mix_FadeInMusicPos (self, loops, ms, position);
2472 2545
2473MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2546MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2474 2547
2475PROTOTYPES: ENABLE 2548PROTOTYPES: ENABLE
2476 2549
2477BOOT: 2550BOOT:
2478{ 2551{
2479 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2552 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2480 static const struct { 2553 static const struct {
2481 const char *name; 2554 const char *name;
2482 IV iv; 2555 IV iv;
2483 } *civ, const_iv[] = { 2556 } *civ, const_iv[] = {
2484# define const_iv(name) { # name, (IV)name } 2557# define const_iv(name) { # name, (IV)name }
… …
2519 const_iv (GL_INTENSITY), 2592 const_iv (GL_INTENSITY),
2520 const_iv (GL_LUMINANCE), 2593 const_iv (GL_LUMINANCE),
2521 const_iv (GL_LUMINANCE_ALPHA), 2594 const_iv (GL_LUMINANCE_ALPHA),
2522 const_iv (GL_FLOAT), 2595 const_iv (GL_FLOAT),
2523 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2596 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2597 const_iv (GL_COMPRESSED_ALPHA_ARB),
2598 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2599 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2600 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2601 const_iv (GL_COMPRESSED_RGB_ARB),
2602 const_iv (GL_COMPRESSED_RGBA_ARB),
2524 const_iv (GL_COMPILE), 2603 const_iv (GL_COMPILE),
2525 const_iv (GL_PROXY_TEXTURE_1D), 2604 const_iv (GL_PROXY_TEXTURE_1D),
2526 const_iv (GL_PROXY_TEXTURE_2D), 2605 const_iv (GL_PROXY_TEXTURE_2D),
2527 const_iv (GL_TEXTURE_1D), 2606 const_iv (GL_TEXTURE_1D),
2528 const_iv (GL_TEXTURE_2D), 2607 const_iv (GL_TEXTURE_2D),
… …
2567 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2646 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2568 const_iv (GL_POINT_SMOOTH_HINT), 2647 const_iv (GL_POINT_SMOOTH_HINT),
2569 const_iv (GL_LINE_SMOOTH_HINT), 2648 const_iv (GL_LINE_SMOOTH_HINT),
2570 const_iv (GL_POLYGON_SMOOTH_HINT), 2649 const_iv (GL_POLYGON_SMOOTH_HINT),
2571 const_iv (GL_GENERATE_MIPMAP_HINT), 2650 const_iv (GL_GENERATE_MIPMAP_HINT),
2651 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2572 const_iv (GL_FASTEST), 2652 const_iv (GL_FASTEST),
2573 const_iv (GL_DONT_CARE), 2653 const_iv (GL_DONT_CARE),
2574 const_iv (GL_NICEST), 2654 const_iv (GL_NICEST),
2575 const_iv (GL_V2F), 2655 const_iv (GL_V2F),
2576 const_iv (GL_V3F), 2656 const_iv (GL_V3F),
… …
2584 2664
2585 texture_av = newAV (); 2665 texture_av = newAV ();
2586 AvREAL_off (texture_av); 2666 AvREAL_off (texture_av);
2587} 2667}
2588 2668
2669void
2670disable_GL_EXT_blend_func_separate ()
2671 CODE:
2672 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0;
2674
2589char * 2675char *
2590gl_vendor () 2676gl_vendor ()
2591 CODE: 2677 CODE:
2592 RETVAL = (char *)glGetString (GL_VENDOR); 2678 RETVAL = (char *)glGetString (GL_VENDOR);
2593 OUTPUT: 2679 OUTPUT:
… …
2714 2800
2715void glRect (float x1, float y1, float x2, float y2) 2801void glRect (float x1, float y1, float x2, float y2)
2716 CODE: 2802 CODE:
2717 glRectf (x1, y1, x2, y2); 2803 glRectf (x1, y1, x2, y2);
2718 2804
2805void glRect_lineloop (float x1, float y1, float x2, float y2)
2806 CODE:
2807 glBegin (GL_LINE_LOOP);
2808 glVertex2f (x1, y1);
2809 glVertex2f (x2, y1);
2810 glVertex2f (x2, y2);
2811 glVertex2f (x1, y2);
2812 glEnd ();
2813
2719PROTOTYPES: ENABLE 2814PROTOTYPES: ENABLE
2720 2815
2721void glBegin (int mode) 2816void glBegin (int mode)
2722 2817
2723void glEnd () 2818void glEnd ()
… …
2755void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2850void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2756 CODE: 2851 CODE:
2757 if (gl.SeparableFilter2D) 2852 if (gl.SeparableFilter2D)
2758 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2853 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2759 2854
2760void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2855void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2761 2856
2762void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2857void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2763 2858
2764void glDrawPixels (int width, int height, int format, int type, char *pixels) 2859void glDrawPixels (int width, int height, int format, int type, char *pixels)
2765 2860
… …
2791 2886
2792void glEndList () 2887void glEndList ()
2793 2888
2794void glCallList (int list) 2889void glCallList (int list)
2795 2890
2796MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2797 2892
2798PROTOTYPES: DISABLE 2893PROTOTYPES: DISABLE
2799 2894
2800void 2895void
2801find_widget (SV *self, NV x, NV y) 2896find_widget (SV *self, NV x, NV y)
… …
2805 XPUSHs (self); 2900 XPUSHs (self);
2806} 2901}
2807 2902
2808BOOT: 2903BOOT:
2809{ 2904{
2810 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2905 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2811 2906
2812 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2907 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2813 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2908 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2814 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2909 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2815 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2910 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2816} 2911}
2817 2912
2818void 2913void
2819draw (SV *self) 2914draw (SV *self)
2820 CODE: 2915 CODE:
… …
2824 NV x, y, w, h; 2919 NV x, y, w, h;
2825 SV *draw_x_sv = GvSV (draw_x_gv); 2920 SV *draw_x_sv = GvSV (draw_x_gv);
2826 SV *draw_y_sv = GvSV (draw_y_gv); 2921 SV *draw_y_sv = GvSV (draw_y_gv);
2827 SV *draw_w_sv = GvSV (draw_w_gv); 2922 SV *draw_w_sv = GvSV (draw_w_gv);
2828 SV *draw_h_sv = GvSV (draw_h_gv); 2923 SV *draw_h_sv = GvSV (draw_h_gv);
2829 SV *hover;
2830 double draw_x, draw_y, draw_w, draw_h; 2924 double draw_x, draw_y;
2831 2925
2832 if (!SvROK (self)) 2926 if (!SvROK (self))
2833 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2927 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2834 2928
2835 hv = (HV *)SvRV (self); 2929 hv = (HV *)SvRV (self);
2836 2930
2837 if (SvTYPE (hv) != SVt_PVHV) 2931 if (SvTYPE (hv) != SVt_PVHV)
2838 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2932 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2839 2933
2840 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2934 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2841 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2935 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2842 2936
2843 if (!h || !w) 2937 if (!h || !w)
… …
2863 { 2957 {
2864 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2958 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2865 2959
2866 if (svp && SvTRUE (*svp)) 2960 if (svp && SvTRUE (*svp))
2867 { 2961 {
2868 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2962 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2869 glEnable (GL_BLEND); 2963 glEnable (GL_BLEND);
2870 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2964 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2871 glBegin (GL_QUADS); 2965 glBegin (GL_QUADS);
2872 glVertex2f (0, 0); 2966 glVertex2f (0, 0);
2873 glVertex2f (w, 0); 2967 glVertex2f (w, 0);
… …
2876 glEnd (); 2970 glEnd ();
2877 glDisable (GL_BLEND); 2971 glDisable (GL_BLEND);
2878 } 2972 }
2879 } 2973 }
2880#if 0 2974#if 0
2881 if ($ENV{CFPLUS_DEBUG} & 1) { 2975 // draw borders, for debugging
2882 glPushMatrix; 2976 glPushMatrix ();
2883 glColor 1, 1, 0, 1; 2977 glColor4f (1., 1., 0., 1.);
2884 glTranslate 0.375, 0.375; 2978 glTranslatef (.5, .5, 0.);
2885 glBegin GL_LINE_LOOP; 2979 glBegin (GL_LINE_LOOP);
2886 glVertex 0 , 0; 2980 glVertex2f (0 , 0);
2887 glVertex $self->{w} - 1, 0; 2981 glVertex2f (w - 1, 0);
2888 glVertex $self->{w} - 1, $self->{h} - 1; 2982 glVertex2f (w - 1, h - 1);
2889 glVertex 0 , $self->{h} - 1; 2983 glVertex2f (0 , h - 1);
2890 glEnd; 2984 glEnd ();
2891 glPopMatrix; 2985 glPopMatrix ();
2892 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2893 }
2894#endif 2986#endif
2895 PUSHMARK (SP); 2987 PUSHMARK (SP);
2896 XPUSHs (self); 2988 XPUSHs (self);
2897 PUTBACK; 2989 PUTBACK;
2898 call_method ("_draw", G_VOID | G_DISCARD); 2990 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines