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.220 by root, Thu Aug 9 11:02:08 2007 UTC vs.
Revision 1.241 by root, Wed Dec 26 20:46:39 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>
109 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
111} 116}
112 117
113#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
114 120
115#include "pango-font.c" 121#include "pango-font.c"
116#include "pango-fontmap.c" 122#include "pango-fontmap.c"
117#include "pango-render.c" 123#include "pango-render.c"
118 124
119typedef IV CFPlus__Channel; 125typedef IV dc__Channel;
120typedef SDL_RWops *CFPlus__RW; 126typedef SDL_RWops *dc__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *dc__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *dc__MixMusic;
123 129
124typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *dc__Font;
125 131
126static int 132static int
127shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
128{ 134{
129 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
143 149
144typedef struct cf_layout { 150typedef struct cf_layout {
145 PangoLayout *pl; 151 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
147 int base_height; 153 int base_height;
148 CFPlus__Font font; 154 dc__Font font;
155 rc_t *rc;
149} *CFPlus__Layout; 156} *dc__Layout;
150 157
151static CFPlus__Font default_font; 158static dc__Font default_font;
152static PangoContext *opengl_context; 159static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
154 161
155static void 162static void
156substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
161#endif 168#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 170}
164 171
165static void 172static void
166layout_update_font (CFPlus__Layout self) 173layout_update_font (dc__Layout self)
167{ 174{
168 /* 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
169 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
170 */ 177 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
175 182
176 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
177} 184}
178 185
179static void 186static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (dc__Layout self, int *w, int *h)
181{ 188{
182 PangoRectangle rect; 189 PangoRectangle rect;
183 190
184 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
196 203
197typedef uint16_t tileid; 204typedef uint16_t tileid;
198typedef uint16_t faceid; 205typedef uint16_t faceid;
199 206
200typedef struct { 207typedef struct {
201 int name; 208 GLuint name;
202 int w, h; 209 int w, h;
203 float s, t; 210 float s, t;
204 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
205 tileid smoothtile; 212 tileid smoothtile;
206 uint8_t smoothlevel; 213 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 231 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 232 int texs; maptex *tex; // [tileid]
226 233
227 int32_t rows; 234 int32_t rows;
228 maprow *row; 235 maprow *row;
229} *CFPlus__Map; 236} *dc__Map;
230 237
231static char * 238static char *
232prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
233{ 240{
234 char *p; 241 char *p;
272 self->texs *= 2; 279 self->texs *= 2;
273 } 280 }
274} 281}
275 282
276static maprow * 283static maprow *
277map_get_row (CFPlus__Map self, int y) 284map_get_row (dc__Map self, int y)
278{ 285{
279 if (0 > y) 286 if (0 > y)
280 { 287 {
281 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
320 327
321 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
322} 329}
323 330
324static mapcell * 331static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (dc__Map self, int x, int y)
326{ 333{
327 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
328} 335}
329 336
330static void 337static void
331map_clear (CFPlus__Map self) 338map_clear (dc__Map self)
332{ 339{
333 int r; 340 int r;
334 341
335 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
344 self->row = 0; 351 self->row = 0;
345 self->rows = 0; 352 self->rows = 0;
346} 353}
347 354
348static void 355static void
349map_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)
350{ 357{
351 int x, y; 358 int x, y;
352 maprow *row; 359 maprow *row;
353 mapcell *cell; 360 mapcell *cell;
354 361
433 n |= n >> 16; 440 n |= n >> 16;
434 441
435 return n + 1; 442 return n + 1;
436} 443}
437 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
438/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
441 459
442/******************************************************************************/ 460/******************************************************************************/
480 return 0; 498 return 0;
481 499
482 return 1; 500 return 1;
483} 501}
484 502
485MODULE = CFPlus PACKAGE = CFPlus 503MODULE = Deliantra::Client PACKAGE = dc
486 504
487PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
488 506
489BOOT: 507BOOT:
490{ 508{
491 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("dc", 1);
492 static const struct { 510 static const struct {
493 const char *name; 511 const char *name;
494 IV iv; 512 IV iv;
495 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
518 536
519 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
522 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 626# undef const_iv
605 }; 627 };
606 628
607 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; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
625 RETVAL 647 RETVAL
626 648
627NV floor (NV x) 649NV floor (NV x)
628 650
629NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
630 656
631void 657void
632pango_init () 658pango_init ()
633 CODE: 659 CODE:
634{ 660{
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 701
676 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
677 while (*m) 703 while (*m)
678 { 704 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 600)
680 { 706 {
681 AV *av = newAV (); 707 AV *av = newAV ();
682 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
683 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
708 734
709 if (RETVAL) 735 if (RETVAL)
710 { 736 {
711 av_clear (texture_av); 737 av_clear (texture_av);
712 738
713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714#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);
715#include "glfunc.h" 741#include "glfunc.h"
716#undef GL_FUNC 742#undef GL_FUNC
717 } 743 }
718} 744}
799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801 break; 827 break;
802 } 828 }
803 829
804 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))));
805 } 831 }
806} 832}
807 833
808int 834int
809Mix_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)
810 POSTCALL: 836 POSTCALL:
811 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
812 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}
813 855
814void 856void
815Mix_CloseAudio () 857Mix_CloseAudio ()
816 858
817int 859int
951void 993void
952error (char *message) 994error (char *message)
953 CODE: 995 CODE:
954 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
955#ifdef _WIN32 997#ifdef _WIN32
956 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
957#endif 999#endif
958 1000
959void 1001void
960fatal (char *message) 1002fatal (char *message)
961 CODE: 1003 CODE:
962 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
963#ifdef _WIN32 1005#ifdef _WIN32
964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
965#endif 1007#endif
966 _exit (1); 1008 _exit (1);
967 1009
968void 1010void
969_exit (int retval = 0) 1011_exit (int retval = 0)
981#if DEBUG 1023#if DEBUG
982 VALGRIND_DO_LEAK_CHECK; 1024 VALGRIND_DO_LEAK_CHECK;
983#endif 1025#endif
984} 1026}
985 1027
986MODULE = CFPlus PACKAGE = CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = dc::Font
987 1029
988PROTOTYPES: DISABLE 1030PROTOTYPES: DISABLE
989 1031
990CFPlus::Font 1032dc::Font
991new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
992 CODE: 1034 CODE:
993{ 1035{
994 int count; 1036 int count;
995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
998} 1040}
999 OUTPUT: 1041 OUTPUT:
1000 RETVAL 1042 RETVAL
1001 1043
1002void 1044void
1003DESTROY (CFPlus::Font self) 1045DESTROY (dc::Font self)
1004 CODE: 1046 CODE:
1005 pango_font_description_free (self); 1047 pango_font_description_free (self);
1006 1048
1007void 1049void
1008make_default (CFPlus::Font self) 1050make_default (dc::Font self)
1009 PROTOTYPE: $ 1051 PROTOTYPE: $
1010 CODE: 1052 CODE:
1011 default_font = self; 1053 default_font = self;
1012 1054
1013MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = dc::Layout
1014 1056
1015PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1016 1058
1017void 1059void
1018reset_glyph_cache () 1060glyph_cache_backup ()
1019 PROTOTYPE: 1061 PROTOTYPE:
1020 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1021 tc_clear (); 1069 tc_restore ();
1022 1070
1023CFPlus::Layout 1071dc::Layout
1024new (SV *class) 1072new (SV *class)
1025 CODE: 1073 CODE:
1026 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
1027 1075
1028 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
1030 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1031 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1032 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1033 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1034 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1035 1084
1036 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1038 OUTPUT: 1087 OUTPUT:
1039 RETVAL 1088 RETVAL
1040 1089
1041void 1090void
1042DESTROY (CFPlus::Layout self) 1091DESTROY (dc::Layout self)
1043 CODE: 1092 CODE:
1044 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1045 Safefree (self); 1095 Safefree (self);
1046 1096
1047void 1097void
1048set_text (CFPlus::Layout self, SV *text_) 1098set_text (dc::Layout self, SV *text_)
1049 CODE: 1099 CODE:
1050{ 1100{
1051 STRLEN textlen; 1101 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
1053 1103
1054 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
1055} 1105}
1056 1106
1057void 1107void
1058set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (dc::Layout self, SV *text_)
1059 CODE: 1109 CODE:
1060{ 1110{
1061 STRLEN textlen; 1111 STRLEN textlen;
1062 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
1063 1113
1064 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
1065} 1115}
1066 1116
1067void 1117void
1068set_shapes (CFPlus::Layout self, ...) 1118set_shapes (dc::Layout self, ...)
1069 CODE: 1119 CODE:
1070{ 1120{
1071 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
1072 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
1073 const char *pos = text; 1123 const char *pos = text;
1108 if (attrs) 1158 if (attrs)
1109 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
1110} 1160}
1111 1161
1112void 1162void
1113get_shapes (CFPlus::Layout self) 1163get_shapes (dc::Layout self)
1114 PPCODE: 1164 PPCODE:
1115{ 1165{
1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117 1167
1118 do 1168 do
1133 1183
1134 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
1135} 1185}
1136 1186
1137int 1187int
1138has_wrapped (CFPlus::Layout self) 1188has_wrapped (dc::Layout self)
1139 CODE: 1189 CODE:
1140{ 1190{
1141 int lines = 1; 1191 int lines = 1;
1142 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1143 1193
1148} 1198}
1149 OUTPUT: 1199 OUTPUT:
1150 RETVAL 1200 RETVAL
1151 1201
1152SV * 1202SV *
1153get_text (CFPlus::Layout self) 1203get_text (dc::Layout self)
1154 CODE: 1204 CODE:
1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
1157 OUTPUT: 1207 OUTPUT:
1158 RETVAL 1208 RETVAL
1159 1209
1160void 1210void
1161set_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.)
1162 CODE: 1212 CODE:
1163 self->r = r; 1213 self->r = r;
1164 self->g = g; 1214 self->g = g;
1165 self->b = b; 1215 self->b = b;
1166 self->a = a; 1216 self->a = a;
1167 1217
1168void 1218void
1169set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (dc::Layout self, dc::Font font = 0)
1170 CODE: 1220 CODE:
1171 if (self->font != font) 1221 if (self->font != font)
1172 { 1222 {
1173 self->font = font; 1223 self->font = font;
1174 layout_update_font (self); 1224 layout_update_font (self);
1175 } 1225 }
1176 1226
1177void 1227void
1178set_height (CFPlus::Layout self, int base_height) 1228set_height (dc::Layout self, int base_height)
1179 CODE: 1229 CODE:
1180 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
1181 { 1231 {
1182 self->base_height = base_height; 1232 self->base_height = base_height;
1183 layout_update_font (self); 1233 layout_update_font (self);
1184 } 1234 }
1185 1235
1186void 1236void
1187set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (dc::Layout self, int max_width = -1)
1188 CODE: 1238 CODE:
1189 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);
1190 1240
1191void 1241void
1192set_indent (CFPlus::Layout self, int indent) 1242set_indent (dc::Layout self, int indent)
1193 CODE: 1243 CODE:
1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195 1245
1196void 1246void
1197set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (dc::Layout self, int spacing)
1198 CODE: 1248 CODE:
1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200 1250
1201void 1251void
1202set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (dc::Layout self, int ellipsise)
1203 CODE: 1253 CODE:
1204 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1209 ); 1259 );
1210 1260
1211void 1261void
1212set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (dc::Layout self, int spm)
1213 CODE: 1263 CODE:
1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215 1265
1216void 1266void
1217size (CFPlus::Layout self) 1267size (dc::Layout self)
1218 PPCODE: 1268 PPCODE:
1219{ 1269{
1220 int w, h; 1270 int w, h;
1221 1271
1222 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
1225 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1226 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1227} 1277}
1228 1278
1229int 1279int
1230descent (CFPlus::Layout self) 1280descent (dc::Layout self)
1231 CODE: 1281 CODE:
1232{ 1282{
1233 PangoRectangle rect; 1283 PangoRectangle rect;
1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1235 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
1237} 1287}
1238 OUTPUT: 1288 OUTPUT:
1239 RETVAL 1289 RETVAL
1240 1290
1241int 1291int
1242xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (dc::Layout self, int x, int y)
1243 CODE: 1293 CODE:
1244{ 1294{
1245 int index, trailing; 1295 int index, trailing;
1246 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);
1247 RETVAL = index + trailing; 1297 RETVAL = index + trailing;
1248} 1298}
1249 OUTPUT: 1299 OUTPUT:
1250 RETVAL 1300 RETVAL
1251 1301
1252void 1302void
1253cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (dc::Layout self, int index)
1254 PPCODE: 1304 PPCODE:
1255{ 1305{
1256 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1258 1308
1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1263} 1313}
1264 1314
1265void 1315void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1316index_to_line_x (dc::Layout self, int index, int trailing = 0)
1267 PPCODE: 1317 PPCODE:
1268{ 1318{
1269 int line, x; 1319 int line, x;
1270 1320
1271 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);
1275 PUSHs (sv_2mortal (newSViv (line - 1))); 1325 PUSHs (sv_2mortal (newSViv (line - 1)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277} 1327}
1278 1328
1279void 1329void
1280line_x_to_index (CFPlus::Layout self, int line, int x) 1330line_x_to_index (dc::Layout self, int line, int x)
1281 PPCODE: 1331 PPCODE:
1282{ 1332{
1283 PangoLayoutLine *lp; 1333 PangoLayoutLine *lp;
1284 int index, trailing; 1334 int index, trailing;
1285 1335
1300 PUSHs (sv_2mortal (newSViv (trailing))); 1350 PUSHs (sv_2mortal (newSViv (trailing)));
1301 } 1351 }
1302} 1352}
1303 1353
1304void 1354void
1305render (CFPlus::Layout self, float x, float y, int flags = 0) 1355render (dc::Layout self, float x, float y, int flags = 0)
1306 PPCODE: 1356 CODE:
1357 rc_clear (self->rc);
1307 pango_opengl_render_layout_subpixel ( 1358 pango_opengl_render_layout_subpixel (
1308 self->pl, 1359 self->pl,
1360 self->rc,
1309 x * PANGO_SCALE, y * PANGO_SCALE, 1361 x * PANGO_SCALE, y * PANGO_SCALE,
1310 self->r, self->g, self->b, self->a, 1362 self->r, self->g, self->b, self->a,
1311 flags 1363 flags
1312 ); 1364 );
1365 // we assume that context_change actually clears/frees stuff
1366 // and does not do any recomputation...
1367 pango_layout_context_changed (self->pl);
1313 1368
1314MODULE = CFPlus PACKAGE = CFPlus::Texture 1369void
1370draw (dc::Layout self)
1371 CODE:
1372{
1373 glEnable (GL_TEXTURE_2D);
1374 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375 glEnable (GL_BLEND);
1376 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1377 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1378 glEnable (GL_ALPHA_TEST);
1379 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1380
1381 rc_draw (self->rc);
1382
1383 glDisable (GL_ALPHA_TEST);
1384 glDisable (GL_BLEND);
1385 glDisable (GL_TEXTURE_2D);
1386}
1387
1388MODULE = Deliantra::Client PACKAGE = dc::Texture
1315 1389
1316PROTOTYPES: ENABLE 1390PROTOTYPES: ENABLE
1317
1318int minpot (int n)
1319 1391
1320void 1392void
1321pad (SV *data_, int ow, int oh, int nw, int nh) 1393pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE: 1394 CODE:
1323{ 1395{
1400 RETVAL = width > 0; 1472 RETVAL = width > 0;
1401} 1473}
1402 OUTPUT: 1474 OUTPUT:
1403 RETVAL 1475 RETVAL
1404 1476
1405MODULE = CFPlus PACKAGE = CFPlus::Map 1477MODULE = Deliantra::Client PACKAGE = dc::Map
1406 1478
1407PROTOTYPES: DISABLE 1479PROTOTYPES: DISABLE
1408 1480
1409CFPlus::Map 1481dc::Map
1410new (SV *class) 1482new (SV *class)
1411 CODE: 1483 CODE:
1412 New (0, RETVAL, 1, struct map); 1484 New (0, RETVAL, 1, struct map);
1413 RETVAL->x = 0; 1485 RETVAL->x = 0;
1414 RETVAL->y = 0; 1486 RETVAL->y = 0;
1422 RETVAL->row = 0; 1494 RETVAL->row = 0;
1423 OUTPUT: 1495 OUTPUT:
1424 RETVAL 1496 RETVAL
1425 1497
1426void 1498void
1427DESTROY (CFPlus::Map self) 1499DESTROY (dc::Map self)
1428 CODE: 1500 CODE:
1429{ 1501{
1430 map_clear (self); 1502 map_clear (self);
1431 Safefree (self->face2tile); 1503 Safefree (self->face2tile);
1432 Safefree (self->tex); 1504 Safefree (self->tex);
1433 Safefree (self); 1505 Safefree (self);
1434} 1506}
1435 1507
1436void 1508void
1437resize (CFPlus::Map self, int map_width, int map_height) 1509resize (dc::Map self, int map_width, int map_height)
1438 CODE: 1510 CODE:
1439 self->w = map_width; 1511 self->w = map_width;
1440 self->h = map_height; 1512 self->h = map_height;
1441 1513
1442void 1514void
1443clear (CFPlus::Map self) 1515clear (dc::Map self)
1444 CODE: 1516 CODE:
1445 map_clear (self); 1517 map_clear (self);
1446 1518
1447void 1519void
1448set_tileid (CFPlus::Map self, int face, int tile) 1520set_tileid (dc::Map self, int face, int tile)
1449 CODE: 1521 CODE:
1450{ 1522{
1451 need_facenum (self, face); self->face2tile [face] = tile; 1523 need_facenum (self, face); self->face2tile [face] = tile;
1452 need_texid (self, tile); 1524 need_texid (self, tile);
1453} 1525}
1454 1526
1455void 1527void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level) 1528set_smooth (dc::Map self, int face, int smooth, int level)
1457 CODE: 1529 CODE:
1458{ 1530{
1459 tileid texid; 1531 tileid texid;
1460 maptex *tex; 1532 maptex *tex;
1461 1533
1474 tex->smoothtile = self->face2tile [smooth]; 1546 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level; 1547 tex->smoothlevel = level;
1476} 1548}
1477 1549
1478void 1550void
1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1551set_texture (dc::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1480 CODE: 1552 CODE:
1481{ 1553{
1482 need_texid (self, texid); 1554 need_texid (self, texid);
1483 1555
1484 { 1556 {
1504 // from transparent color bleeding and ugly wrapping effects. 1576 // from transparent color bleeding and ugly wrapping effects.
1505 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1506} 1578}
1507 1579
1508int 1580int
1509ox (CFPlus::Map self) 1581ox (dc::Map self)
1510 ALIAS: 1582 ALIAS:
1511 oy = 1 1583 oy = 1
1512 x = 2 1584 x = 2
1513 y = 3 1585 y = 3
1514 w = 4 1586 w = 4
1525 } 1597 }
1526 OUTPUT: 1598 OUTPUT:
1527 RETVAL 1599 RETVAL
1528 1600
1529void 1601void
1530scroll (CFPlus::Map self, int dx, int dy) 1602scroll (dc::Map self, int dx, int dy)
1531 CODE: 1603 CODE:
1532{ 1604{
1533 if (dx > 0) 1605 if (dx > 0)
1534 map_blank (self, self->x, self->y, dx, self->h); 1606 map_blank (self, self->x, self->y, dx, self->h);
1535 else if (dx < 0) 1607 else if (dx < 0)
1550 self->rows += MAP_EXTEND_Y; 1622 self->rows += MAP_EXTEND_Y;
1551 self->y += MAP_EXTEND_Y; 1623 self->y += MAP_EXTEND_Y;
1552 } 1624 }
1553} 1625}
1554 1626
1555void 1627SV *
1556map1a_update (CFPlus::Map self, SV *data_, int extmap) 1628map1a_update (dc::Map self, SV *data_, int extmap)
1557 CODE: 1629 CODE:
1558{ 1630{
1559 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1560 uint8_t *data_end = (uint8_t *)SvEND (data_); 1632 uint8_t *data_end = (uint8_t *)SvEND (data_);
1561 mapcell *cell; 1633 mapcell *cell;
1562 int x, y, flags; 1634 int x, y, z, flags;
1635 AV *missing = newAV ();
1636 RETVAL = newRV_noinc ((SV *)missing);
1563 1637
1564 while (data < data_end - 1) 1638 while (data < data_end - 1)
1565 { 1639 {
1566 flags = (data [0] << 8) + data [1]; data += 2; 1640 flags = (data [0] << 8) + data [1]; data += 2;
1567 1641
1618 } 1692 }
1619 else 1693 else
1620 cell->darkness = *data++ + 1; 1694 cell->darkness = *data++ + 1;
1621 } 1695 }
1622 1696
1697 for (z = 0; z <= 2; ++z)
1623 if (flags & 4) 1698 if (flags & (4 >> z))
1624 { 1699 {
1625 faceid face = (data [0] << 8) + data [1]; data += 2; 1700 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face); 1701 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face]; 1702 cell->tile [z] = self->face2tile [face];
1703
1704 if (cell->tile [z])
1705 {
1706 maptex *tex = self->tex + cell->tile [z];
1707 if (!tex->name)
1708 av_push (missing, newSViv (cell->tile [z]));
1709
1710 if (tex->smoothtile)
1711 {
1712 maptex *smooth = self->tex + tex->smoothtile;
1713 if (!smooth->name)
1714 av_push (missing, newSViv (tex->smoothtile));
1715 }
1716 }
1628 } 1717 }
1629
1630 if (flags & 2)
1631 {
1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1635 }
1636
1637 if (flags & 1)
1638 {
1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1642 }
1643 } 1718 }
1644 else 1719 else
1645 cell->darkness = 0; 1720 cell->darkness = 0;
1646 } 1721 }
1647} 1722}
1723 OUTPUT:
1724 RETVAL
1648 1725
1649SV * 1726SV *
1650mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1727mapmap (dc::Map self, int x0, int y0, int w, int h)
1651 CODE: 1728 CODE:
1652{ 1729{
1653 int x1, x; 1730 int x1, x;
1654 int y1, y; 1731 int y1, y;
1655 int z; 1732 int z;
1699 RETVAL = map_sv; 1776 RETVAL = map_sv;
1700} 1777}
1701 OUTPUT: 1778 OUTPUT:
1702 RETVAL 1779 RETVAL
1703 1780
1704SV * 1781void
1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1782draw (dc::Map self, int mx, int my, int sw, int sh, int T)
1706 CODE: 1783 CODE:
1707{ 1784{
1785 int x, y, z;
1786
1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1711 smooth_key skey; 1790 smooth_key skey;
1712 int x, y, z; 1791
1713 int last_name; 1792 rc_t *rc = rc_alloc ();
1714 AV *missing = newAV (); 1793 rc_key_t key;
1715 RETVAL = newRV_noinc ((SV *)missing); 1794 rc_array_t *arr;
1716 1795
1717 // thats current max. sorry. 1796 // thats current max. sorry.
1718 if (sw > 255) sw = 255; 1797 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255; 1798 if (sh > 255) sh = 255;
1720 1799
1721 // clear key, in case of extra padding 1800 // clear key, in case of extra padding
1722 memset (&skey, 0, sizeof (skey)); 1801 memset (&skey, 0, sizeof (skey));
1723 1802
1724 glColor4ub (255, 255, 255, 255); 1803 memset (&key, 0, sizeof (key));
1725 1804 key.r = 255;
1726 glEnable (GL_BLEND); 1805 key.g = 255;
1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1806 key.b = 255;
1728 glEnable (GL_TEXTURE_2D); 1807 key.a = 255;
1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1808 key.mode = GL_QUADS;
1730 1809 key.format = GL_T2F_V3F;
1731 glBegin (GL_QUADS);
1732
1733 last_name = -1; 1810 key.texname = -1;
1734 1811
1735 mx += self->x; 1812 mx += self->x;
1736 my += self->y; 1813 my += self->y;
1737 1814
1738 // first pass: determine smooth_max 1815 // first pass: determine smooth_max
1754 MAX (self->tex [cell->tile [0]].smoothlevel, 1831 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel, 1832 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel)); 1833 self->tex [cell->tile [2]].smoothlevel));
1757 } 1834 }
1758 } 1835 }
1836
1837 glEnable (GL_BLEND);
1838 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1759 1840
1760 for (z = 0; z <= 2; z++) 1841 for (z = 0; z <= 2; z++)
1761 { 1842 {
1762 memset (smooth_level, 0, sizeof (smooth_level)); 1843 memset (smooth_level, 0, sizeof (smooth_level));
1763 1844
1775 if (tile) 1856 if (tile)
1776 { 1857 {
1777 maptex tex = self->tex [tile]; 1858 maptex tex = self->tex [tile];
1778 int px, py; 1859 int px, py;
1779 1860
1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name) 1861 if (key.texname != tex.name)
1783 { 1862 {
1784 if (!tex.name) 1863 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */ 1864 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789 1865
1790 glEnd (); 1866 key.texname = tex.name;
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1867 arr = rc_array (rc, &key);
1792 glBegin (GL_QUADS);
1793 } 1868 }
1794 1869
1795 px = (x + 1) * T - tex.w; 1870 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h; 1871 py = (y + 1) * T - tex.h;
1797 1872
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1802 1877
1803 if (cell->flags && z == 2) 1878 if (cell->flags && z == 2)
1804 { 1879 {
1880 // overlays such as the speech bubble, probably more to come
1805 if (cell->flags & 1) 1881 if (cell->flags & 1)
1806 { 1882 {
1807 maptex tex = self->tex [1]; 1883 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32; 1884 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32; 1885 int py = y * T - T * 6 / 32;
1810 1886
1887 if (tex.name)
1811 glEnd (); 1888 {
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1889 if (key.texname != tex.name)
1890 {
1891 key.texname = tex.name;
1892 arr = rc_array (rc, &key);
1893 }
1894
1895 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1813 glBegin (GL_QUADS); 1899 }
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 } 1900 }
1820 } 1901 }
1821 1902
1822 // update smooth hash 1903 // update smooth hash
1823 if (tex.smoothtile) 1904 if (tex.smoothtile)
1859 } 1940 }
1860 } 1941 }
1861 } 1942 }
1862 } 1943 }
1863 1944
1945 rc_draw (rc);
1946 rc_clear (rc);
1947
1864 // go through all smoothlevels, lowest to highest, then draw. 1948 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort 1949 // this is basically counting sort
1866 { 1950 {
1867 int w, b; 1951 int w, b;
1868 1952
1953 glEnable (GL_TEXTURE_2D);
1954 glBegin (GL_QUADS);
1869 for (w = 0; w < 256 / 32; ++w) 1955 for (w = 0; w < 256 / 32; ++w)
1870 { 1956 {
1871 uint32_t smask = smooth_level [w]; 1957 uint32_t smask = smooth_level [w];
1872 if (smask) 1958 if (smask)
1873 for (b = 0; b < 32; ++b) 1959 for (b = 0; b < 32; ++b)
1892 int border = bits & 15; 1978 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1979 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row 1980 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column 1981 float dy = tex.t * .5f ; // 2 images/column
1896 1982
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name) 1983 if (tex.name)
1900 { 1984 {
1985 // this time avoiding texture state changes
1986 // save gobs of state changes.
1901 if (!tex.name) 1987 if (key.texname != tex.name)
1902 { 1988 {
1903 av_push (missing, newSViv (skey->tile)); 1989 glEnd ();
1904 continue; // smoothing not yet available 1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991 glBegin (GL_QUADS);
1905 } 1992 }
1906 1993
1907 glEnd ();
1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border) 1994 if (border)
1913 { 1995 {
1914 float ox = border * dx; 1996 float ox = border * dx;
1915 1997
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1920 } 2002 }
1921 2003
1922 if (corner) 2004 if (corner)
1923 { 2005 {
1924 float ox = corner * dx; 2006 float ox = corner * dx;
1925 2007
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2008 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2012 }
1930 } 2013 }
1931 } 2014 }
1932 } 2015 }
1933 } 2016 }
1934 } 2017 }
2018
2019 glEnd ();
2020 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1;
1935 } 2022 }
1936 2023
1937 hv_clear (smooth); 2024 hv_clear (smooth);
1938 } 2025 }
1939 2026
1940 glEnd ();
1941
1942 glDisable (GL_TEXTURE_2D);
1943 glDisable (GL_BLEND); 2027 glDisable (GL_BLEND);
2028 rc_free (rc);
1944 2029
1945 // top layer: overlays such as the health bar 2030 // top layer: overlays such as the health bar
1946 for (y = 0; y < sh; y++) 2031 for (y = 0; y < sh; y++)
1947 if (0 <= y + my && y + my < self->rows) 2032 if (0 <= y + my && y + my < self->rows)
1948 { 2033 {
1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 2056 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1972 } 2057 }
1973 } 2058 }
1974 } 2059 }
1975} 2060}
1976 OUTPUT:
1977 RETVAL
1978 2061
1979void 2062void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2063draw_magicmap (dc::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981 CODE: 2064 CODE:
1982{ 2065{
1983 static float color[16][3] = { 2066 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2067 { 0.00F, 0.00F, 0.00F },
1985 { 1.00F, 1.00F, 1.00F }, 2068 { 1.00F, 1.00F, 1.00F },
2035 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2119 glDisable (GL_TEXTURE_2D);
2037} 2120}
2038 2121
2039void 2122void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2123fow_texture (dc::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2124 PPCODE:
2042{ 2125{
2043 int x, y; 2126 int x, y;
2044 int sw1 = sw + 2; 2127 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2128 int sh1 = sh + 2;
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2199 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2200 PUSHs (darkness3_sv);
2118} 2201}
2119 2202
2120SV * 2203SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2204get_rect (dc::Map self, int x0, int y0, int w, int h)
2122 CODE: 2205 CODE:
2123{ 2206{
2124 int x, y, x1, y1; 2207 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2208 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2209 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2191} 2274}
2192 OUTPUT: 2275 OUTPUT:
2193 RETVAL 2276 RETVAL
2194 2277
2195void 2278void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2279set_rect (dc::Map self, int x0, int y0, uint8_t *data)
2197 PPCODE: 2280 PPCODE:
2198{ 2281{
2199 int x, y, z; 2282 int x, y, z;
2200 int w, h; 2283 int w, h;
2201 int x1, y1; 2284 int x1, y1;
2202 2285
2203 if (*data++ != 0) 2286 if (*data++ != 0)
2204 return; /* version mismatch */ 2287 XSRETURN_EMPTY; /* version mismatch */
2205 2288
2206 w = *data++ << 8; w |= *data++; 2289 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2290 h = *data++ << 8; h |= *data++;
2208 2291
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2292 // we need to do this 'cause we don't keep an absolute coord system for rows
2254 } 2337 }
2255 } 2338 }
2256 } 2339 }
2257} 2340}
2258 2341
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2342MODULE = Deliantra::Client PACKAGE = dc::RW
2260 2343
2261CFPlus::RW 2344dc::RW
2262new (SV *class, SV *data_sv) 2345new (SV *class, SV *data_sv)
2263 CODE: 2346 CODE:
2264{ 2347{
2265 STRLEN datalen; 2348 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2349 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2351 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2352}
2270 OUTPUT: 2353 OUTPUT:
2271 RETVAL 2354 RETVAL
2272 2355
2273CFPlus::RW 2356dc::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2357new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2358 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2359 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2360 OUTPUT:
2278 RETVAL 2361 RETVAL
2279 2362
2280# fails on win32: 2363# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2364# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2365#void
2283#close (CFPlus::RW self) 2366#close (dc::RW self)
2284# CODE: 2367# CODE:
2285# (self->(close)) (self); 2368# (self->(close)) (self);
2286 2369
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2370MODULE = Deliantra::Client PACKAGE = dc::Channel
2288 2371
2289PROTOTYPES: DISABLE 2372PROTOTYPES: DISABLE
2290 2373
2291CFPlus::Channel 2374dc::Channel
2292find () 2375find ()
2293 CODE: 2376 CODE:
2294{ 2377{
2295 RETVAL = Mix_GroupAvailable (-1); 2378 RETVAL = Mix_GroupAvailable (-1);
2296 2379
2309} 2392}
2310 OUTPUT: 2393 OUTPUT:
2311 RETVAL 2394 RETVAL
2312 2395
2313void 2396void
2314halt (CFPlus::Channel self) 2397halt (dc::Channel self)
2315 CODE: 2398 CODE:
2316 Mix_HaltChannel (self); 2399 Mix_HaltChannel (self);
2317 2400
2318void 2401void
2319expire (CFPlus::Channel self, int ticks = -1) 2402expire (dc::Channel self, int ticks = -1)
2320 CODE: 2403 CODE:
2321 Mix_ExpireChannel (self, ticks); 2404 Mix_ExpireChannel (self, ticks);
2322 2405
2323void 2406void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2407fade_out (dc::Channel self, int ticks = -1)
2325 CODE: 2408 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2409 Mix_FadeOutChannel (self, ticks);
2327 2410
2328int 2411int
2329volume (CFPlus::Channel self, int volume) 2412volume (dc::Channel self, int volume)
2330 CODE: 2413 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2415 OUTPUT:
2333 RETVAL 2416 RETVAL
2334 2417
2335void 2418void
2336unregister_all_effects (CFPlus::Channel self) 2419unregister_all_effects (dc::Channel self)
2337 CODE: 2420 CODE:
2338 Mix_UnregisterAllEffects (self); 2421 Mix_UnregisterAllEffects (self);
2339 2422
2340void 2423void
2341set_panning (CFPlus::Channel self, int left, int right) 2424set_panning (dc::Channel self, int left, int right)
2342 CODE: 2425 CODE:
2343 left = CLAMP (left , 0, 255); 2426 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2427 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2428 Mix_SetPanning (self, left, right);
2346 2429
2347void 2430void
2348set_distance (CFPlus::Channel self, int distance) 2431set_distance (dc::Channel self, int distance)
2349 CODE: 2432 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2433 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2434
2352void 2435void
2353set_position (CFPlus::Channel self, int angle, int distance) 2436set_position (dc::Channel self, int angle, int distance)
2354 CODE: 2437 CODE:
2355 2438
2356void 2439void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2440set_position_r (dc::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2441 CODE:
2359{ 2442{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2446}
2364 2447
2365void 2448void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2449set_reverse_stereo (dc::Channel self, int flip)
2367 CODE: 2450 CODE:
2368 Mix_SetReverseStereo (self, flip); 2451 Mix_SetReverseStereo (self, flip);
2369 2452
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2453MODULE = Deliantra::Client PACKAGE = dc::MixChunk
2371 2454
2372PROTOTYPES: DISABLE 2455PROTOTYPES: DISABLE
2373 2456
2374CFPlus::MixChunk 2457dc::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2458new (SV *class, dc::RW rwops)
2376 CODE: 2459 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2460 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2461 OUTPUT:
2379 RETVAL 2462 RETVAL
2380 2463
2381void 2464void
2382DESTROY (CFPlus::MixChunk self) 2465DESTROY (dc::MixChunk self)
2383 CODE: 2466 CODE:
2384 Mix_FreeChunk (self); 2467 Mix_FreeChunk (self);
2385 2468
2386int 2469int
2387volume (CFPlus::MixChunk self, int volume = -1) 2470volume (dc::MixChunk self, int volume = -1)
2388 CODE: 2471 CODE:
2389 if (items > 1) 2472 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2473 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2474 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2475 OUTPUT:
2393 RETVAL 2476 RETVAL
2394 2477
2395CFPlus::Channel 2478dc::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2479play (dc::MixChunk self, dc::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2480 CODE:
2398{ 2481{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2483
2401 if (RETVAL < 0) 2484 if (RETVAL < 0)
2408 } 2491 }
2409} 2492}
2410 OUTPUT: 2493 OUTPUT:
2411 RETVAL 2494 RETVAL
2412 2495
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2496MODULE = Deliantra::Client PACKAGE = dc::MixMusic
2414 2497
2415int 2498int
2416volume (int volume = -1) 2499volume (int volume = -1)
2417 PROTOTYPE: ;$ 2500 PROTOTYPE: ;$
2418 CODE: 2501 CODE:
2430void 2513void
2431halt () 2514halt ()
2432 CODE: 2515 CODE:
2433 Mix_HaltMusic (); 2516 Mix_HaltMusic ();
2434 2517
2435CFPlus::MixMusic 2518dc::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2519new (SV *class, dc::RW rwops)
2437 CODE: 2520 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2521 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2522 OUTPUT:
2440 RETVAL 2523 RETVAL
2441 2524
2442void 2525void
2443DESTROY (CFPlus::MixMusic self) 2526DESTROY (dc::MixMusic self)
2444 CODE: 2527 CODE:
2445 Mix_FreeMusic (self); 2528 Mix_FreeMusic (self);
2446 2529
2447int 2530int
2448play (CFPlus::MixMusic self, int loops = -1) 2531play (dc::MixMusic self, int loops = -1)
2449 CODE: 2532 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2533 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2534 OUTPUT:
2452 RETVAL 2535 RETVAL
2453 2536
2454void 2537void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2538fade_in_pos (dc::MixMusic self, int loops, int ms, double position)
2456 CODE: 2539 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2540 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2541
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2542MODULE = Deliantra::Client PACKAGE = dc::OpenGL
2460 2543
2461PROTOTYPES: ENABLE 2544PROTOTYPES: ENABLE
2462 2545
2463BOOT: 2546BOOT:
2464{ 2547{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2548 HV *stash = gv_stashpv ("dc::OpenGL", 1);
2466 static const struct { 2549 static const struct {
2467 const char *name; 2550 const char *name;
2468 IV iv; 2551 IV iv;
2469 } *civ, const_iv[] = { 2552 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 2553# define const_iv(name) { # name, (IV)name }
2505 const_iv (GL_INTENSITY), 2588 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 2589 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 2590 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 2591 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2592 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2593 const_iv (GL_COMPRESSED_ALPHA_ARB),
2594 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2595 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2596 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2597 const_iv (GL_COMPRESSED_RGB_ARB),
2598 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 2599 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 2600 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 2601 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 2602 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 2603 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2642 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 2643 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 2644 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 2645 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 2646 const_iv (GL_GENERATE_MIPMAP_HINT),
2647 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 2648 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 2649 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 2650 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 2651 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 2652 const_iv (GL_V3F),
2570 2660
2571 texture_av = newAV (); 2661 texture_av = newAV ();
2572 AvREAL_off (texture_av); 2662 AvREAL_off (texture_av);
2573} 2663}
2574 2664
2665void
2666disable_GL_EXT_blend_func_separate ()
2667 CODE:
2668 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0;
2670
2575char * 2671char *
2576gl_vendor () 2672gl_vendor ()
2577 CODE: 2673 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 2674 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 2675 OUTPUT:
2700 2796
2701void glRect (float x1, float y1, float x2, float y2) 2797void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 2798 CODE:
2703 glRectf (x1, y1, x2, y2); 2799 glRectf (x1, y1, x2, y2);
2704 2800
2801void glRect_lineloop (float x1, float y1, float x2, float y2)
2802 CODE:
2803 glBegin (GL_LINE_LOOP);
2804 glVertex2f (x1, y1);
2805 glVertex2f (x2, y1);
2806 glVertex2f (x2, y2);
2807 glVertex2f (x1, y2);
2808 glEnd ();
2809
2705PROTOTYPES: ENABLE 2810PROTOTYPES: ENABLE
2706 2811
2707void glBegin (int mode) 2812void glBegin (int mode)
2708 2813
2709void glEnd () 2814void glEnd ()
2777 2882
2778void glEndList () 2883void glEndList ()
2779 2884
2780void glCallList (int list) 2885void glCallList (int list)
2781 2886
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2887MODULE = Deliantra::Client PACKAGE = dc::UI::Base
2783 2888
2784PROTOTYPES: DISABLE 2889PROTOTYPES: DISABLE
2785 2890
2786void 2891void
2787find_widget (SV *self, NV x, NV y) 2892find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 2896 XPUSHs (self);
2792} 2897}
2793 2898
2794BOOT: 2899BOOT:
2795{ 2900{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2901 hover_gv = gv_fetchpv ("dc::UI::HOVER", 1, SVt_NV);
2797 2902
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2903 draw_x_gv = gv_fetchpv ("dc::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2904 draw_y_gv = gv_fetchpv ("dc::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2905 draw_w_gv = gv_fetchpv ("dc::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2906 draw_h_gv = gv_fetchpv ("dc::UI::Base::draw_h", 1, SVt_NV);
2802} 2907}
2803 2908
2804void 2909void
2805draw (SV *self) 2910draw (SV *self)
2806 CODE: 2911 CODE:
2810 NV x, y, w, h; 2915 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 2916 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 2917 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 2918 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 2919 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 2920 double draw_x, draw_y;
2817 2921
2818 if (!SvROK (self)) 2922 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2923 croak ("dc::Base::draw: %s not a reference", SvPV_nolen (self));
2820 2924
2821 hv = (HV *)SvRV (self); 2925 hv = (HV *)SvRV (self);
2822 2926
2823 if (SvTYPE (hv) != SVt_PVHV) 2927 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2928 croak ("dc::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 2929
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2930 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2931 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 2932
2829 if (!h || !w) 2933 if (!h || !w)
2849 { 2953 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2954 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 2955
2852 if (svp && SvTRUE (*svp)) 2956 if (svp && SvTRUE (*svp))
2853 { 2957 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2958 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 2959 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2960 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 2961 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 2962 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 2963 glVertex2f (w, 0);
2862 glEnd (); 2966 glEnd ();
2863 glDisable (GL_BLEND); 2967 glDisable (GL_BLEND);
2864 } 2968 }
2865 } 2969 }
2866#if 0 2970#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 2971 // draw borders, for debugging
2868 glPushMatrix; 2972 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 2973 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 2974 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 2975 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 2976 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 2977 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 2978 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 2979 glVertex2f (0 , h - 1);
2876 glEnd; 2980 glEnd ();
2877 glPopMatrix; 2981 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 2982#endif
2881 PUSHMARK (SP); 2983 PUSHMARK (SP);
2882 XPUSHs (self); 2984 XPUSHs (self);
2883 PUTBACK; 2985 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 2986 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines