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.248 by root, Fri Dec 28 15:27:39 2007 UTC

17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
109 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
111} 116}
112 117
113#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
114 120
115#include "pango-font.c" 121#include "pango-font.c"
116#include "pango-fontmap.c" 122#include "pango-fontmap.c"
117#include "pango-render.c" 123#include "pango-render.c"
118 124
119typedef IV CFPlus__Channel; 125typedef IV DC__Channel;
120typedef SDL_RWops *CFPlus__RW; 126typedef SDL_RWops *DC__RW;
121typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *DC__MixChunk;
122typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *DC__MixMusic;
123 129
124typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *DC__Font;
125 131
126static int 132static int
127shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
128{ 134{
129 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
143 149
144typedef struct cf_layout { 150typedef struct cf_layout {
145 PangoLayout *pl; 151 PangoLayout *pl;
146 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
147 int base_height; 153 int base_height;
148 CFPlus__Font font; 154 DC__Font font;
155 rc_t *rc;
149} *CFPlus__Layout; 156} *DC__Layout;
150 157
151static CFPlus__Font default_font; 158static DC__Font default_font;
152static PangoContext *opengl_context; 159static PangoContext *opengl_context;
153static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
154 161
155static void 162static void
156substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
161#endif 168#endif
162 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163} 170}
164 171
165static void 172static void
166layout_update_font (CFPlus__Layout self) 173layout_update_font (DC__Layout self)
167{ 174{
168 /* use a random scale factor to account for unknown descenders, 0.8 works 175 /* use a random scale factor to account for unknown descenders, 0.8 works
169 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
170 */ 177 */
171 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
175 182
176 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
177} 184}
178 185
179static void 186static void
180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (DC__Layout self, int *w, int *h)
181{ 188{
182 PangoRectangle rect; 189 PangoRectangle rect;
183 190
184 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
185 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
196 203
197typedef uint16_t tileid; 204typedef uint16_t tileid;
198typedef uint16_t faceid; 205typedef uint16_t faceid;
199 206
200typedef struct { 207typedef struct {
201 int name; 208 GLuint name;
202 int w, h; 209 int w, h;
203 float s, t; 210 float s, t;
204 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
205 tileid smoothtile; 212 tileid smoothtile;
206 uint8_t smoothlevel; 213 uint8_t smoothlevel;
224 int faces; tileid *face2tile; // [faceid] 231 int faces; tileid *face2tile; // [faceid]
225 int texs; maptex *tex; // [tileid] 232 int texs; maptex *tex; // [tileid]
226 233
227 int32_t rows; 234 int32_t rows;
228 maprow *row; 235 maprow *row;
229} *CFPlus__Map; 236} *DC__Map;
230 237
231static char * 238static char *
232prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
233{ 240{
234 char *p; 241 char *p;
272 self->texs *= 2; 279 self->texs *= 2;
273 } 280 }
274} 281}
275 282
276static maprow * 283static maprow *
277map_get_row (CFPlus__Map self, int y) 284map_get_row (DC__Map self, int y)
278{ 285{
279 if (0 > y) 286 if (0 > y)
280 { 287 {
281 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
282 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
320 327
321 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
322} 329}
323 330
324static mapcell * 331static mapcell *
325map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (DC__Map self, int x, int y)
326{ 333{
327 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
328} 335}
329 336
330static void 337static void
331map_clear (CFPlus__Map self) 338map_clear (DC__Map self)
332{ 339{
333 int r; 340 int r;
334 341
335 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
336 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
344 self->row = 0; 351 self->row = 0;
345 self->rows = 0; 352 self->rows = 0;
346} 353}
347 354
348static void 355static void
349map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 356map_blank (DC__Map self, int x0, int y0, int w, int h)
350{ 357{
351 int x, y; 358 int x, y;
352 maprow *row; 359 maprow *row;
353 mapcell *cell; 360 mapcell *cell;
354 361
433 n |= n >> 16; 440 n |= n >> 16;
434 441
435 return n + 1; 442 return n + 1;
436} 443}
437 444
445static unsigned int
446popcount (unsigned int n)
447{
448 n -= (n >> 1) & 0x55555555U;
449 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
450 n = ((n >> 4) + n) & 0x0f0f0f0fU;
451 n *= 0x01010101U;
452
453 return n >> 24;
454}
455
438/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
441 459
442/******************************************************************************/ 460/******************************************************************************/
480 return 0; 498 return 0;
481 499
482 return 1; 500 return 1;
483} 501}
484 502
485MODULE = CFPlus PACKAGE = CFPlus 503MODULE = Deliantra::Client PACKAGE = DC
486 504
487PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
488 506
489BOOT: 507BOOT:
490{ 508{
491 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("DC", 1);
492 static const struct { 510 static const struct {
493 const char *name; 511 const char *name;
494 IV iv; 512 IV iv;
495 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
496# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
518 536
519 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
522 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
523 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
524 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
525 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
526 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
527 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
599 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
600 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
601 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
602 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
603 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
604# undef const_iv 626# undef const_iv
605 }; 627 };
606 628
607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
625 RETVAL 647 RETVAL
626 648
627NV floor (NV x) 649NV floor (NV x)
628 650
629NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
630 656
631void 657void
632pango_init () 658pango_init ()
633 CODE: 659 CODE:
634{ 660{
674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
675 701
676 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
677 while (*m) 703 while (*m)
678 { 704 {
679 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1323 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270 1324 --line;
1325#endif
1271 EXTEND (SP, 2); 1326 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1))); 1327 PUSHs (sv_2mortal (newSViv (line)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1328 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274} 1329}
1275 1330
1276void 1331void
1277line_x_to_index (CFPlus::Layout self, int line, int x) 1332line_x_to_index (DC::Layout self, int line, int x)
1278 PPCODE: 1333 PPCODE:
1279{ 1334{
1280 PangoLayoutLine *lp; 1335 PangoLayoutLine *lp;
1281 int index, trailing; 1336 int index, trailing;
1282 1337
1297 PUSHs (sv_2mortal (newSViv (trailing))); 1352 PUSHs (sv_2mortal (newSViv (trailing)));
1298 } 1353 }
1299} 1354}
1300 1355
1301void 1356void
1302render (CFPlus::Layout self, float x, float y, int flags = 0) 1357render (DC::Layout self, float x, float y, int flags = 0)
1303 PPCODE: 1358 CODE:
1359 rc_clear (self->rc);
1304 pango_opengl_render_layout_subpixel ( 1360 pango_opengl_render_layout_subpixel (
1305 self->pl, 1361 self->pl,
1362 self->rc,
1306 x * PANGO_SCALE, y * PANGO_SCALE, 1363 x * PANGO_SCALE, y * PANGO_SCALE,
1307 self->r, self->g, self->b, self->a, 1364 self->r, self->g, self->b, self->a,
1308 flags 1365 flags
1309 ); 1366 );
1367 // we assume that context_change actually clears/frees stuff
1368 // and does not do any recomputation...
1369 pango_layout_context_changed (self->pl);
1310 1370
1311MODULE = CFPlus PACKAGE = CFPlus::Texture 1371void
1372draw (DC::Layout self)
1373 CODE:
1374{
1375 glEnable (GL_TEXTURE_2D);
1376 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1377 glEnable (GL_BLEND);
1378 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1379 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1380 glEnable (GL_ALPHA_TEST);
1381 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1382
1383 rc_draw (self->rc);
1384
1385 glDisable (GL_ALPHA_TEST);
1386 glDisable (GL_BLEND);
1387 glDisable (GL_TEXTURE_2D);
1388}
1389
1390MODULE = Deliantra::Client PACKAGE = DC::Texture
1312 1391
1313PROTOTYPES: ENABLE 1392PROTOTYPES: ENABLE
1314
1315int minpot (int n)
1316 1393
1317void 1394void
1318pad (SV *data_, int ow, int oh, int nw, int nh) 1395pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE: 1396 CODE:
1320{ 1397{
1347 HV *hv = (HV *)SvRV (self); 1424 HV *hv = (HV *)SvRV (self);
1348 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1425 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1426 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1427 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351 1428
1429 if (name <= 0)
1430 XSRETURN_EMPTY;
1431
1352 if (items < 5) 1432 if (items < 5)
1353 { 1433 {
1354 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1434 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1435 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356 } 1436 }
1394 RETVAL = width > 0; 1474 RETVAL = width > 0;
1395} 1475}
1396 OUTPUT: 1476 OUTPUT:
1397 RETVAL 1477 RETVAL
1398 1478
1399MODULE = CFPlus PACKAGE = CFPlus::Map 1479MODULE = Deliantra::Client PACKAGE = DC::Map
1400 1480
1401PROTOTYPES: DISABLE 1481PROTOTYPES: DISABLE
1402 1482
1403CFPlus::Map 1483DC::Map
1404new (SV *class) 1484new (SV *class)
1405 CODE: 1485 CODE:
1406 New (0, RETVAL, 1, struct map); 1486 New (0, RETVAL, 1, struct map);
1407 RETVAL->x = 0; 1487 RETVAL->x = 0;
1408 RETVAL->y = 0; 1488 RETVAL->y = 0;
1416 RETVAL->row = 0; 1496 RETVAL->row = 0;
1417 OUTPUT: 1497 OUTPUT:
1418 RETVAL 1498 RETVAL
1419 1499
1420void 1500void
1421DESTROY (CFPlus::Map self) 1501DESTROY (DC::Map self)
1422 CODE: 1502 CODE:
1423{ 1503{
1424 map_clear (self); 1504 map_clear (self);
1425 Safefree (self->face2tile); 1505 Safefree (self->face2tile);
1426 Safefree (self->tex); 1506 Safefree (self->tex);
1427 Safefree (self); 1507 Safefree (self);
1428} 1508}
1429 1509
1430void 1510void
1431resize (CFPlus::Map self, int map_width, int map_height) 1511resize (DC::Map self, int map_width, int map_height)
1432 CODE: 1512 CODE:
1433 self->w = map_width; 1513 self->w = map_width;
1434 self->h = map_height; 1514 self->h = map_height;
1435 1515
1436void 1516void
1437clear (CFPlus::Map self) 1517clear (DC::Map self)
1438 CODE: 1518 CODE:
1439 map_clear (self); 1519 map_clear (self);
1440 1520
1441void 1521void
1442set_tileid (CFPlus::Map self, int face, int tile) 1522set_tileid (DC::Map self, int face, int tile)
1443 CODE: 1523 CODE:
1444{ 1524{
1445 need_facenum (self, face); self->face2tile [face] = tile; 1525 need_facenum (self, face); self->face2tile [face] = tile;
1446 need_texid (self, tile); 1526 need_texid (self, tile);
1447} 1527}
1448 1528
1449void 1529void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level) 1530set_smooth (DC::Map self, int face, int smooth, int level)
1451 CODE: 1531 CODE:
1452{ 1532{
1453 tileid texid; 1533 tileid texid;
1454 maptex *tex; 1534 maptex *tex;
1455 1535
1468 tex->smoothtile = self->face2tile [smooth]; 1548 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level; 1549 tex->smoothlevel = level;
1470} 1550}
1471 1551
1472void 1552void
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) 1553set_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: 1554 CODE:
1475{ 1555{
1476 need_texid (self, texid); 1556 need_texid (self, texid);
1477 1557
1478 { 1558 {
1498 // from transparent color bleeding and ugly wrapping effects. 1578 // from transparent color bleeding and ugly wrapping effects.
1499 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1579 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500} 1580}
1501 1581
1502int 1582int
1503ox (CFPlus::Map self) 1583ox (DC::Map self)
1504 ALIAS: 1584 ALIAS:
1505 oy = 1 1585 oy = 1
1506 x = 2 1586 x = 2
1507 y = 3 1587 y = 3
1508 w = 4 1588 w = 4
1519 } 1599 }
1520 OUTPUT: 1600 OUTPUT:
1521 RETVAL 1601 RETVAL
1522 1602
1523void 1603void
1524scroll (CFPlus::Map self, int dx, int dy) 1604scroll (DC::Map self, int dx, int dy)
1525 CODE: 1605 CODE:
1526{ 1606{
1527 if (dx > 0) 1607 if (dx > 0)
1528 map_blank (self, self->x, self->y, dx, self->h); 1608 map_blank (self, self->x, self->y, dx, self->h);
1529 else if (dx < 0) 1609 else if (dx < 0)
1544 self->rows += MAP_EXTEND_Y; 1624 self->rows += MAP_EXTEND_Y;
1545 self->y += MAP_EXTEND_Y; 1625 self->y += MAP_EXTEND_Y;
1546 } 1626 }
1547} 1627}
1548 1628
1549void 1629SV *
1550map1a_update (CFPlus::Map self, SV *data_, int extmap) 1630map1a_update (DC::Map self, SV *data_, int extmap)
1551 CODE: 1631 CODE:
1552{ 1632{
1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1633 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1554 uint8_t *data_end = (uint8_t *)SvEND (data_); 1634 uint8_t *data_end = (uint8_t *)SvEND (data_);
1555 mapcell *cell; 1635 mapcell *cell;
1556 int x, y, flags; 1636 int x, y, z, flags;
1637 AV *missing = newAV ();
1638 RETVAL = newRV_noinc ((SV *)missing);
1557 1639
1558 while (data < data_end - 1) 1640 while (data < data_end - 1)
1559 { 1641 {
1560 flags = (data [0] << 8) + data [1]; data += 2; 1642 flags = (data [0] << 8) + data [1]; data += 2;
1561 1643
1612 } 1694 }
1613 else 1695 else
1614 cell->darkness = *data++ + 1; 1696 cell->darkness = *data++ + 1;
1615 } 1697 }
1616 1698
1699 for (z = 0; z <= 2; ++z)
1617 if (flags & 4) 1700 if (flags & (4 >> z))
1618 { 1701 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2; 1702 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face); 1703 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face]; 1704 cell->tile [z] = self->face2tile [face];
1705
1706 if (cell->tile [z])
1707 {
1708 maptex *tex = self->tex + cell->tile [z];
1709 if (!tex->name)
1710 av_push (missing, newSViv (cell->tile [z]));
1711
1712 if (tex->smoothtile)
1713 {
1714 maptex *smooth = self->tex + tex->smoothtile;
1715 if (!smooth->name)
1716 av_push (missing, newSViv (tex->smoothtile));
1717 }
1718 }
1622 } 1719 }
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 } 1720 }
1638 else 1721 else
1639 cell->darkness = 0; 1722 cell->darkness = 0;
1640 } 1723 }
1641} 1724}
1725 OUTPUT:
1726 RETVAL
1642 1727
1643SV * 1728SV *
1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1729mapmap (DC::Map self, int x0, int y0, int w, int h)
1645 CODE: 1730 CODE:
1646{ 1731{
1647 int x1, x; 1732 int x1, x;
1648 int y1, y; 1733 int y1, y;
1649 int z; 1734 int z;
1694} 1779}
1695 OUTPUT: 1780 OUTPUT:
1696 RETVAL 1781 RETVAL
1697 1782
1698void 1783void
1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 1784draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700 CODE: 1785 CODE:
1701{ 1786{
1787 int x, y, z;
1788
1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1789 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1790 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) 1791 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705 smooth_key skey; 1792 smooth_key skey;
1706 int x, y, z; 1793
1707 int last_name; 1794 rc_t *rc = rc_alloc ();
1795 rc_key_t key;
1796 rc_array_t *arr;
1708 1797
1709 // thats current max. sorry. 1798 // thats current max. sorry.
1710 if (sw > 255) sw = 255; 1799 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255; 1800 if (sh > 255) sh = 255;
1712 1801
1713 // clear key, in case of extra padding 1802 // clear key, in case of extra padding
1714 memset (&skey, 0, sizeof (skey)); 1803 memset (&skey, 0, sizeof (skey));
1715 1804
1716 glColor4ub (255, 255, 255, 255); 1805 memset (&key, 0, sizeof (key));
1717 1806 key.r = 255;
1718 glEnable (GL_BLEND); 1807 key.g = 255;
1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1808 key.b = 255;
1720 glEnable (GL_TEXTURE_2D); 1809 key.a = 255;
1721 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1810 key.mode = GL_QUADS;
1722 1811 key.format = GL_T2F_V3F;
1723 glBegin (GL_QUADS); 1812 key.texname = -1;
1724
1725 last_name = 0;
1726 1813
1727 mx += self->x; 1814 mx += self->x;
1728 my += self->y; 1815 my += self->y;
1729 1816
1730 // first pass: determine smooth_max 1817 // first pass: determine smooth_max
1746 MAX (self->tex [cell->tile [0]].smoothlevel, 1833 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel, 1834 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel)); 1835 self->tex [cell->tile [2]].smoothlevel));
1749 } 1836 }
1750 } 1837 }
1838
1839 glEnable (GL_BLEND);
1840 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1841 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751 1842
1752 for (z = 0; z <= 2; z++) 1843 for (z = 0; z <= 2; z++)
1753 { 1844 {
1754 memset (smooth_level, 0, sizeof (smooth_level)); 1845 memset (smooth_level, 0, sizeof (smooth_level));
1755 1846
1765 tileid tile = cell->tile [z]; 1856 tileid tile = cell->tile [z];
1766 1857
1767 if (tile) 1858 if (tile)
1768 { 1859 {
1769 maptex tex = self->tex [tile]; 1860 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w; 1861 int px, py;
1771 int py = (y + 1) * T - tex.h;
1772 1862
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name) 1863 if (key.texname != tex.name)
1776 { 1864 {
1777 if (!tex.name) 1865 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */ 1866 tex = self->tex [2]; /* missing, replace by noface */
1779 1867
1780 glEnd (); 1868 key.texname = tex.name;
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1869 arr = rc_array (rc, &key);
1782 glBegin (GL_QUADS);
1783 } 1870 }
1784 1871
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1872 px = (x + 1) * T - tex.w;
1873 py = (y + 1) * T - tex.h;
1874
1875 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1876 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); 1877 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 ); 1878 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789 1879
1790 if (cell->flags && z == 2) 1880 if (cell->flags && z == 2)
1791 { 1881 {
1882 // overlays such as the speech bubble, probably more to come
1792 if (cell->flags & 1) 1883 if (cell->flags & 1)
1793 { 1884 {
1794 maptex tex = self->tex [1]; 1885 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32; 1886 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32; 1887 int py = y * T - T * 6 / 32;
1797 1888
1889 if (tex.name)
1798 glEnd (); 1890 {
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1891 if (key.texname != tex.name)
1892 {
1893 key.texname = tex.name;
1894 arr = rc_array (rc, &key);
1895 }
1896
1897 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1898 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1899 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1900 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800 glBegin (GL_QUADS); 1901 }
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 } 1902 }
1807 } 1903 }
1808 1904
1809 // update smooth hash 1905 // update smooth hash
1810 if (tex.smoothtile) 1906 if (tex.smoothtile)
1846 } 1942 }
1847 } 1943 }
1848 } 1944 }
1849 } 1945 }
1850 1946
1947 rc_draw (rc);
1948 rc_clear (rc);
1949
1851 // go through all smoothlevels, lowest to highest, then draw. 1950 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort 1951 // this is basically counting sort
1853 { 1952 {
1854 int w, b; 1953 int w, b;
1855 1954
1955 glEnable (GL_TEXTURE_2D);
1956 glBegin (GL_QUADS);
1856 for (w = 0; w < 256 / 32; ++w) 1957 for (w = 0; w < 256 / 32; ++w)
1857 { 1958 {
1858 uint32_t smask = smooth_level [w]; 1959 uint32_t smask = smooth_level [w];
1859 if (smask) 1960 if (smask)
1860 for (b = 0; b < 32; ++b) 1961 for (b = 0; b < 32; ++b)
1879 int border = bits & 15; 1980 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1981 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row 1982 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column 1983 float dy = tex.t * .5f ; // 2 images/column
1883 1984
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name) 1985 if (tex.name)
1887 { 1986 {
1987 // this time avoiding texture state changes
1988 // save gobs of state changes.
1888 if (!tex.name) 1989 if (key.texname != tex.name)
1889 continue; // smoothing not yet available 1990 {
1890
1891 glEnd (); 1991 glEnd ();
1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1992 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893 glBegin (GL_QUADS); 1993 glBegin (GL_QUADS);
1894 } 1994 }
1895 1995
1896 if (border) 1996 if (border)
1897 { 1997 {
1898 float ox = border * dx; 1998 float ox = border * dx;
1899 1999
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2000 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2001 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2002 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2003 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904 } 2004 }
1905 2005
1906 if (corner) 2006 if (corner)
1907 { 2007 {
1908 float ox = corner * dx; 2008 float ox = corner * dx;
1909 2009
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2010 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2011 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2012 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2013 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2014 }
1914 } 2015 }
1915 } 2016 }
1916 } 2017 }
1917 } 2018 }
1918 } 2019 }
2020
2021 glEnd ();
2022 glDisable (GL_TEXTURE_2D);
2023 key.texname = -1;
1919 } 2024 }
1920 2025
1921 hv_clear (smooth); 2026 hv_clear (smooth);
1922 } 2027 }
1923 2028
1924 glEnd ();
1925
1926 glDisable (GL_TEXTURE_2D);
1927 glDisable (GL_BLEND); 2029 glDisable (GL_BLEND);
2030 rc_free (rc);
1928 2031
1929 // top layer: overlays such as the health bar 2032 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++) 2033 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows) 2034 if (0 <= y + my && y + my < self->rows)
1932 { 2035 {
1957 } 2060 }
1958 } 2061 }
1959} 2062}
1960 2063
1961void 2064void
1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2065draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963 CODE: 2066 CODE:
1964{ 2067{
1965 static float color[16][3] = { 2068 static float color[16][3] = {
1966 { 0.00F, 0.00F, 0.00F }, 2069 { 0.00F, 0.00F, 0.00F },
1967 { 1.00F, 1.00F, 1.00F }, 2070 { 1.00F, 1.00F, 1.00F },
2017 glDisable (GL_BLEND); 2120 glDisable (GL_BLEND);
2018 glDisable (GL_TEXTURE_2D); 2121 glDisable (GL_TEXTURE_2D);
2019} 2122}
2020 2123
2021void 2124void
2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2125fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023 PPCODE: 2126 PPCODE:
2024{ 2127{
2025 int x, y; 2128 int x, y;
2026 int sw1 = sw + 2; 2129 int sw1 = sw + 2;
2027 int sh1 = sh + 2; 2130 int sh1 = sh + 2;
2098 PUSHs (sv_2mortal (newSViv (sh3))); 2201 PUSHs (sv_2mortal (newSViv (sh3)));
2099 PUSHs (darkness3_sv); 2202 PUSHs (darkness3_sv);
2100} 2203}
2101 2204
2102SV * 2205SV *
2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2206get_rect (DC::Map self, int x0, int y0, int w, int h)
2104 CODE: 2207 CODE:
2105{ 2208{
2106 int x, y, x1, y1; 2209 int x, y, x1, y1;
2107 SV *data_sv = newSV (w * h * 7 + 5); 2210 SV *data_sv = newSV (w * h * 7 + 5);
2108 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2211 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2173} 2276}
2174 OUTPUT: 2277 OUTPUT:
2175 RETVAL 2278 RETVAL
2176 2279
2177void 2280void
2178set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2281set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179 PPCODE: 2282 PPCODE:
2180{ 2283{
2181 int x, y, z; 2284 int x, y, z;
2182 int w, h; 2285 int w, h;
2183 int x1, y1; 2286 int x1, y1;
2184 2287
2185 if (*data++ != 0) 2288 if (*data++ != 0)
2186 return; /* version mismatch */ 2289 XSRETURN_EMPTY; /* version mismatch */
2187 2290
2188 w = *data++ << 8; w |= *data++; 2291 w = *data++ << 8; w |= *data++;
2189 h = *data++ << 8; h |= *data++; 2292 h = *data++ << 8; h |= *data++;
2190 2293
2191 // we need to do this 'cause we don't keep an absolute coord system for rows 2294 // we need to do this 'cause we don't keep an absolute coord system for rows
2236 } 2339 }
2237 } 2340 }
2238 } 2341 }
2239} 2342}
2240 2343
2241MODULE = CFPlus PACKAGE = CFPlus::RW 2344MODULE = Deliantra::Client PACKAGE = DC::RW
2242 2345
2243CFPlus::RW 2346DC::RW
2244new (SV *class, SV *data_sv) 2347new (SV *class, SV *data_sv)
2245 CODE: 2348 CODE:
2246{ 2349{
2247 STRLEN datalen; 2350 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen); 2351 char *data = SvPVbyte (data_sv, datalen);
2250 RETVAL = SDL_RWFromConstMem (data, datalen); 2353 RETVAL = SDL_RWFromConstMem (data, datalen);
2251} 2354}
2252 OUTPUT: 2355 OUTPUT:
2253 RETVAL 2356 RETVAL
2254 2357
2255CFPlus::RW 2358DC::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb") 2359new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE: 2360 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode); 2361 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT: 2362 OUTPUT:
2260 RETVAL 2363 RETVAL
2261 2364
2365# fails on win32:
2366# dc.xs(2268) : error C2059: syntax error : '('
2262void 2367#void
2263close (CFPlus::RW self) 2368#close (DC::RW self)
2264 CODE: 2369# CODE:
2265 SDL_RWclose (self); 2370# (self->(close)) (self);
2266 2371
2267MODULE = CFPlus PACKAGE = CFPlus::Channel 2372MODULE = Deliantra::Client PACKAGE = DC::Channel
2268 2373
2269PROTOTYPES: DISABLE 2374PROTOTYPES: DISABLE
2270 2375
2376DC::Channel
2377find ()
2378 CODE:
2379{
2380 RETVAL = Mix_GroupAvailable (-1);
2381
2382 if (RETVAL < 0)
2383 {
2384 RETVAL = Mix_GroupOldest (-1);
2385
2386 if (RETVAL < 0)
2387 XSRETURN_UNDEF;
2388
2389 Mix_HaltChannel (RETVAL);
2390 }
2391
2392 Mix_UnregisterAllEffects (RETVAL);
2393 Mix_Volume (RETVAL, 128);
2394}
2395 OUTPUT:
2396 RETVAL
2397
2271void 2398void
2272halt (CFPlus::Channel self) 2399halt (DC::Channel self)
2273 CODE: 2400 CODE:
2274 Mix_HaltChannel (self); 2401 Mix_HaltChannel (self);
2275 2402
2276void 2403void
2277expire (CFPlus::Channel self, int ticks = -1) 2404expire (DC::Channel self, int ticks = -1)
2278 CODE: 2405 CODE:
2279 Mix_ExpireChannel (self, ticks); 2406 Mix_ExpireChannel (self, ticks);
2280 2407
2281void 2408void
2282fade_out (CFPlus::Channel self, int ticks = -1) 2409fade_out (DC::Channel self, int ticks = -1)
2283 CODE: 2410 CODE:
2284 Mix_FadeOutChannel (self, ticks); 2411 Mix_FadeOutChannel (self, ticks);
2285 2412
2286int 2413int
2287volume (CFPlus::Channel self, int volume) 2414volume (DC::Channel self, int volume)
2288 CODE: 2415 CODE:
2289 RETVAL = Mix_Volume (self, volume); 2416 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2290 OUTPUT: 2417 OUTPUT:
2291 RETVAL 2418 RETVAL
2292 2419
2293void 2420void
2294unregister_all_effects (CFPlus::Channel self) 2421unregister_all_effects (DC::Channel self)
2295 CODE: 2422 CODE:
2296 Mix_UnregisterAllEffects (self); 2423 Mix_UnregisterAllEffects (self);
2297 2424
2298void 2425void
2299set_panning (CFPlus::Channel self, int left, int right) 2426set_panning (DC::Channel self, int left, int right)
2300 CODE: 2427 CODE:
2428 left = CLAMP (left , 0, 255);
2429 right = CLAMP (right, 0, 255);
2301 Mix_SetPanning (self, left, right); 2430 Mix_SetPanning (self, left, right);
2302 2431
2303void 2432void
2304set_distance (CFPlus::Channel self, int distance) 2433set_distance (DC::Channel self, int distance)
2305 CODE: 2434 CODE:
2306 Mix_SetDistance (self, distance); 2435 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307 2436
2308void 2437void
2309set_position (CFPlus::Channel self, int angle, int distance) 2438set_position (DC::Channel self, int angle, int distance)
2310 CODE: 2439 CODE:
2440
2441void
2442set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2443 CODE:
2444{
2445 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2446 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311 Mix_SetPosition (self, angle, distance); 2447 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2448}
2312 2449
2313void 2450void
2314set_reverse_stereo (CFPlus::Channel self, int flip) 2451set_reverse_stereo (DC::Channel self, int flip)
2315 CODE: 2452 CODE:
2316 Mix_SetReverseStereo (self, flip); 2453 Mix_SetReverseStereo (self, flip);
2317 2454
2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2455MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319 2456
2320PROTOTYPES: DISABLE 2457PROTOTYPES: DISABLE
2321 2458
2322CFPlus::MixChunk 2459DC::MixChunk
2323new (SV *class, CFPlus::RW rwops) 2460new (SV *class, DC::RW rwops)
2324 CODE: 2461 CODE:
2325 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2462 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326 OUTPUT: 2463 OUTPUT:
2327 RETVAL 2464 RETVAL
2328 2465
2329void 2466void
2330DESTROY (CFPlus::MixChunk self) 2467DESTROY (DC::MixChunk self)
2331 CODE: 2468 CODE:
2332 Mix_FreeChunk (self); 2469 Mix_FreeChunk (self);
2333 2470
2334int 2471int
2335volume (CFPlus::MixChunk self, int volume = -1) 2472volume (DC::MixChunk self, int volume = -1)
2336 CODE: 2473 CODE:
2474 if (items > 1)
2475 volume = CLAMP (volume, 0, 128);
2337 RETVAL = Mix_VolumeChunk (self, volume); 2476 RETVAL = Mix_VolumeChunk (self, volume);
2338 OUTPUT: 2477 OUTPUT:
2339 RETVAL 2478 RETVAL
2340 2479
2341CFPlus::Channel 2480DC::Channel
2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2481play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343 CODE: 2482 CODE:
2483{
2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2484 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2485
2486 if (RETVAL < 0)
2487 XSRETURN_UNDEF;
2488
2489 if (channel < 0)
2490 {
2345 Mix_UnregisterAllEffects (RETVAL); 2491 Mix_UnregisterAllEffects (RETVAL);
2492 Mix_Volume (RETVAL, 128);
2493 }
2494}
2346 OUTPUT: 2495 OUTPUT:
2347 RETVAL 2496 RETVAL
2348 2497
2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2498MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350 2499
2351int 2500int
2352volume (int volume = -1) 2501volume (int volume = -1)
2353 PROTOTYPE: ;$ 2502 PROTOTYPE: ;$
2354 CODE: 2503 CODE:
2504 if (items > 0)
2505 volume = CLAMP (volume, 0, 128);
2355 RETVAL = Mix_VolumeMusic (volume); 2506 RETVAL = Mix_VolumeMusic (volume);
2356 OUTPUT: 2507 OUTPUT:
2357 RETVAL 2508 RETVAL
2358 2509
2359void 2510void
2364void 2515void
2365halt () 2516halt ()
2366 CODE: 2517 CODE:
2367 Mix_HaltMusic (); 2518 Mix_HaltMusic ();
2368 2519
2369CFPlus::MixMusic 2520DC::MixMusic
2370new (SV *class, CFPlus::RW rwops) 2521new (SV *class, DC::RW rwops)
2371 CODE: 2522 CODE:
2372 RETVAL = Mix_LoadMUS_RW (rwops); 2523 RETVAL = Mix_LoadMUS_RW (rwops);
2373 OUTPUT: 2524 OUTPUT:
2374 RETVAL 2525 RETVAL
2375 2526
2376void 2527void
2377DESTROY (CFPlus::MixMusic self) 2528DESTROY (DC::MixMusic self)
2378 CODE: 2529 CODE:
2379 Mix_FreeMusic (self); 2530 Mix_FreeMusic (self);
2380 2531
2381int 2532int
2382play (CFPlus::MixMusic self, int loops = -1) 2533play (DC::MixMusic self, int loops = -1)
2383 CODE: 2534 CODE:
2384 RETVAL = Mix_PlayMusic (self, loops); 2535 RETVAL = Mix_PlayMusic (self, loops);
2385 OUTPUT: 2536 OUTPUT:
2386 RETVAL 2537 RETVAL
2387 2538
2388void 2539void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2540fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390 CODE: 2541 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position); 2542 Mix_FadeInMusicPos (self, loops, ms, position);
2392 2543
2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2544MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394 2545
2395PROTOTYPES: ENABLE 2546PROTOTYPES: ENABLE
2396 2547
2397BOOT: 2548BOOT:
2398{ 2549{
2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2550 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400 static const struct { 2551 static const struct {
2401 const char *name; 2552 const char *name;
2402 IV iv; 2553 IV iv;
2403 } *civ, const_iv[] = { 2554 } *civ, const_iv[] = {
2404# define const_iv(name) { # name, (IV)name } 2555# define const_iv(name) { # name, (IV)name }
2439 const_iv (GL_INTENSITY), 2590 const_iv (GL_INTENSITY),
2440 const_iv (GL_LUMINANCE), 2591 const_iv (GL_LUMINANCE),
2441 const_iv (GL_LUMINANCE_ALPHA), 2592 const_iv (GL_LUMINANCE_ALPHA),
2442 const_iv (GL_FLOAT), 2593 const_iv (GL_FLOAT),
2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2594 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2595 const_iv (GL_COMPRESSED_ALPHA_ARB),
2596 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2597 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2598 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2599 const_iv (GL_COMPRESSED_RGB_ARB),
2600 const_iv (GL_COMPRESSED_RGBA_ARB),
2444 const_iv (GL_COMPILE), 2601 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D), 2602 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D), 2603 const_iv (GL_PROXY_TEXTURE_2D),
2447 const_iv (GL_TEXTURE_1D), 2604 const_iv (GL_TEXTURE_1D),
2448 const_iv (GL_TEXTURE_2D), 2605 const_iv (GL_TEXTURE_2D),
2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2644 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT), 2645 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT), 2646 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT), 2647 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT), 2648 const_iv (GL_GENERATE_MIPMAP_HINT),
2649 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492 const_iv (GL_FASTEST), 2650 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE), 2651 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST), 2652 const_iv (GL_NICEST),
2495 const_iv (GL_V2F), 2653 const_iv (GL_V2F),
2496 const_iv (GL_V3F), 2654 const_iv (GL_V3F),
2504 2662
2505 texture_av = newAV (); 2663 texture_av = newAV ();
2506 AvREAL_off (texture_av); 2664 AvREAL_off (texture_av);
2507} 2665}
2508 2666
2667void
2668disable_GL_EXT_blend_func_separate ()
2669 CODE:
2670 gl.BlendFuncSeparate = 0;
2671 gl.BlendFuncSeparateEXT = 0;
2672
2509char * 2673char *
2510gl_vendor () 2674gl_vendor ()
2511 CODE: 2675 CODE:
2512 RETVAL = (char *)glGetString (GL_VENDOR); 2676 RETVAL = (char *)glGetString (GL_VENDOR);
2513 OUTPUT: 2677 OUTPUT:
2634 2798
2635void glRect (float x1, float y1, float x2, float y2) 2799void glRect (float x1, float y1, float x2, float y2)
2636 CODE: 2800 CODE:
2637 glRectf (x1, y1, x2, y2); 2801 glRectf (x1, y1, x2, y2);
2638 2802
2803void glRect_lineloop (float x1, float y1, float x2, float y2)
2804 CODE:
2805 glBegin (GL_LINE_LOOP);
2806 glVertex2f (x1, y1);
2807 glVertex2f (x2, y1);
2808 glVertex2f (x2, y2);
2809 glVertex2f (x1, y2);
2810 glEnd ();
2811
2639PROTOTYPES: ENABLE 2812PROTOTYPES: ENABLE
2640 2813
2641void glBegin (int mode) 2814void glBegin (int mode)
2642 2815
2643void glEnd () 2816void glEnd ()
2675void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2848void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2676 CODE: 2849 CODE:
2677 if (gl.SeparableFilter2D) 2850 if (gl.SeparableFilter2D)
2678 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2851 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679 2852
2680void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2853void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681 2854
2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2855void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683 2856
2684void glDrawPixels (int width, int height, int format, int type, char *pixels) 2857void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685 2858
2711 2884
2712void glEndList () 2885void glEndList ()
2713 2886
2714void glCallList (int list) 2887void glCallList (int list)
2715 2888
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2889MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717 2890
2718PROTOTYPES: DISABLE 2891PROTOTYPES: DISABLE
2719 2892
2720void 2893void
2721find_widget (SV *self, NV x, NV y) 2894find_widget (SV *self, NV x, NV y)
2725 XPUSHs (self); 2898 XPUSHs (self);
2726} 2899}
2727 2900
2728BOOT: 2901BOOT:
2729{ 2902{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2903 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731 2904
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 2905 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); 2906 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); 2907 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); 2908 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736} 2909}
2737 2910
2738void 2911void
2739draw (SV *self) 2912draw (SV *self)
2740 CODE: 2913 CODE:
2744 NV x, y, w, h; 2917 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv); 2918 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv); 2919 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv); 2920 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv); 2921 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h; 2922 double draw_x, draw_y;
2751 2923
2752 if (!SvROK (self)) 2924 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2925 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754 2926
2755 hv = (HV *)SvRV (self); 2927 hv = (HV *)SvRV (self);
2756 2928
2757 if (SvTYPE (hv) != SVt_PVHV) 2929 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2930 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759 2931
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 2932 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.; 2933 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762 2934
2763 if (!h || !w) 2935 if (!h || !w)
2783 { 2955 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2956 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785 2957
2786 if (svp && SvTRUE (*svp)) 2958 if (svp && SvTRUE (*svp))
2787 { 2959 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 2960 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789 glEnable (GL_BLEND); 2961 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2962 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS); 2963 glBegin (GL_QUADS);
2792 glVertex2f (0, 0); 2964 glVertex2f (0, 0);
2793 glVertex2f (w, 0); 2965 glVertex2f (w, 0);
2796 glEnd (); 2968 glEnd ();
2797 glDisable (GL_BLEND); 2969 glDisable (GL_BLEND);
2798 } 2970 }
2799 } 2971 }
2800#if 0 2972#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) { 2973 // draw borders, for debugging
2802 glPushMatrix; 2974 glPushMatrix ();
2803 glColor 1, 1, 0, 1; 2975 glColor4f (1., 1., 0., 1.);
2804 glTranslate 0.375, 0.375; 2976 glTranslatef (.5, .5, 0.);
2805 glBegin GL_LINE_LOOP; 2977 glBegin (GL_LINE_LOOP);
2806 glVertex 0 , 0; 2978 glVertex2f (0 , 0);
2807 glVertex $self->{w} - 1, 0; 2979 glVertex2f (w - 1, 0);
2808 glVertex $self->{w} - 1, $self->{h} - 1; 2980 glVertex2f (w - 1, h - 1);
2809 glVertex 0 , $self->{h} - 1; 2981 glVertex2f (0 , h - 1);
2810 glEnd; 2982 glEnd ();
2811 glPopMatrix; 2983 glPopMatrix ();
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif 2984#endif
2815 PUSHMARK (SP); 2985 PUSHMARK (SP);
2816 XPUSHs (self); 2986 XPUSHs (self);
2817 PUTBACK; 2987 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD); 2988 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines