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.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 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);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3)
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line;
1326#endif
1270 1327
1271 EXTEND (SP, 2); 1328 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1329 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1331}
1275 1332
1276void 1333void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1334line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1335 PPCODE:
1279{ 1336{
1280 PangoLayoutLine *lp; 1337 PangoLayoutLine *lp;
1281 int index, trailing; 1338 int index, trailing;
1282 1339
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1354 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1355 }
1299} 1356}
1300 1357
1301void 1358void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1359render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1360 CODE:
1361 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1362 pango_opengl_render_layout_subpixel (
1305 self->pl, 1363 self->pl,
1364 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1365 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1366 self->r, self->g, self->b, self->a,
1308 flags 1367 flags
1309 ); 1368 );
1369 // we assume that context_change actually clears/frees stuff
1370 // and does not do any recomputation...
1371 pango_layout_context_changed (self->pl);
1310 1372
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1373void
1374draw (DC::Layout self)
1375 CODE:
1376{
1377 glEnable (GL_TEXTURE_2D);
1378 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1379 glEnable (GL_BLEND);
1380 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1381 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1382 glEnable (GL_ALPHA_TEST);
1383 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1384
1385 rc_draw (self->rc);
1386
1387 glDisable (GL_ALPHA_TEST);
1388 glDisable (GL_BLEND);
1389 glDisable (GL_TEXTURE_2D);
1390}
1391
1392MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1393
1313PROTOTYPES: ENABLE 1394PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1395
1317void 1396void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1397pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1398 CODE:
1320{ 1399{
1347 HV *hv = (HV *)SvRV (self); 1426 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1427 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1428 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1429 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1430
1431 if (name <= 0)
1432 XSRETURN_EMPTY;
1433
1352 if (items < 5) 1434 if (items < 5)
1353 { 1435 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1436 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1437 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1438 }
1394 RETVAL = width > 0; 1476 RETVAL = width > 0;
1395} 1477}
1396 OUTPUT: 1478 OUTPUT:
1397 RETVAL 1479 RETVAL
1398 1480
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1481MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1482
1401PROTOTYPES: DISABLE 1483PROTOTYPES: DISABLE
1402 1484
1403CFPlus::Map 1485DC::Map
1404new (SV *class) 1486new (SV *class)
1405 CODE: 1487 CODE:
1406 New (0, RETVAL, 1, struct map); 1488 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1489 RETVAL->x = 0;
1408 RETVAL->y = 0; 1490 RETVAL->y = 0;
1416 RETVAL->row = 0; 1498 RETVAL->row = 0;
1417 OUTPUT: 1499 OUTPUT:
1418 RETVAL 1500 RETVAL
1419 1501
1420void 1502void
1421DESTROY (CFPlus::Map self) 1503DESTROY (DC::Map self)
1422 CODE: 1504 CODE:
1423{ 1505{
1424 map_clear (self); 1506 map_clear (self);
1425 Safefree (self->face2tile); 1507 Safefree (self->face2tile);
1426 Safefree (self->tex); 1508 Safefree (self->tex);
1427 Safefree (self); 1509 Safefree (self);
1428} 1510}
1429 1511
1430void 1512void
1431resize (CFPlus::Map self, int map_width, int map_height) 1513resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1514 CODE:
1433 self->w = map_width; 1515 self->w = map_width;
1434 self->h = map_height; 1516 self->h = map_height;
1435 1517
1436void 1518void
1437clear (CFPlus::Map self) 1519clear (DC::Map self)
1438 CODE: 1520 CODE:
1439 map_clear (self); 1521 map_clear (self);
1440 1522
1441void 1523void
1442set_tileid (CFPlus::Map self, int face, int tile) 1524set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1525 CODE:
1444{ 1526{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1527 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1528 need_texid (self, tile);
1447} 1529}
1448 1530
1449void 1531void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1532set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1533 CODE:
1452{ 1534{
1453 tileid texid; 1535 tileid texid;
1454 maptex *tex; 1536 maptex *tex;
1455 1537
1468 tex->smoothtile = self->face2tile [smooth]; 1550 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1551 tex->smoothlevel = level;
1470} 1552}
1471 1553
1472void 1554void
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) 1555set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1474 CODE: 1556 CODE:
1475{ 1557{
1476 need_texid (self, texid); 1558 need_texid (self, texid);
1477 1559
1478 { 1560 {
1498 // from transparent color bleeding and ugly wrapping effects. 1580 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1582}
1501 1583
1502int 1584int
1503ox (CFPlus::Map self) 1585ox (DC::Map self)
1504 ALIAS: 1586 ALIAS:
1505 oy = 1 1587 oy = 1
1506 x = 2 1588 x = 2
1507 y = 3 1589 y = 3
1508 w = 4 1590 w = 4
1519 } 1601 }
1520 OUTPUT: 1602 OUTPUT:
1521 RETVAL 1603 RETVAL
1522 1604
1523void 1605void
1524scroll (CFPlus::Map self, int dx, int dy) 1606scroll (DC::Map self, int dx, int dy)
1525 CODE: 1607 CODE:
1526{ 1608{
1527 if (dx > 0) 1609 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1610 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1611 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1626 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1627 self->y += MAP_EXTEND_Y;
1546 } 1628 }
1547} 1629}
1548 1630
1549void 1631SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1632map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1633 CODE:
1552{ 1634{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1636 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1637 mapcell *cell;
1556 int x, y, flags; 1638 int x, y, z, flags;
1639 AV *missing = newAV ();
1640 RETVAL = newRV_noinc ((SV *)missing);
1557 1641
1558 while (data < data_end - 1) 1642 while (data < data_end - 1)
1559 { 1643 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1644 flags = (data [0] << 8) + data [1]; data += 2;
1561 1645
1612 } 1696 }
1613 else 1697 else
1614 cell->darkness = *data++ + 1; 1698 cell->darkness = *data++ + 1;
1615 } 1699 }
1616 1700
1701 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1702 if (flags & (4 >> z))
1618 { 1703 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1704 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1705 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1706 cell->tile [z] = self->face2tile [face];
1707
1708 if (cell->tile [z])
1709 {
1710 maptex *tex = self->tex + cell->tile [z];
1711 if (!tex->name)
1712 av_push (missing, newSViv (cell->tile [z]));
1713
1714 if (tex->smoothtile)
1715 {
1716 maptex *smooth = self->tex + tex->smoothtile;
1717 if (!smooth->name)
1718 av_push (missing, newSViv (tex->smoothtile));
1719 }
1720 }
1622 } 1721 }
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 } 1722 }
1638 else 1723 else
1639 cell->darkness = 0; 1724 cell->darkness = 0;
1640 } 1725 }
1641} 1726}
1727 OUTPUT:
1728 RETVAL
1642 1729
1643SV * 1730SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1731mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1732 CODE:
1646{ 1733{
1647 int x1, x; 1734 int x1, x;
1648 int y1, y; 1735 int y1, y;
1649 int z; 1736 int z;
1694} 1781}
1695 OUTPUT: 1782 OUTPUT:
1696 RETVAL 1783 RETVAL
1697 1784
1698void 1785void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1786draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1787 CODE:
1701{ 1788{
1789 int x, y, z;
1790
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1792 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 1793 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1794 smooth_key skey;
1706 int x, y, z; 1795
1707 int last_name; 1796 rc_t *rc = rc_alloc ();
1797 rc_key_t key;
1798 rc_array_t *arr;
1708 1799
1709 // thats current max. sorry. 1800 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1801 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1802 if (sh > 255) sh = 255;
1712 1803
1713 // clear key, in case of extra padding 1804 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1805 memset (&skey, 0, sizeof (skey));
1715 1806
1716 glColor4ub (255, 255, 255, 255); 1807 memset (&key, 0, sizeof (key));
1717 1808 key.r = 255;
1718 glEnable (GL_BLEND); 1809 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1810 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1811 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1812 key.mode = GL_QUADS;
1722 1813 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1814 key.texname = -1;
1724
1725 last_name = 0;
1726 1815
1727 mx += self->x; 1816 mx += self->x;
1728 my += self->y; 1817 my += self->y;
1729 1818
1730 // first pass: determine smooth_max 1819 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1835 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1836 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1837 self->tex [cell->tile [2]].smoothlevel));
1749 } 1838 }
1750 } 1839 }
1840
1841 glEnable (GL_BLEND);
1842 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1844
1752 for (z = 0; z <= 2; z++) 1845 for (z = 0; z <= 2; z++)
1753 { 1846 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1847 memset (smooth_level, 0, sizeof (smooth_level));
1755 1848
1765 tileid tile = cell->tile [z]; 1858 tileid tile = cell->tile [z];
1766 1859
1767 if (tile) 1860 if (tile)
1768 { 1861 {
1769 maptex tex = self->tex [tile]; 1862 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1863 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1864
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1865 if (key.texname != tex.name)
1776 { 1866 {
1777 if (!tex.name) 1867 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1868 tex = self->tex [2]; /* missing, replace by noface */
1779 1869
1780 glEnd (); 1870 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1871 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1872 }
1784 1873
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1874 px = (x + 1) * T - tex.w;
1875 py = (y + 1) * T - tex.h;
1876
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1878 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); 1879 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 ); 1880 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1881
1790 if (cell->flags && z == 2) 1882 if (cell->flags && z == 2)
1791 { 1883 {
1884 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1885 if (cell->flags & 1)
1793 { 1886 {
1794 maptex tex = self->tex [1]; 1887 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1888 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1889 int py = y * T - T * 6 / 32;
1797 1890
1891 if (tex.name)
1798 glEnd (); 1892 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1893 if (key.texname != tex.name)
1894 {
1895 key.texname = tex.name;
1896 arr = rc_array (rc, &key);
1897 }
1898
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1903 }
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 } 1904 }
1807 } 1905 }
1808 1906
1809 // update smooth hash 1907 // update smooth hash
1810 if (tex.smoothtile) 1908 if (tex.smoothtile)
1846 } 1944 }
1847 } 1945 }
1848 } 1946 }
1849 } 1947 }
1850 1948
1949 rc_draw (rc);
1950 rc_clear (rc);
1951
1851 // go through all smoothlevels, lowest to highest, then draw. 1952 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1953 // this is basically counting sort
1853 { 1954 {
1854 int w, b; 1955 int w, b;
1855 1956
1957 glEnable (GL_TEXTURE_2D);
1958 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1959 for (w = 0; w < 256 / 32; ++w)
1857 { 1960 {
1858 uint32_t smask = smooth_level [w]; 1961 uint32_t smask = smooth_level [w];
1859 if (smask) 1962 if (smask)
1860 for (b = 0; b < 32; ++b) 1963 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1982 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1983 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1984 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1985 float dy = tex.t * .5f ; // 2 images/column
1883 1986
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1987 if (tex.name)
1887 { 1988 {
1989 // this time avoiding texture state changes
1990 // save gobs of state changes.
1888 if (!tex.name) 1991 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 1992 {
1890
1891 glEnd (); 1993 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 1995 glBegin (GL_QUADS);
1894 } 1996 }
1895 1997
1896 if (border) 1998 if (border)
1897 { 1999 {
1898 float ox = border * dx; 2000 float ox = border * dx;
1899 2001
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2006 }
1905 2007
1906 if (corner) 2008 if (corner)
1907 { 2009 {
1908 float ox = corner * dx; 2010 float ox = corner * dx;
1909 2011
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2016 }
1914 } 2017 }
1915 } 2018 }
1916 } 2019 }
1917 } 2020 }
1918 } 2021 }
2022
2023 glEnd ();
2024 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1;
1919 } 2026 }
1920 2027
1921 hv_clear (smooth); 2028 hv_clear (smooth);
1922 } 2029 }
1923 2030
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2031 glDisable (GL_BLEND);
2032 rc_free (rc);
1928 2033
1929 // top layer: overlays such as the health bar 2034 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1932 { 2037 {
1957 } 2062 }
1958 } 2063 }
1959} 2064}
1960 2065
1961void 2066void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2067draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2068 CODE:
1964{ 2069{
1965 static float color[16][3] = { 2070 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2071 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2072 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2122 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2123 glDisable (GL_TEXTURE_2D);
2019} 2124}
2020 2125
2021void 2126void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2127fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2128 PPCODE:
2024{ 2129{
2025 int x, y; 2130 int x, y;
2026 int sw1 = sw + 2; 2131 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2132 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2203 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2204 PUSHs (darkness3_sv);
2100} 2205}
2101 2206
2102SV * 2207SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2208get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2209 CODE:
2105{ 2210{
2106 int x, y, x1, y1; 2211 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2212 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2213 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2278}
2174 OUTPUT: 2279 OUTPUT:
2175 RETVAL 2280 RETVAL
2176 2281
2177void 2282void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2283set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2284 PPCODE:
2180{ 2285{
2181 int x, y, z; 2286 int x, y, z;
2182 int w, h; 2287 int w, h;
2183 int x1, y1; 2288 int x1, y1;
2184 2289
2185 if (*data++ != 0) 2290 if (*data++ != 0)
2186 return; /* version mismatch */ 2291 XSRETURN_EMPTY; /* version mismatch */
2187 2292
2188 w = *data++ << 8; w |= *data++; 2293 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2294 h = *data++ << 8; h |= *data++;
2190 2295
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2296 // we need to do this 'cause we don't keep an absolute coord system for rows
2236 } 2341 }
2237 } 2342 }
2238 } 2343 }
2239} 2344}
2240 2345
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2346MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2347
2243CFPlus::RW 2348DC::RW
2244new (SV *class, SV *data_sv) 2349new (SV *class, SV *data_sv)
2245 CODE: 2350 CODE:
2246{ 2351{
2247 STRLEN datalen; 2352 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2353 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2355 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2356}
2252 OUTPUT: 2357 OUTPUT:
2253 RETVAL 2358 RETVAL
2254 2359
2255CFPlus::RW 2360DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2361new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2362 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2363 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2364 OUTPUT:
2260 RETVAL 2365 RETVAL
2261 2366
2367# fails on win32:
2368# dc.xs(2268) : error C2059: syntax error : '('
2262void 2369#void
2263close (CFPlus::RW self) 2370#close (DC::RW self)
2264 CODE: 2371# CODE:
2265 SDL_RWclose (self); 2372# (self->(close)) (self);
2266 2373
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2374MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2375
2269PROTOTYPES: DISABLE 2376PROTOTYPES: DISABLE
2270 2377
2378DC::Channel
2379find ()
2380 CODE:
2381{
2382 RETVAL = Mix_GroupAvailable (-1);
2383
2384 if (RETVAL < 0)
2385 {
2386 RETVAL = Mix_GroupOldest (-1);
2387
2388 if (RETVAL < 0)
2389 XSRETURN_UNDEF;
2390
2391 Mix_HaltChannel (RETVAL);
2392 }
2393
2394 Mix_UnregisterAllEffects (RETVAL);
2395 Mix_Volume (RETVAL, 128);
2396}
2397 OUTPUT:
2398 RETVAL
2399
2400void
2401halt (DC::Channel self)
2402 CODE:
2403 Mix_HaltChannel (self);
2404
2405void
2406expire (DC::Channel self, int ticks = -1)
2407 CODE:
2408 Mix_ExpireChannel (self, ticks);
2409
2410void
2411fade_out (DC::Channel self, int ticks = -1)
2412 CODE:
2413 Mix_FadeOutChannel (self, ticks);
2414
2271int 2415int
2272volume (CFPlus::Channel self, int volume) 2416volume (DC::Channel self, int volume)
2273 CODE: 2417 CODE:
2274 RETVAL = Mix_Volume (self, volume); 2418 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275 OUTPUT: 2419 OUTPUT:
2276 RETVAL 2420 RETVAL
2277 2421
2278int 2422void
2279unregister_all_effects (CFPlus::Channel self) 2423unregister_all_effects (DC::Channel self)
2280 CODE: 2424 CODE:
2281 RETVAL = Mix_UnregisterAllEffects (self); 2425 Mix_UnregisterAllEffects (self);
2282 OUTPUT:
2283 RETVAL
2284 2426
2285int 2427void
2286set_panning (CFPlus::Channel self, int left, int right) 2428set_panning (DC::Channel self, int left, int right)
2287 CODE: 2429 CODE:
2430 left = CLAMP (left , 0, 255);
2431 right = CLAMP (right, 0, 255);
2288 RETVAL = Mix_SetPanning (self, left, right); 2432 Mix_SetPanning (self, left, right);
2289 OUTPUT:
2290 RETVAL
2291 2433
2292int 2434void
2293set_distance (CFPlus::Channel self, int distance) 2435set_distance (DC::Channel self, int distance)
2294 CODE: 2436 CODE:
2295 RETVAL = Mix_SetDistance (self, distance); 2437 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296 OUTPUT:
2297 RETVAL
2298 2438
2299int 2439void
2300set_position (CFPlus::Channel self, int angle, int distance) 2440set_position (DC::Channel self, int angle, int distance)
2301 CODE: 2441 CODE:
2442
2443void
2444set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2445 CODE:
2446{
2447 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2448 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302 RETVAL = Mix_SetPosition (self, angle, distance); 2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303 OUTPUT: 2450}
2304 RETVAL
2305 2451
2306int 2452void
2307set_reverse_stereo (CFPlus::Channel self, int flip) 2453set_reverse_stereo (DC::Channel self, int flip)
2308 CODE: 2454 CODE:
2309 RETVAL = Mix_SetReverseStereo (self, flip); 2455 Mix_SetReverseStereo (self, flip);
2310 OUTPUT:
2311 RETVAL
2312 2456
2313MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2314 2458
2315PROTOTYPES: DISABLE 2459PROTOTYPES: DISABLE
2316 2460
2317CFPlus::MixChunk 2461DC::MixChunk
2318new (SV *class, CFPlus::RW rwops) 2462new (SV *class, DC::RW rwops)
2319 CODE: 2463 CODE:
2320 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2464 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2321 OUTPUT: 2465 OUTPUT:
2322 RETVAL 2466 RETVAL
2323 2467
2324void 2468void
2325DESTROY (CFPlus::MixChunk self) 2469DESTROY (DC::MixChunk self)
2326 CODE: 2470 CODE:
2327 Mix_FreeChunk (self); 2471 Mix_FreeChunk (self);
2328 2472
2329int 2473int
2330volume (CFPlus::MixChunk self, int volume = -1) 2474volume (DC::MixChunk self, int volume = -1)
2331 CODE: 2475 CODE:
2476 if (items > 1)
2477 volume = CLAMP (volume, 0, 128);
2332 RETVAL = Mix_VolumeChunk (self, volume); 2478 RETVAL = Mix_VolumeChunk (self, volume);
2333 OUTPUT: 2479 OUTPUT:
2334 RETVAL 2480 RETVAL
2335 2481
2336CFPlus::Channel 2482DC::Channel
2337play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2483play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2338 CODE: 2484 CODE:
2485{
2339 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2486 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2487
2488 if (RETVAL < 0)
2489 XSRETURN_UNDEF;
2490
2491 if (channel < 0)
2492 {
2340 Mix_UnregisterAllEffects (RETVAL); 2493 Mix_UnregisterAllEffects (RETVAL);
2494 Mix_Volume (RETVAL, 128);
2495 }
2496}
2341 OUTPUT: 2497 OUTPUT:
2342 RETVAL 2498 RETVAL
2343 2499
2344MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2345 2501
2346int 2502int
2347volume (int volume = -1) 2503volume (int volume = -1)
2348 PROTOTYPE: ;$ 2504 PROTOTYPE: ;$
2349 CODE: 2505 CODE:
2506 if (items > 0)
2507 volume = CLAMP (volume, 0, 128);
2350 RETVAL = Mix_VolumeMusic (volume); 2508 RETVAL = Mix_VolumeMusic (volume);
2351 OUTPUT: 2509 OUTPUT:
2352 RETVAL 2510 RETVAL
2353 2511
2354int 2512void
2355fade_out (int ms) 2513fade_out (int ms)
2356 CODE: 2514 CODE:
2357 RETVAL = Mix_FadeOutMusic (ms); 2515 Mix_FadeOutMusic (ms);
2358 OUTPUT:
2359 RETVAL
2360 2516
2361void 2517void
2362halt () 2518halt ()
2363 CODE: 2519 CODE:
2364 Mix_HaltMusic (); 2520 Mix_HaltMusic ();
2365 2521
2366CFPlus::MixMusic 2522DC::MixMusic
2367new (SV *class, CFPlus::RW rwops) 2523new (SV *class, DC::RW rwops)
2368 CODE: 2524 CODE:
2369 RETVAL = Mix_LoadMUS_RW (rwops); 2525 RETVAL = Mix_LoadMUS_RW (rwops);
2370 OUTPUT: 2526 OUTPUT:
2371 RETVAL 2527 RETVAL
2372 2528
2373void 2529void
2374DESTROY (CFPlus::MixMusic self) 2530DESTROY (DC::MixMusic self)
2375 CODE: 2531 CODE:
2376 Mix_FreeMusic (self); 2532 Mix_FreeMusic (self);
2377 2533
2378int 2534int
2379play (CFPlus::MixMusic self, int loops = -1) 2535play (DC::MixMusic self, int loops = -1)
2380 CODE: 2536 CODE:
2381 RETVAL = Mix_PlayMusic (self, loops); 2537 RETVAL = Mix_PlayMusic (self, loops);
2382 OUTPUT: 2538 OUTPUT:
2383 RETVAL 2539 RETVAL
2384 2540
2385int 2541void
2386fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2542fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2387 CODE: 2543 CODE:
2388 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2544 Mix_FadeInMusicPos (self, loops, ms, position);
2389 OUTPUT:
2390 RETVAL
2391 2545
2392MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2546MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2393 2547
2394PROTOTYPES: ENABLE 2548PROTOTYPES: ENABLE
2395 2549
2396BOOT: 2550BOOT:
2397{ 2551{
2398 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2552 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2399 static const struct { 2553 static const struct {
2400 const char *name; 2554 const char *name;
2401 IV iv; 2555 IV iv;
2402 } *civ, const_iv[] = { 2556 } *civ, const_iv[] = {
2403# define const_iv(name) { # name, (IV)name } 2557# define const_iv(name) { # name, (IV)name }
2438 const_iv (GL_INTENSITY), 2592 const_iv (GL_INTENSITY),
2439 const_iv (GL_LUMINANCE), 2593 const_iv (GL_LUMINANCE),
2440 const_iv (GL_LUMINANCE_ALPHA), 2594 const_iv (GL_LUMINANCE_ALPHA),
2441 const_iv (GL_FLOAT), 2595 const_iv (GL_FLOAT),
2442 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2596 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2597 const_iv (GL_COMPRESSED_ALPHA_ARB),
2598 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2599 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2600 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2601 const_iv (GL_COMPRESSED_RGB_ARB),
2602 const_iv (GL_COMPRESSED_RGBA_ARB),
2443 const_iv (GL_COMPILE), 2603 const_iv (GL_COMPILE),
2444 const_iv (GL_PROXY_TEXTURE_1D), 2604 const_iv (GL_PROXY_TEXTURE_1D),
2445 const_iv (GL_PROXY_TEXTURE_2D), 2605 const_iv (GL_PROXY_TEXTURE_2D),
2446 const_iv (GL_TEXTURE_1D), 2606 const_iv (GL_TEXTURE_1D),
2447 const_iv (GL_TEXTURE_2D), 2607 const_iv (GL_TEXTURE_2D),
2486 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2646 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487 const_iv (GL_POINT_SMOOTH_HINT), 2647 const_iv (GL_POINT_SMOOTH_HINT),
2488 const_iv (GL_LINE_SMOOTH_HINT), 2648 const_iv (GL_LINE_SMOOTH_HINT),
2489 const_iv (GL_POLYGON_SMOOTH_HINT), 2649 const_iv (GL_POLYGON_SMOOTH_HINT),
2490 const_iv (GL_GENERATE_MIPMAP_HINT), 2650 const_iv (GL_GENERATE_MIPMAP_HINT),
2651 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491 const_iv (GL_FASTEST), 2652 const_iv (GL_FASTEST),
2492 const_iv (GL_DONT_CARE), 2653 const_iv (GL_DONT_CARE),
2493 const_iv (GL_NICEST), 2654 const_iv (GL_NICEST),
2494 const_iv (GL_V2F), 2655 const_iv (GL_V2F),
2495 const_iv (GL_V3F), 2656 const_iv (GL_V3F),
2503 2664
2504 texture_av = newAV (); 2665 texture_av = newAV ();
2505 AvREAL_off (texture_av); 2666 AvREAL_off (texture_av);
2506} 2667}
2507 2668
2669void
2670disable_GL_EXT_blend_func_separate ()
2671 CODE:
2672 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0;
2674
2508char * 2675char *
2509gl_vendor () 2676gl_vendor ()
2510 CODE: 2677 CODE:
2511 RETVAL = (char *)glGetString (GL_VENDOR); 2678 RETVAL = (char *)glGetString (GL_VENDOR);
2512 OUTPUT: 2679 OUTPUT:
2633 2800
2634void glRect (float x1, float y1, float x2, float y2) 2801void glRect (float x1, float y1, float x2, float y2)
2635 CODE: 2802 CODE:
2636 glRectf (x1, y1, x2, y2); 2803 glRectf (x1, y1, x2, y2);
2637 2804
2805void glRect_lineloop (float x1, float y1, float x2, float y2)
2806 CODE:
2807 glBegin (GL_LINE_LOOP);
2808 glVertex2f (x1, y1);
2809 glVertex2f (x2, y1);
2810 glVertex2f (x2, y2);
2811 glVertex2f (x1, y2);
2812 glEnd ();
2813
2638PROTOTYPES: ENABLE 2814PROTOTYPES: ENABLE
2639 2815
2640void glBegin (int mode) 2816void glBegin (int mode)
2641 2817
2642void glEnd () 2818void glEnd ()
2674void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2850void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2675 CODE: 2851 CODE:
2676 if (gl.SeparableFilter2D) 2852 if (gl.SeparableFilter2D)
2677 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2853 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2678 2854
2679void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2855void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2680 2856
2681void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2857void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2682 2858
2683void glDrawPixels (int width, int height, int format, int type, char *pixels) 2859void glDrawPixels (int width, int height, int format, int type, char *pixels)
2684 2860
2710 2886
2711void glEndList () 2887void glEndList ()
2712 2888
2713void glCallList (int list) 2889void glCallList (int list)
2714 2890
2715MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2716 2892
2717PROTOTYPES: DISABLE 2893PROTOTYPES: DISABLE
2718 2894
2719void 2895void
2720find_widget (SV *self, NV x, NV y) 2896find_widget (SV *self, NV x, NV y)
2724 XPUSHs (self); 2900 XPUSHs (self);
2725} 2901}
2726 2902
2727BOOT: 2903BOOT:
2728{ 2904{
2729 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2905 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2730 2906
2731 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2907 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2732 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 2908 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2733 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 2909 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2734 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 2910 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2735} 2911}
2736 2912
2737void 2913void
2738draw (SV *self) 2914draw (SV *self)
2739 CODE: 2915 CODE:
2743 NV x, y, w, h; 2919 NV x, y, w, h;
2744 SV *draw_x_sv = GvSV (draw_x_gv); 2920 SV *draw_x_sv = GvSV (draw_x_gv);
2745 SV *draw_y_sv = GvSV (draw_y_gv); 2921 SV *draw_y_sv = GvSV (draw_y_gv);
2746 SV *draw_w_sv = GvSV (draw_w_gv); 2922 SV *draw_w_sv = GvSV (draw_w_gv);
2747 SV *draw_h_sv = GvSV (draw_h_gv); 2923 SV *draw_h_sv = GvSV (draw_h_gv);
2748 SV *hover;
2749 double draw_x, draw_y, draw_w, draw_h; 2924 double draw_x, draw_y;
2750 2925
2751 if (!SvROK (self)) 2926 if (!SvROK (self))
2752 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2927 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2753 2928
2754 hv = (HV *)SvRV (self); 2929 hv = (HV *)SvRV (self);
2755 2930
2756 if (SvTYPE (hv) != SVt_PVHV) 2931 if (SvTYPE (hv) != SVt_PVHV)
2757 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2932 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2758 2933
2759 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2934 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2760 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 2935 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2761 2936
2762 if (!h || !w) 2937 if (!h || !w)
2782 { 2957 {
2783 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2958 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784 2959
2785 if (svp && SvTRUE (*svp)) 2960 if (svp && SvTRUE (*svp))
2786 { 2961 {
2787 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2962 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788 glEnable (GL_BLEND); 2963 glEnable (GL_BLEND);
2789 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2964 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790 glBegin (GL_QUADS); 2965 glBegin (GL_QUADS);
2791 glVertex2f (0, 0); 2966 glVertex2f (0, 0);
2792 glVertex2f (w, 0); 2967 glVertex2f (w, 0);
2795 glEnd (); 2970 glEnd ();
2796 glDisable (GL_BLEND); 2971 glDisable (GL_BLEND);
2797 } 2972 }
2798 } 2973 }
2799#if 0 2974#if 0
2800 if ($ENV{CFPLUS_DEBUG} & 1) { 2975 // draw borders, for debugging
2801 glPushMatrix; 2976 glPushMatrix ();
2802 glColor 1, 1, 0, 1; 2977 glColor4f (1., 1., 0., 1.);
2803 glTranslate 0.375, 0.375; 2978 glTranslatef (.5, .5, 0.);
2804 glBegin GL_LINE_LOOP; 2979 glBegin (GL_LINE_LOOP);
2805 glVertex 0 , 0; 2980 glVertex2f (0 , 0);
2806 glVertex $self->{w} - 1, 0; 2981 glVertex2f (w - 1, 0);
2807 glVertex $self->{w} - 1, $self->{h} - 1; 2982 glVertex2f (w - 1, h - 1);
2808 glVertex 0 , $self->{h} - 1; 2983 glVertex2f (0 , h - 1);
2809 glEnd; 2984 glEnd ();
2810 glPopMatrix; 2985 glPopMatrix ();
2811 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812 }
2813#endif 2986#endif
2814 PUSHMARK (SP); 2987 PUSHMARK (SP);
2815 XPUSHs (self); 2988 XPUSHs (self);
2816 PUTBACK; 2989 PUTBACK;
2817 call_method ("_draw", G_VOID | G_DISCARD); 2990 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines