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.223 by root, Sat Aug 11 11:07:08 2007 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
39#include <SDL_endian.h> 38#include <SDL_endian.h>
40#include <SDL_image.h> 39#include <SDL_image.h>
41#include <SDL_mixer.h> 40#include <SDL_mixer.h>
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
48#endif
49
44#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
46 52
47#include <glib/gmacros.h> 53#include <glib/gmacros.h>
48 54
49#include <pango/pango.h> 55#include <pango/pango.h>
56
57#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0
59#endif
60
61#if !PANGO_VERSION_CHECK (1, 15, 2)
62# define pango_layout_get_line_readonly pango_layout_get_line
63# define pango_layout_get_lines_readonly pango_layout_get_lines
64# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
65# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
66#endif
50 67
51#ifndef _WIN32 68#ifndef _WIN32
52# include <sys/types.h> 69# include <sys/types.h>
53# include <sys/socket.h> 70# include <sys/socket.h>
54# include <netinet/in.h> 71# include <netinet/in.h>
55# include <netinet/tcp.h> 72# include <netinet/tcp.h>
56# include <inttypes.h> 73# include <inttypes.h>
57#endif 74#endif
58 75
76#if __GNUC__ >= 4
77# define expect(expr,value) __builtin_expect ((expr),(value))
78#else
79# define expect(expr,value) (expr)
80#endif
81
82#define expect_false(expr) expect ((expr) != 0, 0)
83#define expect_true(expr) expect ((expr) != 0, 1)
84
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
61#define FOW_DARKNESS 32 89#define FOW_DARKNESS 50
90#define DARKNESS_ADJUST(n) (n)
62 91
63#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
65 94
66#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
67 96
68#if 0 97/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 98#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else 99
71# define PARACHUTE 0 100#define KMOD_LRAM 0x10000 // our extension
72#endif 101
102#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2
73 104
74static AV *texture_av; 105static AV *texture_av;
75 106
76static struct 107static struct
77{ 108{
120 151
121#include "pango-font.c" 152#include "pango-font.c"
122#include "pango-fontmap.c" 153#include "pango-fontmap.c"
123#include "pango-render.c" 154#include "pango-render.c"
124 155
125typedef IV CFPlus__Channel; 156typedef IV DC__Channel;
126typedef SDL_RWops *CFPlus__RW; 157typedef SDL_RWops *DC__RW;
127typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
128typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
129 160
130typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
131 162
132static int 163static int
133shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
134{ 165{
135 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
149 180
150typedef struct cf_layout { 181typedef struct cf_layout {
151 PangoLayout *pl; 182 PangoLayout *pl;
152 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
153 int base_height; 184 int base_height;
154 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
155} *CFPlus__Layout; 187} *DC__Layout;
156 188
157static CFPlus__Font default_font; 189static DC__Font default_font;
158static PangoContext *opengl_context; 190static PangoContext *opengl_context;
159static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
160 192
161static void 193static void
162substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
167#endif 199#endif
168 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
169} 201}
170 202
171static void 203static void
172layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
173{ 205{
174 /* use a random scale factor to account for unknown descenders, 0.8 works 206 /* use a random scale factor to account for unknown descenders, 0.8 works
175 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
176 */ 208 */
177 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
178 210
179 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
180 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
181 213
182 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
183} 215}
184 216
185static void 217static void
186layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
187{ 219{
188 PangoRectangle rect; 220 PangoRectangle rect;
189 221
190 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
191 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
202 234
203typedef uint16_t tileid; 235typedef uint16_t tileid;
204typedef uint16_t faceid; 236typedef uint16_t faceid;
205 237
206typedef struct { 238typedef struct {
207 int name; 239 GLuint name;
208 int w, h; 240 int w, h;
209 float s, t; 241 float s, t;
210 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
211 tileid smoothtile; 243 tileid smoothtile;
212 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
213} maptex; 246} maptex;
214 247
215typedef struct { 248typedef struct {
216 uint32_t player; 249 uint32_t player;
217 tileid tile[3]; 250 tileid tile[3];
230 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
231 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
232 265
233 int32_t rows; 266 int32_t rows;
234 maprow *row; 267 maprow *row;
235} *CFPlus__Map; 268} *DC__Map;
236 269
237static char * 270static char *
238prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
239{ 272{
240 char *p; 273 char *p;
278 self->texs *= 2; 311 self->texs *= 2;
279 } 312 }
280} 313}
281 314
282static maprow * 315static maprow *
283map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
284{ 317{
285 if (0 > y) 318 if (0 > y)
286 { 319 {
287 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
288 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
326 359
327 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
328} 361}
329 362
330static mapcell * 363static mapcell *
331map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
332{ 365{
333 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
334} 367}
335 368
336static void 369static void
337map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
338{ 371{
339 int r; 372 int r;
340 373
341 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
342 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
349 self->oy = 0; 382 self->oy = 0;
350 self->row = 0; 383 self->row = 0;
351 self->rows = 0; 384 self->rows = 0;
352} 385}
353 386
387#define CELL_CLEAR(cell) \
388 do { \
389 if ((cell)->player) \
390 (cell)->tile [2] = 0; \
391 (cell)->darkness = 0; \
392 (cell)->stat_hp = 0; \
393 (cell)->flags = 0; \
394 (cell)->player = 0; \
395 } while (0)
396
354static void 397static void
355map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 398map_blank (DC__Map self, int x0, int y0, int w, int h)
356{ 399{
357 int x, y; 400 int x, y;
358 maprow *row; 401 maprow *row;
359 mapcell *cell; 402 mapcell *cell;
360 403
372 if (x >= row->c1) 415 if (x >= row->c1)
373 break; 416 break;
374 417
375 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
376 419
377 cell->darkness = 0; 420 CELL_CLEAR (cell);
378 cell->stat_hp = 0;
379 cell->flags = 0;
380 cell->player = 0;
381 } 421 }
382 } 422 }
383} 423}
384 424
385typedef struct { 425typedef struct {
439 n |= n >> 16; 479 n |= n >> 16;
440 480
441 return n + 1; 481 return n + 1;
442} 482}
443 483
484static unsigned int
485popcount (unsigned int n)
486{
487 n -= (n >> 1) & 0x55555555U;
488 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
489 n = ((n >> 4) + n) & 0x0f0f0f0fU;
490 n *= 0x01010101U;
491
492 return n >> 24;
493}
494
444/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
445#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
446#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
447 498
448/******************************************************************************/ 499/******************************************************************************/
486 return 0; 537 return 0;
487 538
488 return 1; 539 return 1;
489} 540}
490 541
491MODULE = CFPlus PACKAGE = CFPlus 542/******************************************************************************/
543
544/* process keyboard modifiers */
545static int
546mod_munge (int mod)
547{
548 mod &= MOD_MASK;
549
550 if (mod & (KMOD_META | KMOD_ALT))
551 mod |= KMOD_LRAM;
552
553 return mod;
554}
555
556static void
557deliantra_main ()
558{
559 char *argv[] = { 0 };
560 call_argv ("::main", G_DISCARD | G_VOID, argv);
561}
562
563#ifdef __MACOSX__
564 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main()
566 * on OS X, so... we provide one and call the original main(), which,
567 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back.
569 */
570 extern C_LINKAGE int
571 main (int argc, char *argv[])
572 {
573 deliantra_main ();
574 }
575
576 #undef main
577
578 extern C_LINKAGE int main (int argc, char *argv[]);
579
580 static void
581 SDL_braino (void)
582 {
583 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv);
585 }
586#else
587 static void
588 SDL_braino (void)
589 {
590 deliantra_main ();
591 }
592#endif
593
594MODULE = Deliantra::Client PACKAGE = DC
492 595
493PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
494 597
495BOOT: 598BOOT:
496{ 599{
497 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
498 static const struct { 601 static const struct {
499 const char *name; 602 const char *name;
500 IV iv; 603 IV iv;
501 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
502# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
524 627
525 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
526 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
527 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
528 631
632
633 const_iv (SDLK_UNKNOWN),
634 const_iv (SDLK_FIRST),
635 const_iv (SDLK_BACKSPACE),
636 const_iv (SDLK_TAB),
637 const_iv (SDLK_CLEAR),
638 const_iv (SDLK_RETURN),
639 const_iv (SDLK_PAUSE),
640 const_iv (SDLK_ESCAPE),
641 const_iv (SDLK_SPACE),
642 const_iv (SDLK_EXCLAIM),
643 const_iv (SDLK_QUOTEDBL),
644 const_iv (SDLK_HASH),
645 const_iv (SDLK_DOLLAR),
646 const_iv (SDLK_AMPERSAND),
647 const_iv (SDLK_QUOTE),
648 const_iv (SDLK_LEFTPAREN),
649 const_iv (SDLK_RIGHTPAREN),
650 const_iv (SDLK_ASTERISK),
651 const_iv (SDLK_PLUS),
652 const_iv (SDLK_COMMA),
653 const_iv (SDLK_MINUS),
654 const_iv (SDLK_PERIOD),
655 const_iv (SDLK_SLASH),
656 const_iv (SDLK_0),
657 const_iv (SDLK_1),
658 const_iv (SDLK_2),
659 const_iv (SDLK_3),
660 const_iv (SDLK_4),
661 const_iv (SDLK_5),
662 const_iv (SDLK_6),
663 const_iv (SDLK_7),
664 const_iv (SDLK_8),
665 const_iv (SDLK_9),
666 const_iv (SDLK_COLON),
667 const_iv (SDLK_SEMICOLON),
668 const_iv (SDLK_LESS),
669 const_iv (SDLK_EQUALS),
670 const_iv (SDLK_GREATER),
671 const_iv (SDLK_QUESTION),
672 const_iv (SDLK_AT),
673
674 const_iv (SDLK_LEFTBRACKET),
675 const_iv (SDLK_BACKSLASH),
676 const_iv (SDLK_RIGHTBRACKET),
677 const_iv (SDLK_CARET),
678 const_iv (SDLK_UNDERSCORE),
679 const_iv (SDLK_BACKQUOTE),
680 const_iv (SDLK_DELETE),
681
682 const_iv (SDLK_FIRST),
683 const_iv (SDLK_LAST),
529 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
530 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
531 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
532 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
533 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
605 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
606 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
607 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
608 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
609 const_iv (KMOD_MODE), 764 const_iv (KMOD_MODE),
765
766 const_iv (KMOD_LRAM),
767
768 const_iv (MIX_DEFAULT_FORMAT),
769
770 const_iv (SDL_INIT_TIMER),
771 const_iv (SDL_INIT_AUDIO),
772 const_iv (SDL_INIT_VIDEO),
773 const_iv (SDL_INIT_CDROM),
774 const_iv (SDL_INIT_JOYSTICK),
775 const_iv (SDL_INIT_EVERYTHING),
776 const_iv (SDL_INIT_NOPARACHUTE),
777 const_iv (SDL_INIT_EVENTTHREAD),
778
779 const_iv (SDL_GL_RED_SIZE),
780 const_iv (SDL_GL_GREEN_SIZE),
781 const_iv (SDL_GL_BLUE_SIZE),
782 const_iv (SDL_GL_ALPHA_SIZE),
783 const_iv (SDL_GL_DOUBLEBUFFER),
784 const_iv (SDL_GL_BUFFER_SIZE),
785 const_iv (SDL_GL_DEPTH_SIZE),
786 const_iv (SDL_GL_STENCIL_SIZE),
787 const_iv (SDL_GL_ACCUM_RED_SIZE),
788 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
789 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
790 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
791 const_iv (SDL_GL_STEREO),
792 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
793 const_iv (SDL_GL_MULTISAMPLESAMPLES),
794 const_iv (SDL_GL_ACCELERATED_VISUAL),
795 const_iv (SDL_GL_SWAP_CONTROL),
796
797 const_iv (FOW_DARKNESS)
610# undef const_iv 798# undef const_iv
611 }; 799 };
612 800
613 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
614 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
632 820
633NV floor (NV x) 821NV floor (NV x)
634 822
635NV ceil (NV x) 823NV ceil (NV x)
636 824
825IV minpot (UV n)
826
827IV popcount (UV n)
828
829NV distance (NV dx, NV dy)
830 CODE:
831 RETVAL = pow (dx * dx + dy * dy, 0.5);
832 OUTPUT:
833 RETVAL
834
637void 835void
638pango_init () 836pango_init ()
639 CODE: 837 CODE:
640{ 838{
641 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
642 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 840 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
643 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 841 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
842 /*pango_context_set_font_description (opengl_context, default_font);*/
843#if PANGO_VERSION_CHECK (1, 15, 2)
844 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
845 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
846#endif
644} 847}
645 848
646char *
647SDL_GetError () 849char *SDL_GetError ()
648 850
649int 851void SDL_braino ()
650SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
651 852
652void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
653SDL_Quit () 859void SDL_Quit ()
860
861int SDL_GL_SetAttribute (int attr, int value)
862
863int SDL_GL_GetAttribute (int attr)
864 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL))
866 XSRETURN_UNDEF;
867 OUTPUT:
868 RETVAL
654 869
655void 870void
656SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
657 PPCODE: 872 PPCODE:
658{ 873{
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
672 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
673 888
674 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
675#if SDL_VERSION_ATLEAST(1,2,10)
676 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
677 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
678#endif
679 891
680 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
681 893
682 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
683 while (*m) 895 while (*m)
684 { 896 {
685 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
686 { 898 {
687 AV *av = newAV (); 899 AV *av = newAV ();
688 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
689 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
690 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
714 926
715 if (RETVAL) 927 if (RETVAL)
716 { 928 {
717 av_clear (texture_av); 929 av_clear (texture_av);
718 930
719 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
720#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 932#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
721#include "glfunc.h" 933#include "glfunc.h"
722#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
723 } 938 }
724} 939}
725 OUTPUT: 940 OUTPUT:
726 RETVAL 941 RETVAL
727 942
731char * 946char *
732SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
733 948
734int 949int
735SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
736 954
737void 955void
738poll_events () 956poll_events ()
739 PPCODE: 957 PPCODE:
740{ 958{
750 { 968 {
751 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
752 case SDL_KEYUP: 970 case SDL_KEYUP:
753 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
754 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
755 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 973 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
756 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 974 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
757 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
758 break; 976 break;
759 977
760 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
761 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
779 x = ev.motion.x; 997 x = ev.motion.x;
780 y = ev.motion.y; 998 y = ev.motion.y;
781 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
782 } 1000 }
783 1001
784 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
785 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
786 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
787 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
788 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
789 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
790 } 1008 }
791 break; 1009 break;
792 1010
793 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
794 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
795 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
796 1014
797 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
798 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
799 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
800 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
805 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
806 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
807 break; 1025 break;
808 } 1026 }
809 1027
810 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1028 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
811 } 1029 }
812} 1030}
813 1031
1032char *
1033SDL_AudioDriverName ()
1034 CODE:
1035{
1036 char buf [256];
1037 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1038 XSRETURN_UNDEF;
1039
1040 RETVAL = buf;
1041}
1042 OUTPUT:
1043 RETVAL
1044
814int 1045int
815Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
816 POSTCALL: 1047 POSTCALL:
817 Mix_HookMusicFinished (music_finished); 1048 Mix_HookMusicFinished (music_finished);
818 Mix_ChannelFinished (channel_finished); 1049 Mix_ChannelFinished (channel_finished);
1050
1051void
1052Mix_QuerySpec ()
1053 PPCODE:
1054{
1055 int freq, channels;
1056 Uint16 format;
1057
1058 if (Mix_QuerySpec (&freq, &format, &channels))
1059 {
1060 EXTEND (SP, 3);
1061 PUSHs (sv_2mortal (newSViv (freq)));
1062 PUSHs (sv_2mortal (newSViv (format)));
1063 PUSHs (sv_2mortal (newSViv (channels)));
1064 }
1065}
819 1066
820void 1067void
821Mix_CloseAudio () 1068Mix_CloseAudio ()
822 1069
823int 1070int
858 } 1105 }
859 } 1106 }
860#endif 1107#endif
861} 1108}
862 1109
863void 1110int
864add_font (char *file) 1111add_font (char *file)
865 CODE: 1112 CODE:
866 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT:
1115 RETVAL
1116
1117void
1118IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
867 1119
868void 1120void
869load_image_inline (SV *image_) 1121load_image_inline (SV *image_)
870 ALIAS: 1122 ALIAS:
871 load_image_file = 1 1123 load_image_file = 1
957void 1209void
958error (char *message) 1210error (char *message)
959 CODE: 1211 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1212 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1213#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1214 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1215#endif
964 1216
965void 1217void
966fatal (char *message) 1218fatal (char *message)
967 CODE: 1219 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1220 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1221#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1222 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1223#endif
972 _exit (1); 1224 _exit (1);
973 1225
974void 1226void
975_exit (int retval = 0) 1227_exit (int retval = 0)
987#if DEBUG 1239#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1240 VALGRIND_DO_LEAK_CHECK;
989#endif 1241#endif
990} 1242}
991 1243
992MODULE = CFPlus PACKAGE = CFPlus::Font 1244int
1245SvREFCNT (SV *sv)
1246 CODE:
1247 RETVAL = SvREFCNT (sv);
1248 OUTPUT:
1249 RETVAL
1250
1251MODULE = Deliantra::Client PACKAGE = DC::Font
993 1252
994PROTOTYPES: DISABLE 1253PROTOTYPES: DISABLE
995 1254
996CFPlus::Font 1255DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1256new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1257 CODE:
999{ 1258{
1000 int count; 1259 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1260 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1263}
1005 OUTPUT: 1264 OUTPUT:
1006 RETVAL 1265 RETVAL
1007 1266
1008void 1267void
1009DESTROY (CFPlus::Font self) 1268DESTROY (DC::Font self)
1010 CODE: 1269 CODE:
1011 pango_font_description_free (self); 1270 pango_font_description_free (self);
1012 1271
1013void 1272void
1014make_default (CFPlus::Font self) 1273make_default (DC::Font self)
1015 PROTOTYPE: $ 1274 PROTOTYPE: $
1016 CODE: 1275 CODE:
1017 default_font = self; 1276 default_font = self;
1018 1277
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1278MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1279
1021PROTOTYPES: DISABLE 1280PROTOTYPES: DISABLE
1022 1281
1023void 1282void
1024reset_glyph_cache () 1283glyph_cache_backup ()
1025 PROTOTYPE: 1284 PROTOTYPE:
1026 CODE: 1285 CODE:
1286 tc_backup ();
1287
1288void
1289glyph_cache_restore ()
1290 PROTOTYPE:
1291 CODE:
1027 tc_clear (); 1292 tc_restore ();
1028 1293
1029CFPlus::Layout 1294DC::Layout
1030new (SV *class) 1295new (SV *class)
1031 CODE: 1296 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1297 New (0, RETVAL, 1, struct cf_layout);
1033 1298
1034 RETVAL->pl = pango_layout_new (opengl_context); 1299 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1301 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1302 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1303 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1304 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1305 RETVAL->font = 0;
1306 RETVAL->rc = rc_alloc ();
1041 1307
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1308 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1309 layout_update_font (RETVAL);
1044 OUTPUT: 1310 OUTPUT:
1045 RETVAL 1311 RETVAL
1046 1312
1047void 1313void
1048DESTROY (CFPlus::Layout self) 1314DESTROY (DC::Layout self)
1049 CODE: 1315 CODE:
1050 g_object_unref (self->pl); 1316 g_object_unref (self->pl);
1317 rc_free (self->rc);
1051 Safefree (self); 1318 Safefree (self);
1052 1319
1053void 1320void
1054set_text (CFPlus::Layout self, SV *text_) 1321set_text (DC::Layout self, SV *text_)
1055 CODE: 1322 CODE:
1056{ 1323{
1057 STRLEN textlen; 1324 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1325 char *text = SvPVutf8 (text_, textlen);
1059 1326
1060 pango_layout_set_text (self->pl, text, textlen); 1327 pango_layout_set_text (self->pl, text, textlen);
1061} 1328}
1062 1329
1063void 1330void
1064set_markup (CFPlus::Layout self, SV *text_) 1331set_markup (DC::Layout self, SV *text_)
1065 CODE: 1332 CODE:
1066{ 1333{
1067 STRLEN textlen; 1334 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1335 char *text = SvPVutf8 (text_, textlen);
1069 1336
1070 pango_layout_set_markup (self->pl, text, textlen); 1337 pango_layout_set_markup (self->pl, text, textlen);
1071} 1338}
1072 1339
1073void 1340void
1074set_shapes (CFPlus::Layout self, ...) 1341set_shapes (DC::Layout self, ...)
1075 CODE: 1342 CODE:
1076{ 1343{
1077 PangoAttrList *attrs = 0; 1344 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1345 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1346 const char *pos = text;
1114 if (attrs) 1381 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1382 pango_layout_set_attributes (self->pl, attrs);
1116} 1383}
1117 1384
1118void 1385void
1119get_shapes (CFPlus::Layout self) 1386get_shapes (DC::Layout self)
1120 PPCODE: 1387 PPCODE:
1121{ 1388{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1389 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1390
1124 do 1391 do
1125 { 1392 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1393 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1394
1128 if (run && shape_attr_p (run)) 1395 if (run && shape_attr_p (run))
1129 { 1396 {
1130 PangoRectangle extents; 1397 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1398 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1406
1140 pango_layout_iter_free (iter); 1407 pango_layout_iter_free (iter);
1141} 1408}
1142 1409
1143int 1410int
1144has_wrapped (CFPlus::Layout self) 1411has_wrapped (DC::Layout self)
1145 CODE: 1412 CODE:
1146{ 1413{
1147 int lines = 1; 1414 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1415 const char *text = pango_layout_get_text (self->pl);
1149 1416
1154} 1421}
1155 OUTPUT: 1422 OUTPUT:
1156 RETVAL 1423 RETVAL
1157 1424
1158SV * 1425SV *
1159get_text (CFPlus::Layout self) 1426get_text (DC::Layout self)
1160 CODE: 1427 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1428 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1429 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1430 OUTPUT:
1164 RETVAL 1431 RETVAL
1165 1432
1166void 1433void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1434set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1435 CODE:
1169 self->r = r; 1436 self->r = r;
1170 self->g = g; 1437 self->g = g;
1171 self->b = b; 1438 self->b = b;
1172 self->a = a; 1439 self->a = a;
1173 1440
1174void 1441void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1442set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1443 CODE:
1177 if (self->font != font) 1444 if (self->font != font)
1178 { 1445 {
1179 self->font = font; 1446 self->font = font;
1180 layout_update_font (self); 1447 layout_update_font (self);
1181 } 1448 }
1182 1449
1183void 1450void
1184set_height (CFPlus::Layout self, int base_height) 1451set_height (DC::Layout self, int base_height)
1185 CODE: 1452 CODE:
1186 if (self->base_height != base_height) 1453 if (self->base_height != base_height)
1187 { 1454 {
1188 self->base_height = base_height; 1455 self->base_height = base_height;
1189 layout_update_font (self); 1456 layout_update_font (self);
1190 } 1457 }
1191 1458
1192void 1459void
1193set_width (CFPlus::Layout self, int max_width = -1) 1460set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1461 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1462 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1463
1197void 1464void
1198set_indent (CFPlus::Layout self, int indent) 1465set_indent (DC::Layout self, int indent)
1199 CODE: 1466 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1467 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1468
1202void 1469void
1203set_spacing (CFPlus::Layout self, int spacing) 1470set_spacing (DC::Layout self, int spacing)
1204 CODE: 1471 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1472 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1473
1207void 1474void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1475set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1476 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1477 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1478 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1479 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1480 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1481 : PANGO_ELLIPSIZE_NONE
1215 ); 1482 );
1216 1483
1217void 1484void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1485set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1486 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1487 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1488
1222void 1489void
1223size (CFPlus::Layout self) 1490size (DC::Layout self)
1224 PPCODE: 1491 PPCODE:
1225{ 1492{
1226 int w, h; 1493 int w, h;
1227 1494
1228 layout_get_pixel_size (self, &w, &h); 1495 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1498 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1499 PUSHs (sv_2mortal (newSViv (h)));
1233} 1500}
1234 1501
1235int 1502int
1236descent (CFPlus::Layout self) 1503descent (DC::Layout self)
1237 CODE: 1504 CODE:
1238{ 1505{
1239 PangoRectangle rect; 1506 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1507 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1508 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1509 RETVAL = PANGO_DESCENT (rect);
1243} 1510}
1244 OUTPUT: 1511 OUTPUT:
1245 RETVAL 1512 RETVAL
1246 1513
1247int 1514int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1515xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1516 CODE:
1250{ 1517{
1251 int index, trailing; 1518 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1519 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1520 RETVAL = index + trailing;
1254} 1521}
1255 OUTPUT: 1522 OUTPUT:
1256 RETVAL 1523 RETVAL
1257 1524
1258void 1525void
1259cursor_pos (CFPlus::Layout self, int index) 1526cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1527 PPCODE:
1261{ 1528{
1262 PangoRectangle strong_pos; 1529 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1530 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1531
1265 EXTEND (SP, 3); 1532 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1533 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1534 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1536}
1270 1537
1271void 1538void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1539index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1540 PPCODE:
1274{ 1541{
1275 int line, x; 1542 int line, x;
1276 1543
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1544 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1545#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1546 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1547 --line;
1548#endif
1280 EXTEND (SP, 2); 1549 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1550 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1551 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1552}
1284 1553
1285void 1554void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1555line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1556 PPCODE:
1288{ 1557{
1289 PangoLayoutLine *lp; 1558 PangoLayoutLine *lp;
1290 int index, trailing; 1559 int index, trailing;
1291 1560
1292 if (line < 0) 1561 if (line < 0)
1293 XSRETURN_EMPTY; 1562 XSRETURN_EMPTY;
1294 1563
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1564 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1565 XSRETURN_EMPTY; /* do better */
1297 1566
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1567 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1568
1300 EXTEND (SP, 2); 1569 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1575 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1576 }
1308} 1577}
1309 1578
1310void 1579void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1580render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1581 CODE:
1582 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1583 pango_opengl_render_layout_subpixel (
1314 self->pl, 1584 self->pl,
1585 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1586 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1587 self->r, self->g, self->b, self->a,
1317 flags 1588 flags
1318 ); 1589 );
1590 // we assume that context_change actually clears/frees stuff
1591 // and does not do any recomputation...
1592 pango_layout_context_changed (self->pl);
1319 1593
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1594void
1595draw (DC::Layout self)
1596 CODE:
1597{
1598 glEnable (GL_TEXTURE_2D);
1599 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1600 glEnable (GL_BLEND);
1601 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1602 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1603 glEnable (GL_ALPHA_TEST);
1604 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1605
1606 rc_draw (self->rc);
1607
1608 glDisable (GL_ALPHA_TEST);
1609 glDisable (GL_BLEND);
1610 glDisable (GL_TEXTURE_2D);
1611}
1612
1613MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1614
1322PROTOTYPES: ENABLE 1615PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1616
1326void 1617void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1618pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1619 CODE:
1329{ 1620{
1395 glDisable (GL_ALPHA_TEST); 1686 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1687 glDisable (GL_BLEND);
1397 } 1688 }
1398} 1689}
1399 1690
1691void
1692draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1693 PROTOTYPE: @
1694 CODE:
1695{
1696 glEnable (GL_BLEND);
1697 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1698 glEnable (GL_TEXTURE_2D);
1699 glBindTexture (GL_TEXTURE_2D, name1);
1700
1701 glColor3f (intensity, intensity, intensity);
1702 glPushMatrix ();
1703 glScalef (1./3, 1./3, 1.);
1704
1705 if (blend > 0.f)
1706 {
1707 float dx3 = dx * -3.f / w;
1708 float dy3 = dy * -3.f / h;
1709 GLfloat env_color[4] = { 0., 0., 0., blend };
1710
1711 /* interpolate the two shadow textures */
1712 /* stage 0 == rgb(glcolor) + alpha(t0) */
1713 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1714
1715 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1716 gl.ActiveTexture (GL_TEXTURE1);
1717 glEnable (GL_TEXTURE_2D);
1718 glBindTexture (GL_TEXTURE_2D, name2);
1719 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1720
1721 /* rgb == rgb(glcolor) */
1722 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1723 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1724 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1725
1726 /* alpha = interpolate t0, t1 by env_alpha */
1727 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1728
1729 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1735
1736 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1737 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1738
1739 glBegin (GL_QUADS);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1741 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1742 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1743 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1744 glEnd ();
1745
1746 glDisable (GL_TEXTURE_2D);
1747 gl.ActiveTexture (GL_TEXTURE0);
1748 }
1749 else
1750 {
1751 /* simple blending of one texture, also opengl <1.3 path */
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1753
1754 glBegin (GL_QUADS);
1755 glTexCoord2f (0, 0); glVertex2f (0, 0);
1756 glTexCoord2f (0, t); glVertex2f (0, h);
1757 glTexCoord2f (s, t); glVertex2f (w, h);
1758 glTexCoord2f (s, 0); glVertex2f (w, 0);
1759 glEnd ();
1760 }
1761
1762 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1763 {
1764 int x, y;
1765 int dx3 = dx * 3;
1766 int dy3 = dy * 3;
1767
1768 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1769 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1770 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1771 glTranslatef (-1., -1., 0);
1772 glBegin (GL_QUADS);
1773
1774 for (y = 1; y < h; y += 3)
1775 {
1776 int y1 = y - dy3;
1777 int y1valid = y1 >= 0 && y1 < h;
1778
1779 for (x = 1; x < w; x += 3)
1780 {
1781 int x1 = x - dx3;
1782 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1783 uint8_t h2;
1784
1785 if (y1valid && x1 >= 0 && x1 < w)
1786 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1787 else
1788 h2 = 1; /* out of range == invisible */
1789
1790 if (h1 || h2)
1791 {
1792 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1793 glColor4f (1., 1., 1., alpha);
1794
1795 glTexCoord2f (0, 0.); glVertex2i (x , y );
1796 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1797 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1798 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1799 }
1800 }
1801 }
1802 }
1803
1804 glEnd ();
1805
1806 glPopMatrix ();
1807
1808 glDisable (GL_TEXTURE_2D);
1809 glDisable (GL_BLEND);
1810}
1811
1400IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1812IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1401 CODE: 1813 CODE:
1402{ 1814{
1403 GLint width; 1815 GLint width;
1404 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1816 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1406 RETVAL = width > 0; 1818 RETVAL = width > 0;
1407} 1819}
1408 OUTPUT: 1820 OUTPUT:
1409 RETVAL 1821 RETVAL
1410 1822
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1823MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1824
1413PROTOTYPES: DISABLE 1825PROTOTYPES: DISABLE
1414 1826
1415CFPlus::Map 1827DC::Map
1416new (SV *class) 1828new (SV *class)
1417 CODE: 1829 CODE:
1418 New (0, RETVAL, 1, struct map); 1830 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1831 RETVAL->x = 0;
1420 RETVAL->y = 0; 1832 RETVAL->y = 0;
1428 RETVAL->row = 0; 1840 RETVAL->row = 0;
1429 OUTPUT: 1841 OUTPUT:
1430 RETVAL 1842 RETVAL
1431 1843
1432void 1844void
1433DESTROY (CFPlus::Map self) 1845DESTROY (DC::Map self)
1434 CODE: 1846 CODE:
1435{ 1847{
1436 map_clear (self); 1848 map_clear (self);
1437 Safefree (self->face2tile); 1849 Safefree (self->face2tile);
1438 Safefree (self->tex); 1850 Safefree (self->tex);
1439 Safefree (self); 1851 Safefree (self);
1440} 1852}
1441 1853
1442void 1854void
1443resize (CFPlus::Map self, int map_width, int map_height) 1855resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1856 CODE:
1445 self->w = map_width; 1857 self->w = map_width;
1446 self->h = map_height; 1858 self->h = map_height;
1447 1859
1448void 1860void
1449clear (CFPlus::Map self) 1861clear (DC::Map self)
1450 CODE: 1862 CODE:
1451 map_clear (self); 1863 map_clear (self);
1452 1864
1453void 1865void
1454set_tileid (CFPlus::Map self, int face, int tile) 1866set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1867 CODE:
1456{ 1868{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1869 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1870 need_texid (self, tile);
1459} 1871}
1460 1872
1461void 1873void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1874set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1875 CODE:
1464{ 1876{
1465 tileid texid; 1877 tileid texid;
1466 maptex *tex; 1878 maptex *tex;
1467 1879
1480 tex->smoothtile = self->face2tile [smooth]; 1892 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1893 tex->smoothlevel = level;
1482} 1894}
1483 1895
1484void 1896void
1485set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1897set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1486 CODE: 1898 CODE:
1487{ 1899{
1488 need_texid (self, texid); 1900 need_texid (self, texid);
1489 1901
1490 { 1902 {
1509 // use uglier nearest interpolation because linear suffers 1921 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1922 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1923 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1924}
1513 1925
1926void
1927expire_textures (DC::Map self, int texid, int count)
1928 PPCODE:
1929 for (; texid < self->texs && count; ++texid, --count)
1930 {
1931 maptex *tex = self->tex + texid;
1932
1933 if (tex->name)
1934 {
1935 if (tex->unused)
1936 {
1937 tex->name = 0;
1938 tex->unused = 0;
1939 XPUSHs (sv_2mortal (newSViv (texid)));
1940 }
1941 else
1942 tex->unused = 1;
1943 }
1944 }
1945
1514int 1946int
1515ox (CFPlus::Map self) 1947ox (DC::Map self)
1516 ALIAS: 1948 ALIAS:
1517 oy = 1 1949 oy = 1
1518 x = 2 1950 x = 2
1519 y = 3 1951 y = 3
1520 w = 4 1952 w = 4
1531 } 1963 }
1532 OUTPUT: 1964 OUTPUT:
1533 RETVAL 1965 RETVAL
1534 1966
1535void 1967void
1536scroll (CFPlus::Map self, int dx, int dy) 1968scroll (DC::Map self, int dx, int dy)
1537 CODE: 1969 CODE:
1538{ 1970{
1539 if (dx > 0) 1971 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1972 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1973 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1989 self->y += MAP_EXTEND_Y;
1558 } 1990 }
1559} 1991}
1560 1992
1561SV * 1993SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1994map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1995 CODE:
1564{ 1996{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1997 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1998 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1999 mapcell *cell;
1595 uint8_t ext, cmd; 2027 uint8_t ext, cmd;
1596 2028
1597 do 2029 do
1598 { 2030 {
1599 ext = *data++; 2031 ext = *data++;
1600 cmd = ext & 0x3f; 2032 cmd = ext & 0x7f;
1601 2033
1602 if (cmd < 4) 2034 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 2035 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1604 else if (cmd == 5) // health 2036 else if (cmd == 5) // health
1605 { 2037 {
1606 cell->stat_width = 1; 2038 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2039 cell->stat_hp = *data++;
1608 } 2040 }
1609 else if (cmd == 6) // monster width 2041 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 2042 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 2043 else if (cmd == 0x47)
1612 { 2044 {
1613 if (*data == 4) 2045 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 2046 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2047 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2048 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 2049
1616 data += *data + 1; 2050 data += *data + 1;
1617 } 2051 }
1618 else if (cmd == 8) // cell flags 2052 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 2053 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 2070 cell->tile [z] = self->face2tile [face];
1637 2071
1638 if (cell->tile [z]) 2072 if (cell->tile [z])
1639 { 2073 {
1640 maptex *tex = self->tex + cell->tile [z]; 2074 maptex *tex = self->tex + cell->tile [z];
2075 tex->unused = 0;
1641 if (!tex->name) 2076 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2077 av_push (missing, newSViv (cell->tile [z]));
1643 2078
1644 if (tex->smoothtile) 2079 if (tex->smoothtile)
1645 { 2080 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2081 maptex *smooth = self->tex + tex->smoothtile;
2082 smooth->unused = 0;
1647 if (!smooth->name) 2083 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2084 av_push (missing, newSViv (tex->smoothtile));
1649 } 2085 }
1650 } 2086 }
1651 } 2087 }
1652 } 2088 }
1653 else 2089 else
1654 cell->darkness = 0; 2090 CELL_CLEAR (cell);
1655 } 2091 }
1656} 2092}
1657 OUTPUT: 2093 OUTPUT:
1658 RETVAL 2094 RETVAL
1659 2095
1660SV * 2096SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2097mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2098 CODE:
1663{ 2099{
1664 int x1, x; 2100 int x1, x;
1665 int y1, y; 2101 int y1, y;
1666 int z; 2102 int z;
1711} 2147}
1712 OUTPUT: 2148 OUTPUT:
1713 RETVAL 2149 RETVAL
1714 2150
1715void 2151void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2152draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 2153 CODE:
1718{ 2154{
1719 int x, y, z; 2155 int x, y, z;
1720 2156
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2157 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2158 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1723 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2159 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2160 smooth_key skey;
1725 2161 int pl_x, pl_y;
2162 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2163 rc_t *rc = rc_alloc ();
2164 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2165 rc_key_t key;
1728 rc_array_t *arr; 2166 rc_array_t *arr;
1729 2167
2168 pl_tex.name = 0;
2169
1730 // thats current max. sorry. 2170 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2171 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2172 if (sh > 255) sh = 255;
1733 2173
1734 // clear key, in case of extra padding 2174 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2175 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2179 key.g = 255;
1740 key.b = 255; 2180 key.b = 255;
1741 key.a = 255; 2181 key.a = 255;
1742 key.mode = GL_QUADS; 2182 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2183 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2184
1746 mx += self->x; 2185 mx += self->x;
1747 my += self->y; 2186 my += self->y;
1748 2187
1749 // first pass: determine smooth_max 2188 // first pass: determine smooth_max
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2212 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2213
1775 for (z = 0; z <= 2; z++) 2214 for (z = 0; z <= 2; z++)
1776 { 2215 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2216 memset (smooth_level, 0, sizeof (smooth_level));
2217 key.texname = -1;
1778 2218
1779 for (y = 0; y < sh; y++) 2219 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2220 if (0 <= y + my && y + my < self->rows)
1781 { 2221 {
1782 maprow *row = self->row + (y + my); 2222 maprow *row = self->row + (y + my);
1790 if (tile) 2230 if (tile)
1791 { 2231 {
1792 maptex tex = self->tex [tile]; 2232 maptex tex = self->tex [tile];
1793 int px, py; 2233 int px, py;
1794 2234
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2235 if (key.texname != tex.name)
1798 { 2236 {
2237 self->tex [tile].unused = 0;
2238
1799 if (!tex.name) 2239 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2240 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2241
1802 key.texname = tex.name; 2242 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2243 arr = rc_array (rc, &key);
1804 } 2244 }
1805 2245
1806 px = (x + 1) * T - tex.w; 2246 px = (x + 1) * T - tex.w;
1807 py = (y + 1) * T - tex.h; 2247 py = (y + 1) * T - tex.h;
2248
2249 if (expect_false (cell->player == player) && expect_false (z == 2))
2250 {
2251 pl_x = px;
2252 pl_y = py;
2253 pl_tex = tex;
2254 continue;
2255 }
1808 2256
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2257 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2258 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1811 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2259 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1812 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2260 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1813
1814 if (cell->flags && z == 2)
1815 {
1816 // overlays such as the speech bubble, probably more to come
1817 if (cell->flags & 1)
1818 {
1819 maptex tex = self->tex [1];
1820 int px = x * T + T * 2 / 32;
1821 int py = y * T - T * 6 / 32;
1822
1823 if (tex.name)
1824 {
1825 if (key.texname != tex.name)
1826 {
1827 key.texname = tex.name;
1828 arr = rc_array (rc, &key);
1829 }
1830
1831 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1832 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1833 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1834 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1835 }
1836 }
1837 }
1838 2261
1839 // update smooth hash 2262 // update smooth hash
1840 if (tex.smoothtile) 2263 if (tex.smoothtile)
1841 { 2264 {
1842 skey.tile = tex.smoothtile; 2265 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2296 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1874 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2297 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1875 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2298 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2299 }
1877 } 2300 }
2301
2302 if (expect_false (z == 2) && expect_false (cell->flags))
2303 {
2304 // overlays such as the speech bubble, probably more to come
2305 if (cell->flags & 1)
2306 {
2307 rc_key_t key_ov = key;
2308 maptex tex = self->tex [TEXID_SPEECH];
2309 rc_array_t *arr;
2310 int px = x * T + T * 2 / 32;
2311 int py = y * T - T * 6 / 32;
2312
2313 key_ov.texname = tex.name;
2314 arr = rc_array (rc_ov, &key_ov);
2315
2316 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2317 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2318 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2319 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2320 }
2321 }
1878 } 2322 }
1879 } 2323 }
2324
2325 rc_draw (rc);
2326 rc_clear (rc);
1880 2327
1881 // go through all smoothlevels, lowest to highest, then draw. 2328 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2329 // this is basically counting sort
1883 { 2330 {
1884 int w, b; 2331 int w, b;
1885 2332
2333 glEnable (GL_TEXTURE_2D);
2334 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2335 for (w = 0; w < 256 / 32; ++w)
1887 { 2336 {
1888 uint32_t smask = smooth_level [w]; 2337 uint32_t smask = smooth_level [w];
1889 if (smask) 2338 if (smask)
1890 for (b = 0; b < 32; ++b) 2339 for (b = 0; b < 32; ++b)
1915 { 2364 {
1916 // this time avoiding texture state changes 2365 // this time avoiding texture state changes
1917 // save gobs of state changes. 2366 // save gobs of state changes.
1918 if (key.texname != tex.name) 2367 if (key.texname != tex.name)
1919 { 2368 {
2369 self->tex [skey->tile].unused = 0;
2370
2371 glEnd ();
1920 key.texname = tex.name; 2372 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2373 glBegin (GL_QUADS);
1922 } 2374 }
1923 2375
1924 if (border) 2376 if (border)
1925 { 2377 {
1926 float ox = border * dx; 2378 float ox = border * dx;
1927 2379
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2380 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2381 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2382 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2383 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2384 }
1933 2385
1934 if (corner) 2386 if (corner)
1935 { 2387 {
1936 float ox = corner * dx; 2388 float ox = corner * dx;
1937 2389
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2390 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2391 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2392 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2393 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2394 }
1943 } 2395 }
1944 } 2396 }
1945 } 2397 }
1946 } 2398 }
1947 } 2399 }
2400
2401 glEnd ();
2402 glDisable (GL_TEXTURE_2D);
2403 key.texname = -1;
1948 } 2404 }
1949 2405
1950 hv_clear (smooth); 2406 hv_clear (smooth);
2407 }
2408
2409 if (pl_tex.name)
2410 {
2411 maptex tex = pl_tex;
2412 int px = pl_x + sdx;
2413 int py = pl_y + sdy;
2414
2415 key.texname = tex.name;
2416 arr = rc_array (rc, &key);
2417
2418 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2419 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2420 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2421 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2422
1951 rc_draw (rc); 2423 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2424 }
2425
2426 rc_draw (rc_ov);
2427 rc_clear (rc_ov);
1954 2428
1955 glDisable (GL_BLEND); 2429 glDisable (GL_BLEND);
1956 rc_free (rc); 2430 rc_free (rc);
2431 rc_free (rc_ov);
1957 2432
1958 // top layer: overlays such as the health bar 2433 // top layer: overlays such as the health bar
1959 for (y = 0; y < sh; y++) 2434 for (y = 0; y < sh; y++)
1960 if (0 <= y + my && y + my < self->rows) 2435 if (0 <= y + my && y + my < self->rows)
1961 { 2436 {
1966 { 2441 {
1967 mapcell *cell = row->col + (x + mx - row->c0); 2442 mapcell *cell = row->col + (x + mx - row->c0);
1968 2443
1969 int px = x * T; 2444 int px = x * T;
1970 int py = y * T; 2445 int py = y * T;
2446
2447 if (expect_false (cell->player == player))
2448 {
2449 px += sdx;
2450 py += sdy;
2451 }
1971 2452
1972 if (cell->stat_hp) 2453 if (cell->stat_hp)
1973 { 2454 {
1974 int width = cell->stat_width * T; 2455 int width = cell->stat_width * T;
1975 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2456 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1986 } 2467 }
1987 } 2468 }
1988} 2469}
1989 2470
1990void 2471void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2472draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1992 CODE: 2473 CODE:
1993{ 2474{
1994 static float color[16][3] = { 2475 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2476 { 0.00f, 0.00f, 0.00f },
1996 { 1.00F, 1.00F, 1.00F }, 2477 { 1.00f, 1.00f, 1.00f },
1997 { 0.00F, 0.00F, 0.55F }, 2478 { 0.00f, 0.00f, 0.55f },
1998 { 1.00F, 0.00F, 0.00F }, 2479 { 1.00f, 0.00f, 0.00f },
1999 2480
2000 { 1.00F, 0.54F, 0.00F }, 2481 { 1.00f, 0.54f, 0.00f },
2001 { 0.11F, 0.56F, 1.00F }, 2482 { 0.11f, 0.56f, 1.00f },
2002 { 0.93F, 0.46F, 0.00F }, 2483 { 0.93f, 0.46f, 0.00f },
2003 { 0.18F, 0.54F, 0.34F }, 2484 { 0.18f, 0.54f, 0.34f },
2004 2485
2005 { 0.56F, 0.73F, 0.56F }, 2486 { 0.56f, 0.73f, 0.56f },
2006 { 0.80F, 0.80F, 0.80F }, 2487 { 0.80f, 0.80f, 0.80f },
2007 { 0.55F, 0.41F, 0.13F }, 2488 { 0.55f, 0.41f, 0.13f },
2008 { 0.99F, 0.77F, 0.26F }, 2489 { 0.99f, 0.77f, 0.26f },
2009 2490
2010 { 0.74F, 0.65F, 0.41F }, 2491 { 0.74f, 0.65f, 0.41f },
2011 2492
2012 { 0.00F, 1.00F, 1.00F }, 2493 { 0.00f, 1.00f, 1.00f },
2013 { 1.00F, 0.00F, 1.00F }, 2494 { 1.00f, 0.00f, 1.00f },
2014 { 1.00F, 1.00F, 0.00F }, 2495 { 1.00f, 1.00f, 0.00f },
2015 }; 2496 };
2016 2497
2017 int x, y; 2498 int x, y;
2018 2499
2019 glEnable (GL_TEXTURE_2D); 2500 glEnable (GL_TEXTURE_2D);
2501 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2502 * but the nvidia driver (185.18.14) mishandles alpha textures
2503 * and takes the colour from god knows where instead of using
2504 * Cp. MODULATE results in the same colour, but slightly different
2505 * alpha, but atcually gives us the correct colour with nvidia.
2506 */
2020 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2021 glEnable (GL_BLEND); 2508 glEnable (GL_BLEND);
2022 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2509 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2023 glBegin (GL_QUADS); 2510 glBegin (GL_QUADS);
2024 2511
2025 for (y = 0; y < h; y++) 2512 for (y = 0; y < h; y++)
2029 2516
2030 if (m) 2517 if (m)
2031 { 2518 {
2032 float *c = color [m & 15]; 2519 float *c = color [m & 15];
2033 2520
2034 float tx1 = m & 0x40 ? 0.5 : 0.; 2521 float tx1 = m & 0x40 ? 0.5f : 0.f;
2035 float tx2 = tx1 + 0.5; 2522 float tx2 = tx1 + 0.5f;
2036 2523
2037 glColor4f (c[0], c[1], c[2], 0.75); 2524 glColor4f (c[0], c[1], c[2], 1);
2038 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2525 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2039 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2526 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2040 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2527 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2041 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2528 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2042 } 2529 }
2046 glDisable (GL_BLEND); 2533 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2534 glDisable (GL_TEXTURE_2D);
2048} 2535}
2049 2536
2050void 2537void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2538fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2539 PPCODE:
2053{ 2540{
2054 int x, y; 2541 int x, y;
2055 int sw1 = sw + 2; 2542 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2543 int sh1 = sh + 2;
2057 int sh3 = sh * 3; 2544 int sh3 = sh * 3;
2058 int sw34 = (sw * 3 + 3) & ~3; 2545 int sw3 = sw * 3;
2059 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2546 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2060 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2547 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2061 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2548 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 2549
2063 SvPOK_only (darkness3_sv); 2550 SvPOK_only (darkness3_sv);
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2551 SvCUR_set (darkness3_sv, sw3 * sh3);
2065 2552
2066 mx += self->x - 1; 2553 mx += self->x - 1;
2067 my += self->y - 1; 2554 my += self->y - 1;
2068
2069 memset (darkness1, 255, sw1 * sh1);
2070 2555
2071 for (y = 0; y < sh1; y++) 2556 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2557 if (0 <= y + my && y + my < self->rows)
2073 { 2558 {
2074 maprow *row = self->row + (y + my); 2559 maprow *row = self->row + (y + my);
2077 if (row->c0 <= x + mx && x + mx < row->c1) 2562 if (row->c0 <= x + mx && x + mx < row->c1)
2078 { 2563 {
2079 mapcell *cell = row->col + (x + mx - row->c0); 2564 mapcell *cell = row->col + (x + mx - row->c0);
2080 2565
2081 darkness1 [y * sw1 + x] = cell->darkness 2566 darkness1 [y * sw1 + x] = cell->darkness
2082 ? 255 - (cell->darkness - 1) 2567 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2083 : 255 - FOW_DARKNESS; 2568 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2084 } 2569 }
2085 } 2570 }
2086 2571
2087 for (y = 0; y < sh; ++y) 2572 for (y = 0; y < sh; ++y)
2088 for (x = 0; x < sw; ++x) 2573 for (x = 0; x < sw; ++x)
2107 2592
2108 uint8_t r13 = (d13 + d23 + d12) / 3; 2593 uint8_t r13 = (d13 + d23 + d12) / 3;
2109 uint8_t r23 = d23; 2594 uint8_t r23 = d23;
2110 uint8_t r33 = (d23 + d33 + d32) / 3; 2595 uint8_t r33 = (d23 + d33 + d32) / 3;
2111 2596
2112 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2597 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2113 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2598 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2114 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2599 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2115 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2600 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2116 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2601 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2117 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2602 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2118 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2603 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2119 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2604 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2120 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2605 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2121 } 2606 }
2122 2607
2123 free (darkness1); 2608 free (darkness1);
2124 2609
2125 EXTEND (SP, 3); 2610 EXTEND (SP, 3);
2126 PUSHs (sv_2mortal (newSViv (sw34))); 2611 PUSHs (sv_2mortal (newSViv (sw3)));
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2612 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2613 PUSHs (darkness3_sv);
2129} 2614}
2130 2615
2131SV * 2616SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2617get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2618 CODE:
2134{ 2619{
2135 int x, y, x1, y1; 2620 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2621 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2622 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2679 else
2195 *data++ = 0; 2680 *data++ = 0;
2196 } 2681 }
2197 } 2682 }
2198 2683
2684 /* if size is w*h + 5 then no data has been found */
2685 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2686 {
2199 SvPOK_only (data_sv); 2687 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2688 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2689 }
2690
2201 RETVAL = data_sv; 2691 RETVAL = data_sv;
2202} 2692}
2203 OUTPUT: 2693 OUTPUT:
2204 RETVAL 2694 RETVAL
2205 2695
2206void 2696void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2697set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2698 PPCODE:
2209{ 2699{
2210 int x, y, z; 2700 int x, y, z;
2211 int w, h; 2701 int w, h;
2212 int x1, y1; 2702 int x1, y1;
2703 STRLEN len;
2704 uint8_t *data, *end;
2705
2706 len = SvLEN (data_sv);
2707 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2708 data = SvPVbyte_nolen (data_sv);
2709 end = data + len + 8;
2710
2711 if (len < 5)
2712 XSRETURN_EMPTY;
2213 2713
2214 if (*data++ != 0) 2714 if (*data++ != 0)
2215 return; /* version mismatch */ 2715 XSRETURN_EMPTY; /* version mismatch */
2216 2716
2217 w = *data++ << 8; w |= *data++; 2717 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2718 h = *data++ << 8; h |= *data++;
2219 2719
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2720 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2732 {
2233 maprow *row = map_get_row (self, y); 2733 maprow *row = map_get_row (self, y);
2234 2734
2235 for (x = x0; x < x1; x++) 2735 for (x = x0; x < x1; x++)
2236 { 2736 {
2737 uint8_t flags;
2738
2739 if (data + 7 >= end)
2740 XSRETURN_EMPTY;
2741
2237 uint8_t flags = *data++; 2742 flags = *data++;
2238 2743
2239 if (flags) 2744 if (flags)
2240 { 2745 {
2241 mapcell *cell = row_get_cell (row, x); 2746 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2747 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2750 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2751 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2752
2248 if (cell->darkness == 0) 2753 if (cell->darkness == 0)
2249 { 2754 {
2250 cell->darkness = 0; 2755 /*cell->darkness = 0;*/
2756 EXTEND (SP, 3);
2251 2757
2252 for (z = 0; z <= 2; z++) 2758 for (z = 0; z <= 2; z++)
2253 { 2759 {
2254 tileid t = tile [z]; 2760 tileid t = tile [z];
2255 2761
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2762 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2763 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2764 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2765 need_texid (self, t);
2260 } 2766 }
2261 2767
2262 cell->tile [z] = t; 2768 cell->tile [z] = t;
2263 } 2769 }
2265 } 2771 }
2266 } 2772 }
2267 } 2773 }
2268} 2774}
2269 2775
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2776MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2777
2272CFPlus::RW 2778DC::RW
2273new (SV *class, SV *data_sv) 2779new (SV *class, SV *data_sv)
2274 CODE: 2780 CODE:
2275{ 2781{
2276 STRLEN datalen; 2782 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2783 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2785 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2786}
2281 OUTPUT: 2787 OUTPUT:
2282 RETVAL 2788 RETVAL
2283 2789
2284CFPlus::RW 2790DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2791new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2792 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2793 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2794 OUTPUT:
2289 RETVAL 2795 RETVAL
2290 2796
2291# fails on win32: 2797# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2798# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2799#void
2294#close (CFPlus::RW self) 2800#close (DC::RW self)
2295# CODE: 2801# CODE:
2296# (self->(close)) (self); 2802# (self->(close)) (self);
2297 2803
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2804MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2805
2300PROTOTYPES: DISABLE 2806PROTOTYPES: DISABLE
2301 2807
2302CFPlus::Channel 2808DC::Channel
2303find () 2809find ()
2304 CODE: 2810 CODE:
2305{ 2811{
2306 RETVAL = Mix_GroupAvailable (-1); 2812 RETVAL = Mix_GroupAvailable (-1);
2307 2813
2308 if (RETVAL < 0) 2814 if (RETVAL < 0)
2309 { 2815 {
2310 RETVAL = Mix_GroupOldest (-1); 2816 RETVAL = Mix_GroupOldest (-1);
2311 2817
2312 if (RETVAL < 0) 2818 if (RETVAL < 0)
2819 {
2820 // happens sometimes, maybe it just stopped playing(?)
2821 RETVAL = Mix_GroupAvailable (-1);
2822
2823 if (RETVAL < 0)
2313 XSRETURN_UNDEF; 2824 XSRETURN_UNDEF;
2314 2825 }
2826 else
2315 Mix_HaltChannel (RETVAL); 2827 Mix_HaltChannel (RETVAL);
2316 } 2828 }
2317 2829
2318 Mix_UnregisterAllEffects (RETVAL); 2830 Mix_UnregisterAllEffects (RETVAL);
2319 Mix_Volume (RETVAL, 128); 2831 Mix_Volume (RETVAL, 128);
2320} 2832}
2321 OUTPUT: 2833 OUTPUT:
2322 RETVAL 2834 RETVAL
2323 2835
2324void 2836void
2325halt (CFPlus::Channel self) 2837halt (DC::Channel self)
2326 CODE: 2838 CODE:
2327 Mix_HaltChannel (self); 2839 Mix_HaltChannel (self);
2328 2840
2329void 2841void
2330expire (CFPlus::Channel self, int ticks = -1) 2842expire (DC::Channel self, int ticks = -1)
2331 CODE: 2843 CODE:
2332 Mix_ExpireChannel (self, ticks); 2844 Mix_ExpireChannel (self, ticks);
2333 2845
2334void 2846void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2847fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2848 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2849 Mix_FadeOutChannel (self, ticks);
2338 2850
2339int 2851int
2340volume (CFPlus::Channel self, int volume) 2852volume (DC::Channel self, int volume)
2341 CODE: 2853 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2854 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2855 OUTPUT:
2344 RETVAL 2856 RETVAL
2345 2857
2346void 2858void
2347unregister_all_effects (CFPlus::Channel self) 2859unregister_all_effects (DC::Channel self)
2348 CODE: 2860 CODE:
2349 Mix_UnregisterAllEffects (self); 2861 Mix_UnregisterAllEffects (self);
2350 2862
2351void 2863void
2352set_panning (CFPlus::Channel self, int left, int right) 2864set_panning (DC::Channel self, int left, int right)
2353 CODE: 2865 CODE:
2354 left = CLAMP (left , 0, 255); 2866 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2867 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2868 Mix_SetPanning (self, left, right);
2357 2869
2358void 2870void
2359set_distance (CFPlus::Channel self, int distance) 2871set_distance (DC::Channel self, int distance)
2360 CODE: 2872 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2873 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2874
2363void 2875void
2364set_position (CFPlus::Channel self, int angle, int distance) 2876set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2877 CODE:
2366 2878
2367void 2879void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2880set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2881 CODE:
2370{ 2882{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2883 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2372 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2884 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2885 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2886}
2375 2887
2376void 2888void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2889set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2890 CODE:
2379 Mix_SetReverseStereo (self, flip); 2891 Mix_SetReverseStereo (self, flip);
2380 2892
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2893MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2894
2383PROTOTYPES: DISABLE 2895PROTOTYPES: DISABLE
2384 2896
2897void
2898decoders ()
2899 PPCODE:
2900#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2901 int i, num = Mix_GetNumChunkDecoders ();
2902 EXTEND (SP, num);
2903 for (i = 0; i < num; ++i)
2904 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2905#else
2906 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2907#endif
2908
2385CFPlus::MixChunk 2909DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2910new (SV *class, DC::RW rwops)
2387 CODE: 2911 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2912 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2913 OUTPUT:
2390 RETVAL 2914 RETVAL
2391 2915
2392void 2916void
2393DESTROY (CFPlus::MixChunk self) 2917DESTROY (DC::MixChunk self)
2394 CODE: 2918 CODE:
2395 Mix_FreeChunk (self); 2919 Mix_FreeChunk (self);
2396 2920
2397int 2921int
2398volume (CFPlus::MixChunk self, int volume = -1) 2922volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2923 CODE:
2400 if (items > 1) 2924 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2925 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2926 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2927 OUTPUT:
2404 RETVAL 2928 RETVAL
2405 2929
2406CFPlus::Channel 2930DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2931play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2932 CODE:
2409{ 2933{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2934 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2935
2412 if (RETVAL < 0) 2936 if (RETVAL < 0)
2419 } 2943 }
2420} 2944}
2421 OUTPUT: 2945 OUTPUT:
2422 RETVAL 2946 RETVAL
2423 2947
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2948MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2949
2950void
2951decoders ()
2952 PPCODE:
2953#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2954 int i, num = Mix_GetNumMusicDecoders ();
2955 EXTEND (SP, num);
2956 for (i = 0; i < num; ++i)
2957 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2958#else
2959 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2960#endif
2425 2961
2426int 2962int
2427volume (int volume = -1) 2963volume (int volume = -1)
2428 PROTOTYPE: ;$ 2964 PROTOTYPE: ;$
2429 CODE: 2965 CODE:
2441void 2977void
2442halt () 2978halt ()
2443 CODE: 2979 CODE:
2444 Mix_HaltMusic (); 2980 Mix_HaltMusic ();
2445 2981
2982int
2983playing ()
2984 CODE:
2985 RETVAL = Mix_PlayingMusic ();
2986 OUTPUT:
2987 RETVAL
2988
2446CFPlus::MixMusic 2989DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2990new (SV *class, DC::RW rwops)
2448 CODE: 2991 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2992 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2993 OUTPUT:
2451 RETVAL 2994 RETVAL
2452 2995
2453void 2996void
2454DESTROY (CFPlus::MixMusic self) 2997DESTROY (DC::MixMusic self)
2455 CODE: 2998 CODE:
2456 Mix_FreeMusic (self); 2999 Mix_FreeMusic (self);
2457 3000
2458int 3001int
2459play (CFPlus::MixMusic self, int loops = -1) 3002play (DC::MixMusic self, int loops = -1)
2460 CODE: 3003 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 3004 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 3005 OUTPUT:
2463 RETVAL 3006 RETVAL
2464 3007
2465void 3008void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3009fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 3010 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 3011 Mix_FadeInMusicPos (self, loops, ms, position);
2469 3012
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3013MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 3014
2472PROTOTYPES: ENABLE 3015PROTOTYPES: ENABLE
2473 3016
2474BOOT: 3017BOOT:
2475{ 3018{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3019 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 3020 static const struct {
2478 const char *name; 3021 const char *name;
2479 IV iv; 3022 IV iv;
2480 } *civ, const_iv[] = { 3023 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 3024# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_VENDOR), 3025 const_iv (GL_VENDOR),
2483 const_iv (GL_VERSION), 3026 const_iv (GL_VERSION),
2484 const_iv (GL_EXTENSIONS), 3027 const_iv (GL_EXTENSIONS),
3028 const_iv (GL_MAX_TEXTURE_UNITS),
2485 const_iv (GL_COLOR_MATERIAL), 3029 const_iv (GL_COLOR_MATERIAL),
2486 const_iv (GL_SMOOTH), 3030 const_iv (GL_SMOOTH),
2487 const_iv (GL_FLAT), 3031 const_iv (GL_FLAT),
2488 const_iv (GL_DITHER), 3032 const_iv (GL_DITHER),
2489 const_iv (GL_BLEND), 3033 const_iv (GL_BLEND),
2501 const_iv (GL_ZERO), 3045 const_iv (GL_ZERO),
2502 const_iv (GL_SRC_ALPHA), 3046 const_iv (GL_SRC_ALPHA),
2503 const_iv (GL_DST_ALPHA), 3047 const_iv (GL_DST_ALPHA),
2504 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3048 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2505 const_iv (GL_ONE_MINUS_DST_ALPHA), 3049 const_iv (GL_ONE_MINUS_DST_ALPHA),
3050 const_iv (GL_SRC_COLOR),
3051 const_iv (GL_DST_COLOR),
3052 const_iv (GL_ONE_MINUS_SRC_COLOR),
3053 const_iv (GL_ONE_MINUS_DST_COLOR),
2506 const_iv (GL_SRC_ALPHA_SATURATE), 3054 const_iv (GL_SRC_ALPHA_SATURATE),
2507 const_iv (GL_RGB), 3055 const_iv (GL_RGB),
2508 const_iv (GL_RGBA), 3056 const_iv (GL_RGBA),
2509 const_iv (GL_RGBA4), 3057 const_iv (GL_RGBA4),
2510 const_iv (GL_RGBA8), 3058 const_iv (GL_RGBA8),
2516 const_iv (GL_INTENSITY), 3064 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 3065 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 3066 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 3067 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3068 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3069 const_iv (GL_COMPRESSED_ALPHA_ARB),
3070 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3071 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3072 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3073 const_iv (GL_COMPRESSED_RGB_ARB),
3074 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 3075 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 3076 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 3077 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 3078 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 3079 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3118 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 3119 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 3120 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 3121 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 3122 const_iv (GL_GENERATE_MIPMAP_HINT),
3123 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 3124 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 3125 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 3126 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 3127 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 3128 const_iv (GL_V3F),
2574 const_iv (GL_T2F_V3F), 3129 const_iv (GL_T2F_V3F),
2575 const_iv (GL_T2F_N3F_V3F), 3130 const_iv (GL_T2F_N3F_V3F),
3131 const_iv (GL_FUNC_ADD),
3132 const_iv (GL_FUNC_SUBTRACT),
3133 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2576# undef const_iv 3134# undef const_iv
2577 }; 3135 };
2578 3136
2579 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3137 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2580 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3138 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2581 3139
2582 texture_av = newAV (); 3140 texture_av = newAV ();
2583 AvREAL_off (texture_av); 3141 AvREAL_off (texture_av);
2584} 3142}
2585 3143
3144void
3145disable_GL_EXT_blend_func_separate ()
3146 CODE:
3147 gl.BlendFuncSeparate = 0;
3148 gl.BlendFuncSeparateEXT = 0;
3149
3150void
3151apple_nvidia_bug (int enable)
3152
2586char * 3153char *
2587gl_vendor () 3154gl_vendor ()
2588 CODE: 3155 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 3156 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 3157 OUTPUT:
2620 3187
2621int glGetError () 3188int glGetError ()
2622 3189
2623void glFinish () 3190void glFinish ()
2624 3191
3192void glFlush ()
3193
2625void glClear (int mask) 3194void glClear (int mask)
2626 3195
2627void glClearColor (float r, float g, float b, float a = 1.0) 3196void glClearColor (float r, float g, float b, float a = 1.0)
2628 PROTOTYPE: @ 3197 PROTOTYPE: @
2629 3198
2638void glBlendFunc (int sfactor, int dfactor) 3207void glBlendFunc (int sfactor, int dfactor)
2639 3208
2640void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3209void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2641 CODE: 3210 CODE:
2642 gl_BlendFuncSeparate (sa, da, saa, daa); 3211 gl_BlendFuncSeparate (sa, da, saa, daa);
3212
3213# void glBlendEquation (int se)
2643 3214
2644void glDepthMask (int flag) 3215void glDepthMask (int flag)
2645 3216
2646void glLogicOp (int opcode) 3217void glLogicOp (int opcode)
2647 3218
2682void glRotate (float angle, float x, float y, float z) 3253void glRotate (float angle, float x, float y, float z)
2683 CODE: 3254 CODE:
2684 glRotatef (angle, x, y, z); 3255 glRotatef (angle, x, y, z);
2685 3256
2686void glColor (float r, float g, float b, float a = 1.0) 3257void glColor (float r, float g, float b, float a = 1.0)
3258 PROTOTYPE: @
2687 ALIAS: 3259 ALIAS:
2688 glColor_premultiply = 1 3260 glColor_premultiply = 1
2689 CODE: 3261 CODE:
2690 if (ix) 3262 if (ix)
2691 { 3263 {
2711 3283
2712void glRect (float x1, float y1, float x2, float y2) 3284void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3285 CODE:
2714 glRectf (x1, y1, x2, y2); 3286 glRectf (x1, y1, x2, y2);
2715 3287
3288void glRect_lineloop (float x1, float y1, float x2, float y2)
3289 CODE:
3290 glBegin (GL_LINE_LOOP);
3291 glVertex2f (x1, y1);
3292 glVertex2f (x2, y1);
3293 glVertex2f (x2, y2);
3294 glVertex2f (x1, y2);
3295 glEnd ();
3296
2716PROTOTYPES: ENABLE 3297PROTOTYPES: ENABLE
2717 3298
2718void glBegin (int mode) 3299void glBegin (int mode)
2719 3300
2720void glEnd () 3301void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3333void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 3334 CODE:
2754 if (gl.SeparableFilter2D) 3335 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3336 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3337
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3338void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 3339
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3340void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 3341
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3342void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3343
2788 3369
2789void glEndList () 3370void glEndList ()
2790 3371
2791void glCallList (int list) 3372void glCallList (int list)
2792 3373
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3374void c_init ()
3375 CODE:
3376 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3377 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3378
3379MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3380
2795PROTOTYPES: DISABLE 3381PROTOTYPES: DISABLE
2796 3382
2797void 3383void
2798find_widget (SV *self, NV x, NV y) 3384find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3388 XPUSHs (self);
2803} 3389}
2804 3390
2805BOOT: 3391BOOT:
2806{ 3392{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3393 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3394
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3395 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2810 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3396 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2811 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3397 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2812 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3398 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3399}
2814 3400
2815void 3401void
2816draw (SV *self) 3402draw (SV *self)
2817 CODE: 3403 CODE:
2821 NV x, y, w, h; 3407 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3408 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3409 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3410 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3411 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3412 double draw_x, draw_y;
2828 3413
2829 if (!SvROK (self)) 3414 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3415 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3416
2832 hv = (HV *)SvRV (self); 3417 hv = (HV *)SvRV (self);
2833 3418
2834 if (SvTYPE (hv) != SVt_PVHV) 3419 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3420 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3421
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3422 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2838 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3423 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3424
2840 if (!h || !w) 3425 if (!h || !w)
2860 { 3445 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3446 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3447
2863 if (svp && SvTRUE (*svp)) 3448 if (svp && SvTRUE (*svp))
2864 { 3449 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3450 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3451 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3452 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3453 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3454 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3455 glVertex2f (w, 0);
2873 glEnd (); 3458 glEnd ();
2874 glDisable (GL_BLEND); 3459 glDisable (GL_BLEND);
2875 } 3460 }
2876 } 3461 }
2877#if 0 3462#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3463 // draw borders, for debugging
2879 glPushMatrix; 3464 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3465 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3466 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3467 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3468 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3469 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3470 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3471 glVertex2f (0 , h - 1);
2887 glEnd; 3472 glEnd ();
2888 glPopMatrix; 3473 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3474#endif
2892 PUSHMARK (SP); 3475 PUSHMARK (SP);
2893 XPUSHs (self); 3476 XPUSHs (self);
2894 PUTBACK; 3477 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3478 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines