ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.244 by root, Thu Dec 27 20:38:49 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 >= 480)
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 = 4096) 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);
813 839
814void 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}
855
856void
815Mix_CloseAudio () 857Mix_CloseAudio ()
816 858
817int 859int
818Mix_AllocateChannels (int numchans = -1) 860Mix_AllocateChannels (int numchans = -1)
861
862const char *
863Mix_GetError ()
819 864
820void 865void
821lowdelay (int fd, int val = 1) 866lowdelay (int fd, int val = 1)
822 CODE: 867 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 868 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
948void 993void
949error (char *message) 994error (char *message)
950 CODE: 995 CODE:
951 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
952#ifdef _WIN32 997#ifdef _WIN32
953 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
954#endif 999#endif
955 1000
956void 1001void
957fatal (char *message) 1002fatal (char *message)
958 CODE: 1003 CODE:
959 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
960#ifdef _WIN32 1005#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
962#endif 1007#endif
963 _exit (1); 1008 _exit (1);
964 1009
965void 1010void
966_exit (int retval = 0) 1011_exit (int retval = 0)
978#if DEBUG 1023#if DEBUG
979 VALGRIND_DO_LEAK_CHECK; 1024 VALGRIND_DO_LEAK_CHECK;
980#endif 1025#endif
981} 1026}
982 1027
983MODULE = CFPlus PACKAGE = CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = DC::Font
984 1029
985PROTOTYPES: DISABLE 1030PROTOTYPES: DISABLE
986 1031
987CFPlus::Font 1032DC::Font
988new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
989 CODE: 1034 CODE:
990{ 1035{
991 int count; 1036 int count;
992 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
995} 1040}
996 OUTPUT: 1041 OUTPUT:
997 RETVAL 1042 RETVAL
998 1043
999void 1044void
1000DESTROY (CFPlus::Font self) 1045DESTROY (DC::Font self)
1001 CODE: 1046 CODE:
1002 pango_font_description_free (self); 1047 pango_font_description_free (self);
1003 1048
1004void 1049void
1005make_default (CFPlus::Font self) 1050make_default (DC::Font self)
1006 PROTOTYPE: $ 1051 PROTOTYPE: $
1007 CODE: 1052 CODE:
1008 default_font = self; 1053 default_font = self;
1009 1054
1010MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = DC::Layout
1011 1056
1012PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1013 1058
1014void 1059void
1015reset_glyph_cache () 1060glyph_cache_backup ()
1016 PROTOTYPE: 1061 PROTOTYPE:
1017 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1018 tc_clear (); 1069 tc_restore ();
1019 1070
1020CFPlus::Layout 1071DC::Layout
1021new (SV *class) 1072new (SV *class)
1022 CODE: 1073 CODE:
1023 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
1024 1075
1025 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
1027 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1028 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1029 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1030 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1031 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1032 1084
1033 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1035 OUTPUT: 1087 OUTPUT:
1036 RETVAL 1088 RETVAL
1037 1089
1038void 1090void
1039DESTROY (CFPlus::Layout self) 1091DESTROY (DC::Layout self)
1040 CODE: 1092 CODE:
1041 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1042 Safefree (self); 1095 Safefree (self);
1043 1096
1044void 1097void
1045set_text (CFPlus::Layout self, SV *text_) 1098set_text (DC::Layout self, SV *text_)
1046 CODE: 1099 CODE:
1047{ 1100{
1048 STRLEN textlen; 1101 STRLEN textlen;
1049 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
1050 1103
1051 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
1052} 1105}
1053 1106
1054void 1107void
1055set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (DC::Layout self, SV *text_)
1056 CODE: 1109 CODE:
1057{ 1110{
1058 STRLEN textlen; 1111 STRLEN textlen;
1059 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
1060 1113
1061 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
1062} 1115}
1063 1116
1064void 1117void
1065set_shapes (CFPlus::Layout self, ...) 1118set_shapes (DC::Layout self, ...)
1066 CODE: 1119 CODE:
1067{ 1120{
1068 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
1069 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
1070 const char *pos = text; 1123 const char *pos = text;
1105 if (attrs) 1158 if (attrs)
1106 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
1107} 1160}
1108 1161
1109void 1162void
1110get_shapes (CFPlus::Layout self) 1163get_shapes (DC::Layout self)
1111 PPCODE: 1164 PPCODE:
1112{ 1165{
1113 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114 1167
1115 do 1168 do
1130 1183
1131 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
1132} 1185}
1133 1186
1134int 1187int
1135has_wrapped (CFPlus::Layout self) 1188has_wrapped (DC::Layout self)
1136 CODE: 1189 CODE:
1137{ 1190{
1138 int lines = 1; 1191 int lines = 1;
1139 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1140 1193
1145} 1198}
1146 OUTPUT: 1199 OUTPUT:
1147 RETVAL 1200 RETVAL
1148 1201
1149SV * 1202SV *
1150get_text (CFPlus::Layout self) 1203get_text (DC::Layout self)
1151 CODE: 1204 CODE:
1152 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
1154 OUTPUT: 1207 OUTPUT:
1155 RETVAL 1208 RETVAL
1156 1209
1157void 1210void
1158set_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.)
1159 CODE: 1212 CODE:
1160 self->r = r; 1213 self->r = r;
1161 self->g = g; 1214 self->g = g;
1162 self->b = b; 1215 self->b = b;
1163 self->a = a; 1216 self->a = a;
1164 1217
1165void 1218void
1166set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (DC::Layout self, DC::Font font = 0)
1167 CODE: 1220 CODE:
1168 if (self->font != font) 1221 if (self->font != font)
1169 { 1222 {
1170 self->font = font; 1223 self->font = font;
1171 layout_update_font (self); 1224 layout_update_font (self);
1172 } 1225 }
1173 1226
1174void 1227void
1175set_height (CFPlus::Layout self, int base_height) 1228set_height (DC::Layout self, int base_height)
1176 CODE: 1229 CODE:
1177 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
1178 { 1231 {
1179 self->base_height = base_height; 1232 self->base_height = base_height;
1180 layout_update_font (self); 1233 layout_update_font (self);
1181 } 1234 }
1182 1235
1183void 1236void
1184set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (DC::Layout self, int max_width = -1)
1185 CODE: 1238 CODE:
1186 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);
1187 1240
1188void 1241void
1189set_indent (CFPlus::Layout self, int indent) 1242set_indent (DC::Layout self, int indent)
1190 CODE: 1243 CODE:
1191 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192 1245
1193void 1246void
1194set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (DC::Layout self, int spacing)
1195 CODE: 1248 CODE:
1196 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197 1250
1198void 1251void
1199set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (DC::Layout self, int ellipsise)
1200 CODE: 1253 CODE:
1201 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1202 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1206 ); 1259 );
1207 1260
1208void 1261void
1209set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (DC::Layout self, int spm)
1210 CODE: 1263 CODE:
1211 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212 1265
1213void 1266void
1214size (CFPlus::Layout self) 1267size (DC::Layout self)
1215 PPCODE: 1268 PPCODE:
1216{ 1269{
1217 int w, h; 1270 int w, h;
1218 1271
1219 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
1222 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1223 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1224} 1277}
1225 1278
1226int 1279int
1227descent (CFPlus::Layout self) 1280descent (DC::Layout self)
1228 CODE: 1281 CODE:
1229{ 1282{
1230 PangoRectangle rect; 1283 PangoRectangle rect;
1231 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1232 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
1234} 1287}
1235 OUTPUT: 1288 OUTPUT:
1236 RETVAL 1289 RETVAL
1237 1290
1238int 1291int
1239xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (DC::Layout self, int x, int y)
1240 CODE: 1293 CODE:
1241{ 1294{
1242 int index, trailing; 1295 int index, trailing;
1243 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);
1244 RETVAL = index + trailing; 1297 RETVAL = index + trailing;
1245} 1298}
1246 OUTPUT: 1299 OUTPUT:
1247 RETVAL 1300 RETVAL
1248 1301
1249void 1302void
1250cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (DC::Layout self, int index)
1251 PPCODE: 1304 PPCODE:
1252{ 1305{
1253 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1254 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1255 1308
1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1260} 1313}
1261 1314
1262void 1315void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1316index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264 PPCODE: 1317 PPCODE:
1265{ 1318{
1266 int line, x; 1319 int line, x;
1267 1320
1268 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);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1325 PUSHs (sv_2mortal (newSViv (line - 1)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1327}
1275 1328
1276void 1329void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1330line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1331 PPCODE:
1279{ 1332{
1280 PangoLayoutLine *lp; 1333 PangoLayoutLine *lp;
1281 int index, trailing; 1334 int index, trailing;
1282 1335
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1350 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1351 }
1299} 1352}
1300 1353
1301void 1354void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1355render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1356 CODE:
1357 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1358 pango_opengl_render_layout_subpixel (
1305 self->pl, 1359 self->pl,
1360 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1361 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1362 self->r, self->g, self->b, self->a,
1308 flags 1363 flags
1309 ); 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);
1310 1368
1311MODULE = 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
1312 1389
1313PROTOTYPES: ENABLE 1390PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1391
1317void 1392void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1393pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1394 CODE:
1320{ 1395{
1347 HV *hv = (HV *)SvRV (self); 1422 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1423 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1424 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1425 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1426
1427 if (name <= 0)
1428 XSRETURN_EMPTY;
1429
1352 if (items < 5) 1430 if (items < 5)
1353 { 1431 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1432 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1433 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1434 }
1394 RETVAL = width > 0; 1472 RETVAL = width > 0;
1395} 1473}
1396 OUTPUT: 1474 OUTPUT:
1397 RETVAL 1475 RETVAL
1398 1476
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1477MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1478
1401PROTOTYPES: DISABLE 1479PROTOTYPES: DISABLE
1402 1480
1403CFPlus::Map 1481DC::Map
1404new (SV *class) 1482new (SV *class)
1405 CODE: 1483 CODE:
1406 New (0, RETVAL, 1, struct map); 1484 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1485 RETVAL->x = 0;
1408 RETVAL->y = 0; 1486 RETVAL->y = 0;
1416 RETVAL->row = 0; 1494 RETVAL->row = 0;
1417 OUTPUT: 1495 OUTPUT:
1418 RETVAL 1496 RETVAL
1419 1497
1420void 1498void
1421DESTROY (CFPlus::Map self) 1499DESTROY (DC::Map self)
1422 CODE: 1500 CODE:
1423{ 1501{
1424 map_clear (self); 1502 map_clear (self);
1425 Safefree (self->face2tile); 1503 Safefree (self->face2tile);
1426 Safefree (self->tex); 1504 Safefree (self->tex);
1427 Safefree (self); 1505 Safefree (self);
1428} 1506}
1429 1507
1430void 1508void
1431resize (CFPlus::Map self, int map_width, int map_height) 1509resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1510 CODE:
1433 self->w = map_width; 1511 self->w = map_width;
1434 self->h = map_height; 1512 self->h = map_height;
1435 1513
1436void 1514void
1437clear (CFPlus::Map self) 1515clear (DC::Map self)
1438 CODE: 1516 CODE:
1439 map_clear (self); 1517 map_clear (self);
1440 1518
1441void 1519void
1442set_tileid (CFPlus::Map self, int face, int tile) 1520set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1521 CODE:
1444{ 1522{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1523 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1524 need_texid (self, tile);
1447} 1525}
1448 1526
1449void 1527void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1528set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1529 CODE:
1452{ 1530{
1453 tileid texid; 1531 tileid texid;
1454 maptex *tex; 1532 maptex *tex;
1455 1533
1468 tex->smoothtile = self->face2tile [smooth]; 1546 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1547 tex->smoothlevel = level;
1470} 1548}
1471 1549
1472void 1550void
1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1474 CODE: 1552 CODE:
1475{ 1553{
1476 need_texid (self, texid); 1554 need_texid (self, texid);
1477 1555
1478 { 1556 {
1498 // from transparent color bleeding and ugly wrapping effects. 1576 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1577 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1578}
1501 1579
1502int 1580int
1503ox (CFPlus::Map self) 1581ox (DC::Map self)
1504 ALIAS: 1582 ALIAS:
1505 oy = 1 1583 oy = 1
1506 x = 2 1584 x = 2
1507 y = 3 1585 y = 3
1508 w = 4 1586 w = 4
1519 } 1597 }
1520 OUTPUT: 1598 OUTPUT:
1521 RETVAL 1599 RETVAL
1522 1600
1523void 1601void
1524scroll (CFPlus::Map self, int dx, int dy) 1602scroll (DC::Map self, int dx, int dy)
1525 CODE: 1603 CODE:
1526{ 1604{
1527 if (dx > 0) 1605 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1606 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1607 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1622 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1623 self->y += MAP_EXTEND_Y;
1546 } 1624 }
1547} 1625}
1548 1626
1549void 1627SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1628map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1629 CODE:
1552{ 1630{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1631 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1632 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1633 mapcell *cell;
1556 int x, y, flags; 1634 int x, y, z, flags;
1635 AV *missing = newAV ();
1636 RETVAL = newRV_noinc ((SV *)missing);
1557 1637
1558 while (data < data_end - 1) 1638 while (data < data_end - 1)
1559 { 1639 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1640 flags = (data [0] << 8) + data [1]; data += 2;
1561 1641
1612 } 1692 }
1613 else 1693 else
1614 cell->darkness = *data++ + 1; 1694 cell->darkness = *data++ + 1;
1615 } 1695 }
1616 1696
1697 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1698 if (flags & (4 >> z))
1618 { 1699 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1700 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1701 need_facenum (self, face);
1621 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 }
1622 } 1717 }
1623
1624 if (flags & 2)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1629 }
1630
1631 if (flags & 1)
1632 {
1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1636 }
1637 } 1718 }
1638 else 1719 else
1639 cell->darkness = 0; 1720 cell->darkness = 0;
1640 } 1721 }
1641} 1722}
1723 OUTPUT:
1724 RETVAL
1642 1725
1643SV * 1726SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1727mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1728 CODE:
1646{ 1729{
1647 int x1, x; 1730 int x1, x;
1648 int y1, y; 1731 int y1, y;
1649 int z; 1732 int z;
1694} 1777}
1695 OUTPUT: 1778 OUTPUT:
1696 RETVAL 1779 RETVAL
1697 1780
1698void 1781void
1699draw (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)
1700 CODE: 1783 CODE:
1701{ 1784{
1785 int x, y, z;
1786
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 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
1704 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)
1705 smooth_key skey; 1790 smooth_key skey;
1706 int x, y, z; 1791
1707 int last_name; 1792 rc_t *rc = rc_alloc ();
1793 rc_key_t key;
1794 rc_array_t *arr;
1708 1795
1709 // thats current max. sorry. 1796 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1797 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1798 if (sh > 255) sh = 255;
1712 1799
1713 // clear key, in case of extra padding 1800 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1801 memset (&skey, 0, sizeof (skey));
1715 1802
1716 glColor4ub (255, 255, 255, 255); 1803 memset (&key, 0, sizeof (key));
1717 1804 key.r = 255;
1718 glEnable (GL_BLEND); 1805 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1806 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1807 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1808 key.mode = GL_QUADS;
1722 1809 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1810 key.texname = -1;
1724
1725 last_name = 0;
1726 1811
1727 mx += self->x; 1812 mx += self->x;
1728 my += self->y; 1813 my += self->y;
1729 1814
1730 // first pass: determine smooth_max 1815 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1831 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1832 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1833 self->tex [cell->tile [2]].smoothlevel));
1749 } 1834 }
1750 } 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);
1751 1840
1752 for (z = 0; z <= 2; z++) 1841 for (z = 0; z <= 2; z++)
1753 { 1842 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1843 memset (smooth_level, 0, sizeof (smooth_level));
1755 1844
1765 tileid tile = cell->tile [z]; 1854 tileid tile = cell->tile [z];
1766 1855
1767 if (tile) 1856 if (tile)
1768 { 1857 {
1769 maptex tex = self->tex [tile]; 1858 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1859 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1860
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1861 if (key.texname != tex.name)
1776 { 1862 {
1777 if (!tex.name) 1863 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1864 tex = self->tex [2]; /* missing, replace by noface */
1779 1865
1780 glEnd (); 1866 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1867 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1868 }
1784 1869
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1870 px = (x + 1) * T - tex.w;
1871 py = (y + 1) * T - tex.h;
1872
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1877
1790 if (cell->flags && z == 2) 1878 if (cell->flags && z == 2)
1791 { 1879 {
1880 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1881 if (cell->flags & 1)
1793 { 1882 {
1794 maptex tex = self->tex [1]; 1883 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1884 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1885 int py = y * T - T * 6 / 32;
1797 1886
1887 if (tex.name)
1798 glEnd (); 1888 {
1799 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);
1800 glBegin (GL_QUADS); 1899 }
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 } 1900 }
1807 } 1901 }
1808 1902
1809 // update smooth hash 1903 // update smooth hash
1810 if (tex.smoothtile) 1904 if (tex.smoothtile)
1846 } 1940 }
1847 } 1941 }
1848 } 1942 }
1849 } 1943 }
1850 1944
1945 rc_draw (rc);
1946 rc_clear (rc);
1947
1851 // go through all smoothlevels, lowest to highest, then draw. 1948 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1949 // this is basically counting sort
1853 { 1950 {
1854 int w, b; 1951 int w, b;
1855 1952
1953 glEnable (GL_TEXTURE_2D);
1954 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1955 for (w = 0; w < 256 / 32; ++w)
1857 { 1956 {
1858 uint32_t smask = smooth_level [w]; 1957 uint32_t smask = smooth_level [w];
1859 if (smask) 1958 if (smask)
1860 for (b = 0; b < 32; ++b) 1959 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1978 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1979 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1980 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1981 float dy = tex.t * .5f ; // 2 images/column
1883 1982
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1983 if (tex.name)
1887 { 1984 {
1985 // this time avoiding texture state changes
1986 // save gobs of state changes.
1888 if (!tex.name) 1987 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 1988 {
1890
1891 glEnd (); 1989 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1990 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 1991 glBegin (GL_QUADS);
1894 } 1992 }
1895 1993
1896 if (border) 1994 if (border)
1897 { 1995 {
1898 float ox = border * dx; 1996 float ox = border * dx;
1899 1997
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 1998 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 1999 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2000 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2001 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2002 }
1905 2003
1906 if (corner) 2004 if (corner)
1907 { 2005 {
1908 float ox = corner * dx; 2006 float ox = corner * dx;
1909 2007
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2008 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2009 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2010 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2011 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2012 }
1914 } 2013 }
1915 } 2014 }
1916 } 2015 }
1917 } 2016 }
1918 } 2017 }
2018
2019 glEnd ();
2020 glDisable (GL_TEXTURE_2D);
2021 key.texname = -1;
1919 } 2022 }
1920 2023
1921 hv_clear (smooth); 2024 hv_clear (smooth);
1922 } 2025 }
1923 2026
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2027 glDisable (GL_BLEND);
2028 rc_free (rc);
1928 2029
1929 // top layer: overlays such as the health bar 2030 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2031 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2032 if (0 <= y + my && y + my < self->rows)
1932 { 2033 {
1957 } 2058 }
1958 } 2059 }
1959} 2060}
1960 2061
1961void 2062void
1962draw_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)
1963 CODE: 2064 CODE:
1964{ 2065{
1965 static float color[16][3] = { 2066 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2067 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2068 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2118 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2119 glDisable (GL_TEXTURE_2D);
2019} 2120}
2020 2121
2021void 2122void
2022fow_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)
2023 PPCODE: 2124 PPCODE:
2024{ 2125{
2025 int x, y; 2126 int x, y;
2026 int sw1 = sw + 2; 2127 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2128 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2199 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2200 PUSHs (darkness3_sv);
2100} 2201}
2101 2202
2102SV * 2203SV *
2103get_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)
2104 CODE: 2205 CODE:
2105{ 2206{
2106 int x, y, x1, y1; 2207 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2208 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2209 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2274}
2174 OUTPUT: 2275 OUTPUT:
2175 RETVAL 2276 RETVAL
2176 2277
2177void 2278void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2279set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2280 PPCODE:
2180{ 2281{
2181 int x, y, z; 2282 int x, y, z;
2182 int w, h; 2283 int w, h;
2183 int x1, y1; 2284 int x1, y1;
2184 2285
2185 if (*data++ != 0) 2286 if (*data++ != 0)
2186 return; /* version mismatch */ 2287 XSRETURN_EMPTY; /* version mismatch */
2187 2288
2188 w = *data++ << 8; w |= *data++; 2289 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2290 h = *data++ << 8; h |= *data++;
2190 2291
2191 // 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
2236 } 2337 }
2237 } 2338 }
2238 } 2339 }
2239} 2340}
2240 2341
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2342MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2343
2243CFPlus::RW 2344DC::RW
2244new (SV *class, SV *data_sv) 2345new (SV *class, SV *data_sv)
2245 CODE: 2346 CODE:
2246{ 2347{
2247 STRLEN datalen; 2348 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2349 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2351 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2352}
2252 OUTPUT: 2353 OUTPUT:
2253 RETVAL 2354 RETVAL
2254 2355
2255CFPlus::RW 2356DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2357new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2358 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2359 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2360 OUTPUT:
2260 RETVAL 2361 RETVAL
2261 2362
2363# fails on win32:
2364# dc.xs(2268) : error C2059: syntax error : '('
2262void 2365#void
2263close (CFPlus::RW self) 2366#close (DC::RW self)
2264 CODE: 2367# CODE:
2265 SDL_RWclose (self); 2368# (self->(close)) (self);
2266 2369
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2370MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2371
2269PROTOTYPES: DISABLE 2372PROTOTYPES: DISABLE
2270 2373
2374DC::Channel
2375find ()
2376 CODE:
2377{
2378 RETVAL = Mix_GroupAvailable (-1);
2379
2380 if (RETVAL < 0)
2381 {
2382 RETVAL = Mix_GroupOldest (-1);
2383
2384 if (RETVAL < 0)
2385 XSRETURN_UNDEF;
2386
2387 Mix_HaltChannel (RETVAL);
2388 }
2389
2390 Mix_UnregisterAllEffects (RETVAL);
2391 Mix_Volume (RETVAL, 128);
2392}
2393 OUTPUT:
2394 RETVAL
2395
2271void 2396void
2272halt (CFPlus::Channel self) 2397halt (DC::Channel self)
2273 CODE: 2398 CODE:
2274 Mix_HaltChannel (self); 2399 Mix_HaltChannel (self);
2275 2400
2276void 2401void
2277expire (CFPlus::Channel self, int ticks = -1) 2402expire (DC::Channel self, int ticks = -1)
2278 CODE: 2403 CODE:
2279 Mix_ExpireChannel (self, ticks); 2404 Mix_ExpireChannel (self, ticks);
2280 2405
2281void 2406void
2282fade_out (CFPlus::Channel self, int ticks = -1) 2407fade_out (DC::Channel self, int ticks = -1)
2283 CODE: 2408 CODE:
2284 Mix_FadeOutChannel (self, ticks); 2409 Mix_FadeOutChannel (self, ticks);
2285 2410
2286int 2411int
2287volume (CFPlus::Channel self, int volume) 2412volume (DC::Channel self, int volume)
2288 CODE: 2413 CODE:
2289 RETVAL = Mix_Volume (self, volume); 2414 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2290 OUTPUT: 2415 OUTPUT:
2291 RETVAL 2416 RETVAL
2292 2417
2293void 2418void
2294unregister_all_effects (CFPlus::Channel self) 2419unregister_all_effects (DC::Channel self)
2295 CODE: 2420 CODE:
2296 Mix_UnregisterAllEffects (self); 2421 Mix_UnregisterAllEffects (self);
2297 2422
2298void 2423void
2299set_panning (CFPlus::Channel self, int left, int right) 2424set_panning (DC::Channel self, int left, int right)
2300 CODE: 2425 CODE:
2426 left = CLAMP (left , 0, 255);
2427 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2428 Mix_SetPanning (self, left, right);
2302 2429
2303void 2430void
2304set_distance (CFPlus::Channel self, int distance) 2431set_distance (DC::Channel self, int distance)
2305 CODE: 2432 CODE:
2306 Mix_SetDistance (self, distance); 2433 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2434
2308void 2435void
2309set_position (CFPlus::Channel self, int angle, int distance) 2436set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2437 CODE:
2438
2439void
2440set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441 CODE:
2442{
2443 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2445 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446}
2312 2447
2313void 2448void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2449set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2450 CODE:
2316 Mix_SetReverseStereo (self, flip); 2451 Mix_SetReverseStereo (self, flip);
2317 2452
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2453MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2454
2320PROTOTYPES: DISABLE 2455PROTOTYPES: DISABLE
2321 2456
2322CFPlus::MixChunk 2457DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2458new (SV *class, DC::RW rwops)
2324 CODE: 2459 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2460 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2461 OUTPUT:
2327 RETVAL 2462 RETVAL
2328 2463
2329void 2464void
2330DESTROY (CFPlus::MixChunk self) 2465DESTROY (DC::MixChunk self)
2331 CODE: 2466 CODE:
2332 Mix_FreeChunk (self); 2467 Mix_FreeChunk (self);
2333 2468
2334int 2469int
2335volume (CFPlus::MixChunk self, int volume = -1) 2470volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2471 CODE:
2472 if (items > 1)
2473 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2474 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2475 OUTPUT:
2339 RETVAL 2476 RETVAL
2340 2477
2341CFPlus::Channel 2478DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2479play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2480 CODE:
2481{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2482 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483
2484 if (RETVAL < 0)
2485 XSRETURN_UNDEF;
2486
2487 if (channel < 0)
2488 {
2345 Mix_UnregisterAllEffects (RETVAL); 2489 Mix_UnregisterAllEffects (RETVAL);
2490 Mix_Volume (RETVAL, 128);
2491 }
2492}
2346 OUTPUT: 2493 OUTPUT:
2347 RETVAL 2494 RETVAL
2348 2495
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2496MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2497
2351int 2498int
2352volume (int volume = -1) 2499volume (int volume = -1)
2353 PROTOTYPE: ;$ 2500 PROTOTYPE: ;$
2354 CODE: 2501 CODE:
2502 if (items > 0)
2503 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2504 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2505 OUTPUT:
2357 RETVAL 2506 RETVAL
2358 2507
2359void 2508void
2364void 2513void
2365halt () 2514halt ()
2366 CODE: 2515 CODE:
2367 Mix_HaltMusic (); 2516 Mix_HaltMusic ();
2368 2517
2369CFPlus::MixMusic 2518DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2519new (SV *class, DC::RW rwops)
2371 CODE: 2520 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2521 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2522 OUTPUT:
2374 RETVAL 2523 RETVAL
2375 2524
2376void 2525void
2377DESTROY (CFPlus::MixMusic self) 2526DESTROY (DC::MixMusic self)
2378 CODE: 2527 CODE:
2379 Mix_FreeMusic (self); 2528 Mix_FreeMusic (self);
2380 2529
2381int 2530int
2382play (CFPlus::MixMusic self, int loops = -1) 2531play (DC::MixMusic self, int loops = -1)
2383 CODE: 2532 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2533 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2534 OUTPUT:
2386 RETVAL 2535 RETVAL
2387 2536
2388void 2537void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2538fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2539 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2540 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2541
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2542MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2543
2395PROTOTYPES: ENABLE 2544PROTOTYPES: ENABLE
2396 2545
2397BOOT: 2546BOOT:
2398{ 2547{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2548 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2549 static const struct {
2401 const char *name; 2550 const char *name;
2402 IV iv; 2551 IV iv;
2403 } *civ, const_iv[] = { 2552 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2553# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2588 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2589 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2590 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2591 const_iv (GL_FLOAT),
2443 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),
2444 const_iv (GL_COMPILE), 2599 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2600 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2601 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2602 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2603 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2642 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2643 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2644 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2645 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2646 const_iv (GL_GENERATE_MIPMAP_HINT),
2647 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2648 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2649 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2650 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2651 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2652 const_iv (GL_V3F),
2504 2660
2505 texture_av = newAV (); 2661 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2662 AvREAL_off (texture_av);
2507} 2663}
2508 2664
2665void
2666disable_GL_EXT_blend_func_separate ()
2667 CODE:
2668 gl.BlendFuncSeparate = 0;
2669 gl.BlendFuncSeparateEXT = 0;
2670
2509char * 2671char *
2510gl_vendor () 2672gl_vendor ()
2511 CODE: 2673 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2674 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2675 OUTPUT:
2634 2796
2635void glRect (float x1, float y1, float x2, float y2) 2797void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2798 CODE:
2637 glRectf (x1, y1, x2, y2); 2799 glRectf (x1, y1, x2, y2);
2638 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
2639PROTOTYPES: ENABLE 2810PROTOTYPES: ENABLE
2640 2811
2641void glBegin (int mode) 2812void glBegin (int mode)
2642 2813
2643void glEnd () 2814void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 2847 CODE:
2677 if (gl.SeparableFilter2D) 2848 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2850
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 2852
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 2854
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2855void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2856
2711 2882
2712void glEndList () 2883void glEndList ()
2713 2884
2714void glCallList (int list) 2885void glCallList (int list)
2715 2886
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2887MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 2888
2718PROTOTYPES: DISABLE 2889PROTOTYPES: DISABLE
2719 2890
2720void 2891void
2721find_widget (SV *self, NV x, NV y) 2892find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 2896 XPUSHs (self);
2726} 2897}
2727 2898
2728BOOT: 2899BOOT:
2729{ 2900{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2901 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 2902
2732 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);
2733 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);
2734 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);
2735 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);
2736} 2907}
2737 2908
2738void 2909void
2739draw (SV *self) 2910draw (SV *self)
2740 CODE: 2911 CODE:
2744 NV x, y, w, h; 2915 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2916 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2917 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2918 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2919 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2920 double draw_x, draw_y;
2751 2921
2752 if (!SvROK (self)) 2922 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2923 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2924
2755 hv = (HV *)SvRV (self); 2925 hv = (HV *)SvRV (self);
2756 2926
2757 if (SvTYPE (hv) != SVt_PVHV) 2927 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2928 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 2929
2760 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.;
2761 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.;
2762 2932
2763 if (!h || !w) 2933 if (!h || !w)
2783 { 2953 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2954 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2955
2786 if (svp && SvTRUE (*svp)) 2956 if (svp && SvTRUE (*svp))
2787 { 2957 {
2788 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);
2789 glEnable (GL_BLEND); 2959 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2960 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2961 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2962 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2963 glVertex2f (w, 0);
2796 glEnd (); 2966 glEnd ();
2797 glDisable (GL_BLEND); 2967 glDisable (GL_BLEND);
2798 } 2968 }
2799 } 2969 }
2800#if 0 2970#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2971 // draw borders, for debugging
2802 glPushMatrix; 2972 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2973 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2974 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2975 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2976 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2977 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2978 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2979 glVertex2f (0 , h - 1);
2810 glEnd; 2980 glEnd ();
2811 glPopMatrix; 2981 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 2982#endif
2815 PUSHMARK (SP); 2983 PUSHMARK (SP);
2816 XPUSHs (self); 2984 XPUSHs (self);
2817 PUTBACK; 2985 PUTBACK;
2818 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