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.209 by root, Sat Jul 21 22:54:52 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>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 36
30#include <SDL.h> 37#include <SDL.h>
31#include <SDL_thread.h> 38#include <SDL_thread.h>
32#include <SDL_endian.h> 39#include <SDL_endian.h>
33#include <SDL_image.h> 40#include <SDL_image.h>
107 av_push (texture_av, (SV *)(size_t)name); 114 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 115 glDeleteTextures (1, &name);
109} 116}
110 117
111#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
112 120
113#include "pango-font.c" 121#include "pango-font.c"
114#include "pango-fontmap.c" 122#include "pango-fontmap.c"
115#include "pango-render.c" 123#include "pango-render.c"
116 124
125typedef IV DC__Channel;
126typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 127typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 128typedef Mix_Music *DC__MixMusic;
119 129
120typedef PangoFontDescription *CFPlus__Font; 130typedef PangoFontDescription *DC__Font;
121 131
122static int 132static int
123shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
124{ 134{
125 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
139 149
140typedef struct cf_layout { 150typedef struct cf_layout {
141 PangoLayout *pl; 151 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
143 int base_height; 153 int base_height;
144 CFPlus__Font font; 154 DC__Font font;
155 rc_t *rc;
145} *CFPlus__Layout; 156} *DC__Layout;
146 157
147static CFPlus__Font default_font; 158static DC__Font default_font;
148static PangoContext *opengl_context; 159static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
150 161
151static void 162static void
152substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
157#endif 168#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 170}
160 171
161static void 172static void
162layout_update_font (CFPlus__Layout self) 173layout_update_font (DC__Layout self)
163{ 174{
164 /* 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
165 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
166 */ 177 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
171 182
172 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
173} 184}
174 185
175static void 186static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 187layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 188{
178 PangoRectangle rect; 189 PangoRectangle rect;
179 190
180 // get_pixel_* wrongly rounds down 191 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 192 pango_layout_get_extents (self->pl, 0, &rect);
192 203
193typedef uint16_t tileid; 204typedef uint16_t tileid;
194typedef uint16_t faceid; 205typedef uint16_t faceid;
195 206
196typedef struct { 207typedef struct {
197 int name; 208 GLuint name;
198 int w, h; 209 int w, h;
199 float s, t; 210 float s, t;
200 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
201 tileid smoothtile; 212 tileid smoothtile;
202 uint8_t smoothlevel; 213 uint8_t smoothlevel;
220 int faces; tileid *face2tile; // [faceid] 231 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 232 int texs; maptex *tex; // [tileid]
222 233
223 int32_t rows; 234 int32_t rows;
224 maprow *row; 235 maprow *row;
225} *CFPlus__Map; 236} *DC__Map;
226 237
227static char * 238static char *
228prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
229{ 240{
230 char *p; 241 char *p;
268 self->texs *= 2; 279 self->texs *= 2;
269 } 280 }
270} 281}
271 282
272static maprow * 283static maprow *
273map_get_row (CFPlus__Map self, int y) 284map_get_row (DC__Map self, int y)
274{ 285{
275 if (0 > y) 286 if (0 > y)
276 { 287 {
277 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
316 327
317 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
318} 329}
319 330
320static mapcell * 331static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 332map_get_cell (DC__Map self, int x, int y)
322{ 333{
323 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
324} 335}
325 336
326static void 337static void
327map_clear (CFPlus__Map self) 338map_clear (DC__Map self)
328{ 339{
329 int r; 340 int r;
330 341
331 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
340 self->row = 0; 351 self->row = 0;
341 self->rows = 0; 352 self->rows = 0;
342} 353}
343 354
344static void 355static void
345map_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)
346{ 357{
347 int x, y; 358 int x, y;
348 maprow *row; 359 maprow *row;
349 mapcell *cell; 360 mapcell *cell;
350 361
429 n |= n >> 16; 440 n |= n >> 16;
430 441
431 return n + 1; 442 return n + 1;
432} 443}
433 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
434/* SDL should provide this, really. */ 456/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 457#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 458#define SDLK_MODIFIER_MAX 314
437 459
438/******************************************************************************/ 460/******************************************************************************/
476 return 0; 498 return 0;
477 499
478 return 1; 500 return 1;
479} 501}
480 502
481MODULE = CFPlus PACKAGE = CFPlus 503MODULE = Deliantra::Client PACKAGE = DC
482 504
483PROTOTYPES: ENABLE 505PROTOTYPES: ENABLE
484 506
485BOOT: 507BOOT:
486{ 508{
487 HV *stash = gv_stashpv ("CFPlus", 1); 509 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 510 static const struct {
489 const char *name; 511 const char *name;
490 IV iv; 512 IV iv;
491 } *civ, const_iv[] = { 513 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 514# define const_iv(name) { # name, (IV)name }
514 536
515 const_iv (SDL_APPINPUTFOCUS), 537 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 538 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 539 const_iv (SDL_APPACTIVE),
518 540
541 const_iv (SDLK_FIRST),
542 const_iv (SDLK_LAST),
519 const_iv (SDLK_KP0), 543 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 544 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 545 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 546 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 547 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 619 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 620 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 621 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 622 const_iv (KMOD_CAPS),
599 const_iv (KMOD_MODE), 623 const_iv (KMOD_MODE),
624
625 const_iv (MIX_DEFAULT_FORMAT),
600# undef const_iv 626# undef const_iv
601 }; 627 };
602 628
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
621 RETVAL 647 RETVAL
622 648
623NV floor (NV x) 649NV floor (NV x)
624 650
625NV ceil (NV x) 651NV ceil (NV x)
652
653IV minpot (UV n)
654
655IV popcount (UV n)
626 656
627void 657void
628pango_init () 658pango_init ()
629 CODE: 659 CODE:
630{ 660{
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 701
672 if (m && m != (SDL_Rect **)-1) 702 if (m && m != (SDL_Rect **)-1)
673 while (*m) 703 while (*m)
674 { 704 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 705 if ((*m)->w >= 800 && (*m)->h >= 480)
676 { 706 {
677 AV *av = newAV (); 707 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 708 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 709 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 710 av_push (av, newSViv (rgb));
704 734
705 if (RETVAL) 735 if (RETVAL)
706 { 736 {
707 av_clear (texture_av); 737 av_clear (texture_av);
708 738
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 739 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#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);
711#include "glfunc.h" 741#include "glfunc.h"
712#undef GL_FUNC 742#undef GL_FUNC
713 } 743 }
714} 744}
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 825 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 826 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 827 break;
798 } 828 }
799 829
800 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))));
801 } 831 }
802} 832}
803 833
804int 834int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 835Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 836 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 837 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 838 Mix_ChannelFinished (channel_finished);
809 839
810void 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
811Mix_CloseAudio () 857Mix_CloseAudio ()
812 858
813int 859int
814Mix_AllocateChannels (int numchans = -1) 860Mix_AllocateChannels (int numchans = -1)
861
862const char *
863Mix_GetError ()
815 864
816void 865void
817lowdelay (int fd, int val = 1) 866lowdelay (int fd, int val = 1)
818 CODE: 867 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 868 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
861 STRLEN image_len; 910 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 911 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 912 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 913 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 914 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 915 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 916 : SDL_RWFromConstMem (image, image_len);
868 917
869 if (!rw) 918 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 919 croak ("load_image: %s", SDL_GetError ());
871 920
944void 993void
945error (char *message) 994error (char *message)
946 CODE: 995 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 996 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 997#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 998 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 999#endif
951 1000
952void 1001void
953fatal (char *message) 1002fatal (char *message)
954 CODE: 1003 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1004 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1005#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1006 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1007#endif
959 _exit (1); 1008 _exit (1);
960 1009
961void 1010void
962_exit (int retval = 0) 1011_exit (int retval = 0)
974#if DEBUG 1023#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1024 VALGRIND_DO_LEAK_CHECK;
976#endif 1025#endif
977} 1026}
978 1027
979MODULE = CFPlus PACKAGE = CFPlus::Font 1028MODULE = Deliantra::Client PACKAGE = DC::Font
980 1029
981PROTOTYPES: DISABLE 1030PROTOTYPES: DISABLE
982 1031
983CFPlus::Font 1032DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1033new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1034 CODE:
986{ 1035{
987 int count; 1036 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1037 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1040}
992 OUTPUT: 1041 OUTPUT:
993 RETVAL 1042 RETVAL
994 1043
995void 1044void
996DESTROY (CFPlus::Font self) 1045DESTROY (DC::Font self)
997 CODE: 1046 CODE:
998 pango_font_description_free (self); 1047 pango_font_description_free (self);
999 1048
1000void 1049void
1001make_default (CFPlus::Font self) 1050make_default (DC::Font self)
1002 PROTOTYPE: $ 1051 PROTOTYPE: $
1003 CODE: 1052 CODE:
1004 default_font = self; 1053 default_font = self;
1005 1054
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1055MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1056
1008PROTOTYPES: DISABLE 1057PROTOTYPES: DISABLE
1009 1058
1010void 1059void
1011reset_glyph_cache () 1060glyph_cache_backup ()
1012 PROTOTYPE: 1061 PROTOTYPE:
1013 CODE: 1062 CODE:
1063 tc_backup ();
1064
1065void
1066glyph_cache_restore ()
1067 PROTOTYPE:
1068 CODE:
1014 tc_clear (); 1069 tc_restore ();
1015 1070
1016CFPlus::Layout 1071DC::Layout
1017new (SV *class) 1072new (SV *class)
1018 CODE: 1073 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1074 New (0, RETVAL, 1, struct cf_layout);
1020 1075
1021 RETVAL->pl = pango_layout_new (opengl_context); 1076 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1078 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1079 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1080 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1081 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1082 RETVAL->font = 0;
1083 RETVAL->rc = rc_alloc ();
1028 1084
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1085 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1086 layout_update_font (RETVAL);
1031 OUTPUT: 1087 OUTPUT:
1032 RETVAL 1088 RETVAL
1033 1089
1034void 1090void
1035DESTROY (CFPlus::Layout self) 1091DESTROY (DC::Layout self)
1036 CODE: 1092 CODE:
1037 g_object_unref (self->pl); 1093 g_object_unref (self->pl);
1094 rc_free (self->rc);
1038 Safefree (self); 1095 Safefree (self);
1039 1096
1040void 1097void
1041set_text (CFPlus::Layout self, SV *text_) 1098set_text (DC::Layout self, SV *text_)
1042 CODE: 1099 CODE:
1043{ 1100{
1044 STRLEN textlen; 1101 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1102 char *text = SvPVutf8 (text_, textlen);
1046 1103
1047 pango_layout_set_text (self->pl, text, textlen); 1104 pango_layout_set_text (self->pl, text, textlen);
1048} 1105}
1049 1106
1050void 1107void
1051set_markup (CFPlus::Layout self, SV *text_) 1108set_markup (DC::Layout self, SV *text_)
1052 CODE: 1109 CODE:
1053{ 1110{
1054 STRLEN textlen; 1111 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1112 char *text = SvPVutf8 (text_, textlen);
1056 1113
1057 pango_layout_set_markup (self->pl, text, textlen); 1114 pango_layout_set_markup (self->pl, text, textlen);
1058} 1115}
1059 1116
1060void 1117void
1061set_shapes (CFPlus::Layout self, ...) 1118set_shapes (DC::Layout self, ...)
1062 CODE: 1119 CODE:
1063{ 1120{
1064 PangoAttrList *attrs = 0; 1121 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1122 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1123 const char *pos = text;
1101 if (attrs) 1158 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1159 pango_layout_set_attributes (self->pl, attrs);
1103} 1160}
1104 1161
1105void 1162void
1106get_shapes (CFPlus::Layout self) 1163get_shapes (DC::Layout self)
1107 PPCODE: 1164 PPCODE:
1108{ 1165{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1167
1111 do 1168 do
1126 1183
1127 pango_layout_iter_free (iter); 1184 pango_layout_iter_free (iter);
1128} 1185}
1129 1186
1130int 1187int
1131has_wrapped (CFPlus::Layout self) 1188has_wrapped (DC::Layout self)
1132 CODE: 1189 CODE:
1133{ 1190{
1134 int lines = 1; 1191 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
1136 1193
1141} 1198}
1142 OUTPUT: 1199 OUTPUT:
1143 RETVAL 1200 RETVAL
1144 1201
1145SV * 1202SV *
1146get_text (CFPlus::Layout self) 1203get_text (DC::Layout self)
1147 CODE: 1204 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1205 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1206 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1207 OUTPUT:
1151 RETVAL 1208 RETVAL
1152 1209
1153void 1210void
1154set_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.)
1155 CODE: 1212 CODE:
1156 self->r = r; 1213 self->r = r;
1157 self->g = g; 1214 self->g = g;
1158 self->b = b; 1215 self->b = b;
1159 self->a = a; 1216 self->a = a;
1160 1217
1161void 1218void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1219set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1220 CODE:
1164 if (self->font != font) 1221 if (self->font != font)
1165 { 1222 {
1166 self->font = font; 1223 self->font = font;
1167 layout_update_font (self); 1224 layout_update_font (self);
1168 } 1225 }
1169 1226
1170void 1227void
1171set_height (CFPlus::Layout self, int base_height) 1228set_height (DC::Layout self, int base_height)
1172 CODE: 1229 CODE:
1173 if (self->base_height != base_height) 1230 if (self->base_height != base_height)
1174 { 1231 {
1175 self->base_height = base_height; 1232 self->base_height = base_height;
1176 layout_update_font (self); 1233 layout_update_font (self);
1177 } 1234 }
1178 1235
1179void 1236void
1180set_width (CFPlus::Layout self, int max_width = -1) 1237set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1238 CODE:
1182 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);
1183 1240
1184void 1241void
1185set_indent (CFPlus::Layout self, int indent) 1242set_indent (DC::Layout self, int indent)
1186 CODE: 1243 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1244 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1245
1189void 1246void
1190set_spacing (CFPlus::Layout self, int spacing) 1247set_spacing (DC::Layout self, int spacing)
1191 CODE: 1248 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1249 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1250
1194void 1251void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1252set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1253 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1254 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1255 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1256 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1257 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1258 : PANGO_ELLIPSIZE_NONE
1202 ); 1259 );
1203 1260
1204void 1261void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1262set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1263 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1264 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1265
1209void 1266void
1210size (CFPlus::Layout self) 1267size (DC::Layout self)
1211 PPCODE: 1268 PPCODE:
1212{ 1269{
1213 int w, h; 1270 int w, h;
1214 1271
1215 layout_get_pixel_size (self, &w, &h); 1272 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1275 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1276 PUSHs (sv_2mortal (newSViv (h)));
1220} 1277}
1221 1278
1222int 1279int
1223descent (CFPlus::Layout self) 1280descent (DC::Layout self)
1224 CODE: 1281 CODE:
1225{ 1282{
1226 PangoRectangle rect; 1283 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1285 pango_layout_line_get_pixel_extents (line, 0, &rect);
1230} 1287}
1231 OUTPUT: 1288 OUTPUT:
1232 RETVAL 1289 RETVAL
1233 1290
1234int 1291int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1292xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1293 CODE:
1237{ 1294{
1238 int index, trailing; 1295 int index, trailing;
1239 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);
1240 RETVAL = index + trailing; 1297 RETVAL = index + trailing;
1241} 1298}
1242 OUTPUT: 1299 OUTPUT:
1243 RETVAL 1300 RETVAL
1244 1301
1245void 1302void
1246cursor_pos (CFPlus::Layout self, int index) 1303cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1304 PPCODE:
1248{ 1305{
1249 PangoRectangle strong_pos; 1306 PangoRectangle strong_pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1251 1308
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1256} 1313}
1257 1314
1258void 1315void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1316index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1317 PPCODE:
1261{ 1318{
1262 int line, x; 1319 int line, x;
1263 1320
1264 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)
1265 /* 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
1266 1327
1267 EXTEND (SP, 2); 1328 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1329 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1331}
1271 1332
1272void 1333void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1334line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1335 PPCODE:
1275{ 1336{
1276 PangoLayoutLine *lp; 1337 PangoLayoutLine *lp;
1277 int index, trailing; 1338 int index, trailing;
1278 1339
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1354 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1355 }
1295} 1356}
1296 1357
1297void 1358void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1359render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1360 CODE:
1361 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1362 pango_opengl_render_layout_subpixel (
1301 self->pl, 1363 self->pl,
1364 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1365 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1366 self->r, self->g, self->b, self->a,
1304 flags 1367 flags
1305 ); 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);
1306 1372
1307MODULE = 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
1308 1393
1309PROTOTYPES: ENABLE 1394PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1395
1313void 1396void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1397pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1398 CODE:
1316{ 1399{
1343 HV *hv = (HV *)SvRV (self); 1426 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1427 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1428 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1429 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1430
1431 if (name <= 0)
1432 XSRETURN_EMPTY;
1433
1348 if (items < 5) 1434 if (items < 5)
1349 { 1435 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1436 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1437 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1438 }
1390 RETVAL = width > 0; 1476 RETVAL = width > 0;
1391} 1477}
1392 OUTPUT: 1478 OUTPUT:
1393 RETVAL 1479 RETVAL
1394 1480
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1481MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1482
1397PROTOTYPES: DISABLE 1483PROTOTYPES: DISABLE
1398 1484
1399CFPlus::Map 1485DC::Map
1400new (SV *class) 1486new (SV *class)
1401 CODE: 1487 CODE:
1402 New (0, RETVAL, 1, struct map); 1488 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1489 RETVAL->x = 0;
1404 RETVAL->y = 0; 1490 RETVAL->y = 0;
1412 RETVAL->row = 0; 1498 RETVAL->row = 0;
1413 OUTPUT: 1499 OUTPUT:
1414 RETVAL 1500 RETVAL
1415 1501
1416void 1502void
1417DESTROY (CFPlus::Map self) 1503DESTROY (DC::Map self)
1418 CODE: 1504 CODE:
1419{ 1505{
1420 map_clear (self); 1506 map_clear (self);
1421 Safefree (self->face2tile); 1507 Safefree (self->face2tile);
1422 Safefree (self->tex); 1508 Safefree (self->tex);
1423 Safefree (self); 1509 Safefree (self);
1424} 1510}
1425 1511
1426void 1512void
1427resize (CFPlus::Map self, int map_width, int map_height) 1513resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1514 CODE:
1429 self->w = map_width; 1515 self->w = map_width;
1430 self->h = map_height; 1516 self->h = map_height;
1431 1517
1432void 1518void
1433clear (CFPlus::Map self) 1519clear (DC::Map self)
1434 CODE: 1520 CODE:
1435 map_clear (self); 1521 map_clear (self);
1436 1522
1437void 1523void
1438set_tileid (CFPlus::Map self, int face, int tile) 1524set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1525 CODE:
1440{ 1526{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1527 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1528 need_texid (self, tile);
1443} 1529}
1444 1530
1445void 1531void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1532set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1533 CODE:
1448{ 1534{
1449 tileid texid; 1535 tileid texid;
1450 maptex *tex; 1536 maptex *tex;
1451 1537
1464 tex->smoothtile = self->face2tile [smooth]; 1550 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1551 tex->smoothlevel = level;
1466} 1552}
1467 1553
1468void 1554void
1469set_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)
1470 CODE: 1556 CODE:
1471{ 1557{
1472 need_texid (self, texid); 1558 need_texid (self, texid);
1473 1559
1474 { 1560 {
1494 // from transparent color bleeding and ugly wrapping effects. 1580 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1581 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1582}
1497 1583
1498int 1584int
1499ox (CFPlus::Map self) 1585ox (DC::Map self)
1500 ALIAS: 1586 ALIAS:
1501 oy = 1 1587 oy = 1
1502 x = 2 1588 x = 2
1503 y = 3 1589 y = 3
1504 w = 4 1590 w = 4
1515 } 1601 }
1516 OUTPUT: 1602 OUTPUT:
1517 RETVAL 1603 RETVAL
1518 1604
1519void 1605void
1520scroll (CFPlus::Map self, int dx, int dy) 1606scroll (DC::Map self, int dx, int dy)
1521 CODE: 1607 CODE:
1522{ 1608{
1523 if (dx > 0) 1609 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1610 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1611 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1626 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1627 self->y += MAP_EXTEND_Y;
1542 } 1628 }
1543} 1629}
1544 1630
1545void 1631SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1632map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1633 CODE:
1548{ 1634{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1635 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1636 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1637 mapcell *cell;
1552 int x, y, flags; 1638 int x, y, z, flags;
1639 AV *missing = newAV ();
1640 RETVAL = newRV_noinc ((SV *)missing);
1553 1641
1554 while (data < data_end - 1) 1642 while (data < data_end - 1)
1555 { 1643 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1644 flags = (data [0] << 8) + data [1]; data += 2;
1557 1645
1608 } 1696 }
1609 else 1697 else
1610 cell->darkness = *data++ + 1; 1698 cell->darkness = *data++ + 1;
1611 } 1699 }
1612 1700
1701 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 1702 if (flags & (4 >> z))
1614 { 1703 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 1704 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 1705 need_facenum (self, face);
1617 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 }
1618 } 1721 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 1722 }
1634 else 1723 else
1635 cell->darkness = 0; 1724 cell->darkness = 0;
1636 } 1725 }
1637} 1726}
1727 OUTPUT:
1728 RETVAL
1638 1729
1639SV * 1730SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1731mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 1732 CODE:
1642{ 1733{
1643 int x1, x; 1734 int x1, x;
1644 int y1, y; 1735 int y1, y;
1645 int z; 1736 int z;
1690} 1781}
1691 OUTPUT: 1782 OUTPUT:
1692 RETVAL 1783 RETVAL
1693 1784
1694void 1785void
1695draw (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)
1696 CODE: 1787 CODE:
1697{ 1788{
1789 int x, y, z;
1790
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 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
1700 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)
1701 smooth_key skey; 1794 smooth_key skey;
1702 int x, y, z; 1795
1703 int last_name; 1796 rc_t *rc = rc_alloc ();
1797 rc_key_t key;
1798 rc_array_t *arr;
1704 1799
1705 // thats current max. sorry. 1800 // thats current max. sorry.
1706 if (sw > 255) sw = 255; 1801 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 1802 if (sh > 255) sh = 255;
1708 1803
1709 // clear key, in case of extra padding 1804 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 1805 memset (&skey, 0, sizeof (skey));
1711 1806
1712 glColor4ub (255, 255, 255, 255); 1807 memset (&key, 0, sizeof (key));
1713 1808 key.r = 255;
1714 glEnable (GL_BLEND); 1809 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1810 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 1811 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1812 key.mode = GL_QUADS;
1718 1813 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS); 1814 key.texname = -1;
1720
1721 last_name = 0;
1722 1815
1723 mx += self->x; 1816 mx += self->x;
1724 my += self->y; 1817 my += self->y;
1725 1818
1726 // first pass: determine smooth_max 1819 // first pass: determine smooth_max
1742 MAX (self->tex [cell->tile [0]].smoothlevel, 1835 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 1836 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 1837 self->tex [cell->tile [2]].smoothlevel));
1745 } 1838 }
1746 } 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);
1747 1844
1748 for (z = 0; z <= 2; z++) 1845 for (z = 0; z <= 2; z++)
1749 { 1846 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 1847 memset (smooth_level, 0, sizeof (smooth_level));
1751 1848
1761 tileid tile = cell->tile [z]; 1858 tileid tile = cell->tile [z];
1762 1859
1763 if (tile) 1860 if (tile)
1764 { 1861 {
1765 maptex tex = self->tex [tile]; 1862 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 1863 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 1864
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 1865 if (key.texname != tex.name)
1772 { 1866 {
1773 if (!tex.name) 1867 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 1868 tex = self->tex [2]; /* missing, replace by noface */
1775 1869
1776 glEnd (); 1870 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1871 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 1872 }
1780 1873
1781 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);
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1878 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1783 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);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1880 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1785 1881
1786 if (cell->flags && z == 2) 1882 if (cell->flags && z == 2)
1787 { 1883 {
1884 // overlays such as the speech bubble, probably more to come
1788 if (cell->flags & 1) 1885 if (cell->flags & 1)
1789 { 1886 {
1790 maptex tex = self->tex [1]; 1887 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32; 1888 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32; 1889 int py = y * T - T * 6 / 32;
1793 1890
1891 if (tex.name)
1794 glEnd (); 1892 {
1795 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);
1796 glBegin (GL_QUADS); 1903 }
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 } 1904 }
1803 } 1905 }
1804 1906
1805 // update smooth hash 1907 // update smooth hash
1806 if (tex.smoothtile) 1908 if (tex.smoothtile)
1842 } 1944 }
1843 } 1945 }
1844 } 1946 }
1845 } 1947 }
1846 1948
1949 rc_draw (rc);
1950 rc_clear (rc);
1951
1847 // go through all smoothlevels, lowest to highest, then draw. 1952 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 1953 // this is basically counting sort
1849 { 1954 {
1850 int w, b; 1955 int w, b;
1851 1956
1957 glEnable (GL_TEXTURE_2D);
1958 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 1959 for (w = 0; w < 256 / 32; ++w)
1853 { 1960 {
1854 uint32_t smask = smooth_level [w]; 1961 uint32_t smask = smooth_level [w];
1855 if (smask) 1962 if (smask)
1856 for (b = 0; b < 32; ++b) 1963 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 1982 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 1983 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 1984 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 1985 float dy = tex.t * .5f ; // 2 images/column
1879 1986
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 1987 if (tex.name)
1883 { 1988 {
1989 // this time avoiding texture state changes
1990 // save gobs of state changes.
1884 if (!tex.name) 1991 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 1992 {
1886
1887 glEnd (); 1993 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1994 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 1995 glBegin (GL_QUADS);
1890 } 1996 }
1891 1997
1892 if (border) 1998 if (border)
1893 { 1999 {
1894 float ox = border * dx; 2000 float ox = border * dx;
1895 2001
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2002 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2003 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2004 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2005 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2006 }
1901 2007
1902 if (corner) 2008 if (corner)
1903 { 2009 {
1904 float ox = corner * dx; 2010 float ox = corner * dx;
1905 2011
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2012 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2013 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2014 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2015 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2016 }
1910 } 2017 }
1911 } 2018 }
1912 } 2019 }
1913 } 2020 }
1914 } 2021 }
2022
2023 glEnd ();
2024 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1;
1915 } 2026 }
1916 2027
1917 hv_clear (smooth); 2028 hv_clear (smooth);
1918 } 2029 }
1919 2030
1920 glEnd ();
1921
1922 glDisable (GL_TEXTURE_2D);
1923 glDisable (GL_BLEND); 2031 glDisable (GL_BLEND);
2032 rc_free (rc);
1924 2033
1925 // top layer: overlays such as the health bar 2034 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1928 { 2037 {
1953 } 2062 }
1954 } 2063 }
1955} 2064}
1956 2065
1957void 2066void
1958draw_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)
1959 CODE: 2068 CODE:
1960{ 2069{
1961 static float color[16][3] = { 2070 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2071 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F }, 2072 { 1.00F, 1.00F, 1.00F },
2013 glDisable (GL_BLEND); 2122 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2123 glDisable (GL_TEXTURE_2D);
2015} 2124}
2016 2125
2017void 2126void
2018fow_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)
2019 PPCODE: 2128 PPCODE:
2020{ 2129{
2021 int x, y; 2130 int x, y;
2022 int sw1 = sw + 2; 2131 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2132 int sh1 = sh + 2;
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2203 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2204 PUSHs (darkness3_sv);
2096} 2205}
2097 2206
2098SV * 2207SV *
2099get_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)
2100 CODE: 2209 CODE:
2101{ 2210{
2102 int x, y, x1, y1; 2211 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2212 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2213 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2169} 2278}
2170 OUTPUT: 2279 OUTPUT:
2171 RETVAL 2280 RETVAL
2172 2281
2173void 2282void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2283set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2175 PPCODE: 2284 PPCODE:
2176{ 2285{
2177 int x, y, z; 2286 int x, y, z;
2178 int w, h; 2287 int w, h;
2179 int x1, y1; 2288 int x1, y1;
2180 2289
2181 if (*data++ != 0) 2290 if (*data++ != 0)
2182 return; /* version mismatch */ 2291 XSRETURN_EMPTY; /* version mismatch */
2183 2292
2184 w = *data++ << 8; w |= *data++; 2293 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2294 h = *data++ << 8; h |= *data++;
2186 2295
2187 // 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
2232 } 2341 }
2233 } 2342 }
2234 } 2343 }
2235} 2344}
2236 2345
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2346MODULE = Deliantra::Client PACKAGE = DC::RW
2347
2348DC::RW
2349new (SV *class, SV *data_sv)
2350 CODE:
2351{
2352 STRLEN datalen;
2353 char *data = SvPVbyte (data_sv, datalen);
2354
2355 RETVAL = SDL_RWFromConstMem (data, datalen);
2356}
2357 OUTPUT:
2358 RETVAL
2359
2360DC::RW
2361new_from_file (SV *class, const char *path, const char *mode = "rb")
2362 CODE:
2363 RETVAL = SDL_RWFromFile (path, mode);
2364 OUTPUT:
2365 RETVAL
2366
2367# fails on win32:
2368# dc.xs(2268) : error C2059: syntax error : '('
2369#void
2370#close (DC::RW self)
2371# CODE:
2372# (self->(close)) (self);
2373
2374MODULE = Deliantra::Client PACKAGE = DC::Channel
2238 2375
2239PROTOTYPES: DISABLE 2376PROTOTYPES: DISABLE
2240 2377
2241CFPlus::MixChunk 2378DC::Channel
2242new_from_file (SV *class, char *path) 2379find ()
2243 CODE: 2380 CODE:
2244 RETVAL = Mix_LoadWAV (path); 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}
2245 OUTPUT: 2397 OUTPUT:
2246 RETVAL 2398 RETVAL
2247 2399
2248void 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
2415int
2416volume (DC::Channel self, int volume)
2417 CODE:
2418 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2419 OUTPUT:
2420 RETVAL
2421
2422void
2423unregister_all_effects (DC::Channel self)
2424 CODE:
2425 Mix_UnregisterAllEffects (self);
2426
2427void
2428set_panning (DC::Channel self, int left, int right)
2429 CODE:
2430 left = CLAMP (left , 0, 255);
2431 right = CLAMP (right, 0, 255);
2432 Mix_SetPanning (self, left, right);
2433
2434void
2435set_distance (DC::Channel self, int distance)
2436 CODE:
2437 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2438
2439void
2440set_position (DC::Channel self, int angle, int distance)
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);
2449 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2450}
2451
2452void
2453set_reverse_stereo (DC::Channel self, int flip)
2454 CODE:
2455 Mix_SetReverseStereo (self, flip);
2456
2457MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2458
2459PROTOTYPES: DISABLE
2460
2461DC::MixChunk
2462new (SV *class, DC::RW rwops)
2463 CODE:
2464 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2465 OUTPUT:
2466 RETVAL
2467
2468void
2249DESTROY (CFPlus::MixChunk self) 2469DESTROY (DC::MixChunk self)
2250 CODE: 2470 CODE:
2251 Mix_FreeChunk (self); 2471 Mix_FreeChunk (self);
2252 2472
2253int 2473int
2254volume (CFPlus::MixChunk self, int volume = -1) 2474volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2475 CODE:
2476 if (items > 1)
2477 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2478 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2479 OUTPUT:
2258 RETVAL 2480 RETVAL
2259 2481
2260int 2482DC::Channel
2261play (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)
2262 CODE: 2484 CODE:
2485{
2263 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 {
2493 Mix_UnregisterAllEffects (RETVAL);
2494 Mix_Volume (RETVAL, 128);
2495 }
2496}
2264 OUTPUT: 2497 OUTPUT:
2265 RETVAL 2498 RETVAL
2266 2499
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2500MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2501
2269int 2502int
2270volume (int volume = -1) 2503volume (int volume = -1)
2271 PROTOTYPE: ;$ 2504 PROTOTYPE: ;$
2272 CODE: 2505 CODE:
2506 if (items > 0)
2507 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2508 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2509 OUTPUT:
2275 RETVAL 2510 RETVAL
2276 2511
2512void
2513fade_out (int ms)
2514 CODE:
2515 Mix_FadeOutMusic (ms);
2516
2517void
2518halt ()
2519 CODE:
2520 Mix_HaltMusic ();
2521
2522DC::MixMusic
2523new (SV *class, DC::RW rwops)
2524 CODE:
2525 RETVAL = Mix_LoadMUS_RW (rwops);
2526 OUTPUT:
2527 RETVAL
2528
2529void
2530DESTROY (DC::MixMusic self)
2531 CODE:
2532 Mix_FreeMusic (self);
2533
2277int 2534int
2278fade_out (int ms)
2279 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms);
2281 OUTPUT:
2282 RETVAL
2283
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void
2292DESTROY (CFPlus::MixMusic self)
2293 CODE:
2294 Mix_FreeMusic (self);
2295
2296int
2297play (CFPlus::MixMusic self, int loops = -1) 2535play (DC::MixMusic self, int loops = -1)
2298 CODE: 2536 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2537 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2538 OUTPUT:
2301 RETVAL 2539 RETVAL
2302 2540
2303int 2541void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2542fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2543 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2544 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2545
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2546MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2547
2312PROTOTYPES: ENABLE 2548PROTOTYPES: ENABLE
2313 2549
2314BOOT: 2550BOOT:
2315{ 2551{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2552 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2553 static const struct {
2318 const char *name; 2554 const char *name;
2319 IV iv; 2555 IV iv;
2320 } *civ, const_iv[] = { 2556 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2557# define const_iv(name) { # name, (IV)name }
2356 const_iv (GL_INTENSITY), 2592 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2593 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2594 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2595 const_iv (GL_FLOAT),
2360 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),
2361 const_iv (GL_COMPILE), 2603 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 2604 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 2605 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 2606 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 2607 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2646 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 2647 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 2648 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 2649 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 2650 const_iv (GL_GENERATE_MIPMAP_HINT),
2651 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 2652 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 2653 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 2654 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 2655 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 2656 const_iv (GL_V3F),
2421 2664
2422 texture_av = newAV (); 2665 texture_av = newAV ();
2423 AvREAL_off (texture_av); 2666 AvREAL_off (texture_av);
2424} 2667}
2425 2668
2669void
2670disable_GL_EXT_blend_func_separate ()
2671 CODE:
2672 gl.BlendFuncSeparate = 0;
2673 gl.BlendFuncSeparateEXT = 0;
2674
2426char * 2675char *
2427gl_vendor () 2676gl_vendor ()
2428 CODE: 2677 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 2678 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 2679 OUTPUT:
2547 2796
2548void glTexCoord (float s, float t) 2797void glTexCoord (float s, float t)
2549 CODE: 2798 CODE:
2550 glTexCoord2f (s, t); 2799 glTexCoord2f (s, t);
2551 2800
2801void glRect (float x1, float y1, float x2, float y2)
2802 CODE:
2803 glRectf (x1, y1, x2, y2);
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
2552PROTOTYPES: ENABLE 2814PROTOTYPES: ENABLE
2553 2815
2554void glBegin (int mode) 2816void glBegin (int mode)
2555 2817
2556void glEnd () 2818void glEnd ()
2588void 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)
2589 CODE: 2851 CODE:
2590 if (gl.SeparableFilter2D) 2852 if (gl.SeparableFilter2D)
2591 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2853 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2592 2854
2593void 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)
2594 2856
2595void 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)
2596 2858
2597void glDrawPixels (int width, int height, int format, int type, char *pixels) 2859void glDrawPixels (int width, int height, int format, int type, char *pixels)
2598 2860
2624 2886
2625void glEndList () 2887void glEndList ()
2626 2888
2627void glCallList (int list) 2889void glCallList (int list)
2628 2890
2629MODULE = CFPlus PACKAGE = CFPlus::UI::Base 2891MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2630 2892
2631PROTOTYPES: DISABLE 2893PROTOTYPES: DISABLE
2632 2894
2633void 2895void
2634find_widget (SV *self, NV x, NV y) 2896find_widget (SV *self, NV x, NV y)
2638 XPUSHs (self); 2900 XPUSHs (self);
2639} 2901}
2640 2902
2641BOOT: 2903BOOT:
2642{ 2904{
2643 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 2905 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2644 2906
2645 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);
2646 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);
2647 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);
2648 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);
2649} 2911}
2650 2912
2651void 2913void
2652draw (SV *self) 2914draw (SV *self)
2653 CODE: 2915 CODE:
2657 NV x, y, w, h; 2919 NV x, y, w, h;
2658 SV *draw_x_sv = GvSV (draw_x_gv); 2920 SV *draw_x_sv = GvSV (draw_x_gv);
2659 SV *draw_y_sv = GvSV (draw_y_gv); 2921 SV *draw_y_sv = GvSV (draw_y_gv);
2660 SV *draw_w_sv = GvSV (draw_w_gv); 2922 SV *draw_w_sv = GvSV (draw_w_gv);
2661 SV *draw_h_sv = GvSV (draw_h_gv); 2923 SV *draw_h_sv = GvSV (draw_h_gv);
2662 SV *hover;
2663 double draw_x, draw_y, draw_w, draw_h; 2924 double draw_x, draw_y;
2664 2925
2665 if (!SvROK (self)) 2926 if (!SvROK (self))
2666 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 2927 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2667 2928
2668 hv = (HV *)SvRV (self); 2929 hv = (HV *)SvRV (self);
2669 2930
2670 if (SvTYPE (hv) != SVt_PVHV) 2931 if (SvTYPE (hv) != SVt_PVHV)
2671 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 2932 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2672 2933
2673 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.;
2674 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.;
2675 2936
2676 if (!h || !w) 2937 if (!h || !w)
2696 { 2957 {
2697 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 2958 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698 2959
2699 if (svp && SvTRUE (*svp)) 2960 if (svp && SvTRUE (*svp))
2700 { 2961 {
2701 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);
2702 glEnable (GL_BLEND); 2963 glEnable (GL_BLEND);
2703 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 2964 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704 glBegin (GL_QUADS); 2965 glBegin (GL_QUADS);
2705 glVertex2f (0, 0); 2966 glVertex2f (0, 0);
2706 glVertex2f (w, 0); 2967 glVertex2f (w, 0);
2709 glEnd (); 2970 glEnd ();
2710 glDisable (GL_BLEND); 2971 glDisable (GL_BLEND);
2711 } 2972 }
2712 } 2973 }
2713#if 0 2974#if 0
2714 if ($ENV{CFPLUS_DEBUG} & 1) { 2975 // draw borders, for debugging
2715 glPushMatrix; 2976 glPushMatrix ();
2716 glColor 1, 1, 0, 1; 2977 glColor4f (1., 1., 0., 1.);
2717 glTranslate 0.375, 0.375; 2978 glTranslatef (.5, .5, 0.);
2718 glBegin GL_LINE_LOOP; 2979 glBegin (GL_LINE_LOOP);
2719 glVertex 0 , 0; 2980 glVertex2f (0 , 0);
2720 glVertex $self->{w} - 1, 0; 2981 glVertex2f (w - 1, 0);
2721 glVertex $self->{w} - 1, $self->{h} - 1; 2982 glVertex2f (w - 1, h - 1);
2722 glVertex 0 , $self->{h} - 1; 2983 glVertex2f (0 , h - 1);
2723 glEnd; 2984 glEnd ();
2724 glPopMatrix; 2985 glPopMatrix ();
2725 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726 }
2727#endif 2986#endif
2728 PUSHMARK (SP); 2987 PUSHMARK (SP);
2729 XPUSHs (self); 2988 XPUSHs (self);
2730 PUTBACK; 2989 PUTBACK;
2731 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