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.304 by root, Fri Apr 23 16:30:38 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
867 1116
868void 1117void
869load_image_inline (SV *image_) 1118load_image_inline (SV *image_)
870 ALIAS: 1119 ALIAS:
871 load_image_file = 1 1120 load_image_file = 1
957void 1206void
958error (char *message) 1207error (char *message)
959 CODE: 1208 CODE:
960 fprintf (stderr, "ERROR: %s\n", message); 1209 fprintf (stderr, "ERROR: %s\n", message);
961#ifdef _WIN32 1210#ifdef _WIN32
962 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1211 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
963#endif 1212#endif
964 1213
965void 1214void
966fatal (char *message) 1215fatal (char *message)
967 CODE: 1216 CODE:
968 fprintf (stderr, "FATAL: %s\n", message); 1217 fprintf (stderr, "FATAL: %s\n", message);
969#ifdef _WIN32 1218#ifdef _WIN32
970 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1219 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
971#endif 1220#endif
972 _exit (1); 1221 _exit (1);
973 1222
974void 1223void
975_exit (int retval = 0) 1224_exit (int retval = 0)
987#if DEBUG 1236#if DEBUG
988 VALGRIND_DO_LEAK_CHECK; 1237 VALGRIND_DO_LEAK_CHECK;
989#endif 1238#endif
990} 1239}
991 1240
992MODULE = CFPlus PACKAGE = CFPlus::Font 1241int
1242SvREFCNT (SV *sv)
1243 CODE:
1244 RETVAL = SvREFCNT (sv);
1245 OUTPUT:
1246 RETVAL
1247
1248MODULE = Deliantra::Client PACKAGE = DC::Font
993 1249
994PROTOTYPES: DISABLE 1250PROTOTYPES: DISABLE
995 1251
996CFPlus::Font 1252DC::Font
997new_from_file (SV *class, char *path, int id = 0) 1253new_from_file (SV *class, char *path, int id = 0)
998 CODE: 1254 CODE:
999{ 1255{
1000 int count; 1256 int count;
1001 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1004} 1260}
1005 OUTPUT: 1261 OUTPUT:
1006 RETVAL 1262 RETVAL
1007 1263
1008void 1264void
1009DESTROY (CFPlus::Font self) 1265DESTROY (DC::Font self)
1010 CODE: 1266 CODE:
1011 pango_font_description_free (self); 1267 pango_font_description_free (self);
1012 1268
1013void 1269void
1014make_default (CFPlus::Font self) 1270make_default (DC::Font self)
1015 PROTOTYPE: $ 1271 PROTOTYPE: $
1016 CODE: 1272 CODE:
1017 default_font = self; 1273 default_font = self;
1018 1274
1019MODULE = CFPlus PACKAGE = CFPlus::Layout 1275MODULE = Deliantra::Client PACKAGE = DC::Layout
1020 1276
1021PROTOTYPES: DISABLE 1277PROTOTYPES: DISABLE
1022 1278
1023void 1279void
1024reset_glyph_cache () 1280glyph_cache_backup ()
1025 PROTOTYPE: 1281 PROTOTYPE:
1026 CODE: 1282 CODE:
1283 tc_backup ();
1284
1285void
1286glyph_cache_restore ()
1287 PROTOTYPE:
1288 CODE:
1027 tc_clear (); 1289 tc_restore ();
1028 1290
1029CFPlus::Layout 1291DC::Layout
1030new (SV *class) 1292new (SV *class)
1031 CODE: 1293 CODE:
1032 New (0, RETVAL, 1, struct cf_layout); 1294 New (0, RETVAL, 1, struct cf_layout);
1033 1295
1034 RETVAL->pl = pango_layout_new (opengl_context); 1296 RETVAL->pl = pango_layout_new (opengl_context);
1036 RETVAL->g = 1.; 1298 RETVAL->g = 1.;
1037 RETVAL->b = 1.; 1299 RETVAL->b = 1.;
1038 RETVAL->a = 1.; 1300 RETVAL->a = 1.;
1039 RETVAL->base_height = MIN_FONT_HEIGHT; 1301 RETVAL->base_height = MIN_FONT_HEIGHT;
1040 RETVAL->font = 0; 1302 RETVAL->font = 0;
1303 RETVAL->rc = rc_alloc ();
1041 1304
1042 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1305 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1043 layout_update_font (RETVAL); 1306 layout_update_font (RETVAL);
1044 OUTPUT: 1307 OUTPUT:
1045 RETVAL 1308 RETVAL
1046 1309
1047void 1310void
1048DESTROY (CFPlus::Layout self) 1311DESTROY (DC::Layout self)
1049 CODE: 1312 CODE:
1050 g_object_unref (self->pl); 1313 g_object_unref (self->pl);
1314 rc_free (self->rc);
1051 Safefree (self); 1315 Safefree (self);
1052 1316
1053void 1317void
1054set_text (CFPlus::Layout self, SV *text_) 1318set_text (DC::Layout self, SV *text_)
1055 CODE: 1319 CODE:
1056{ 1320{
1057 STRLEN textlen; 1321 STRLEN textlen;
1058 char *text = SvPVutf8 (text_, textlen); 1322 char *text = SvPVutf8 (text_, textlen);
1059 1323
1060 pango_layout_set_text (self->pl, text, textlen); 1324 pango_layout_set_text (self->pl, text, textlen);
1061} 1325}
1062 1326
1063void 1327void
1064set_markup (CFPlus::Layout self, SV *text_) 1328set_markup (DC::Layout self, SV *text_)
1065 CODE: 1329 CODE:
1066{ 1330{
1067 STRLEN textlen; 1331 STRLEN textlen;
1068 char *text = SvPVutf8 (text_, textlen); 1332 char *text = SvPVutf8 (text_, textlen);
1069 1333
1070 pango_layout_set_markup (self->pl, text, textlen); 1334 pango_layout_set_markup (self->pl, text, textlen);
1071} 1335}
1072 1336
1073void 1337void
1074set_shapes (CFPlus::Layout self, ...) 1338set_shapes (DC::Layout self, ...)
1075 CODE: 1339 CODE:
1076{ 1340{
1077 PangoAttrList *attrs = 0; 1341 PangoAttrList *attrs = 0;
1078 const char *text = pango_layout_get_text (self->pl); 1342 const char *text = pango_layout_get_text (self->pl);
1079 const char *pos = text; 1343 const char *pos = text;
1114 if (attrs) 1378 if (attrs)
1115 pango_layout_set_attributes (self->pl, attrs); 1379 pango_layout_set_attributes (self->pl, attrs);
1116} 1380}
1117 1381
1118void 1382void
1119get_shapes (CFPlus::Layout self) 1383get_shapes (DC::Layout self)
1120 PPCODE: 1384 PPCODE:
1121{ 1385{
1122 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1386 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1123 1387
1124 do 1388 do
1125 { 1389 {
1126 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1390 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1127 1391
1128 if (run && shape_attr_p (run)) 1392 if (run && shape_attr_p (run))
1129 { 1393 {
1130 PangoRectangle extents; 1394 PangoRectangle extents;
1131 pango_layout_iter_get_run_extents (iter, 0, &extents); 1395 pango_layout_iter_get_run_extents (iter, 0, &extents);
1139 1403
1140 pango_layout_iter_free (iter); 1404 pango_layout_iter_free (iter);
1141} 1405}
1142 1406
1143int 1407int
1144has_wrapped (CFPlus::Layout self) 1408has_wrapped (DC::Layout self)
1145 CODE: 1409 CODE:
1146{ 1410{
1147 int lines = 1; 1411 int lines = 1;
1148 const char *text = pango_layout_get_text (self->pl); 1412 const char *text = pango_layout_get_text (self->pl);
1149 1413
1154} 1418}
1155 OUTPUT: 1419 OUTPUT:
1156 RETVAL 1420 RETVAL
1157 1421
1158SV * 1422SV *
1159get_text (CFPlus::Layout self) 1423get_text (DC::Layout self)
1160 CODE: 1424 CODE:
1161 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1425 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1162 sv_utf8_decode (RETVAL); 1426 sv_utf8_decode (RETVAL);
1163 OUTPUT: 1427 OUTPUT:
1164 RETVAL 1428 RETVAL
1165 1429
1166void 1430void
1167set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1431set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1168 CODE: 1432 CODE:
1169 self->r = r; 1433 self->r = r;
1170 self->g = g; 1434 self->g = g;
1171 self->b = b; 1435 self->b = b;
1172 self->a = a; 1436 self->a = a;
1173 1437
1174void 1438void
1175set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1439set_font (DC::Layout self, DC::Font font = 0)
1176 CODE: 1440 CODE:
1177 if (self->font != font) 1441 if (self->font != font)
1178 { 1442 {
1179 self->font = font; 1443 self->font = font;
1180 layout_update_font (self); 1444 layout_update_font (self);
1181 } 1445 }
1182 1446
1183void 1447void
1184set_height (CFPlus::Layout self, int base_height) 1448set_height (DC::Layout self, int base_height)
1185 CODE: 1449 CODE:
1186 if (self->base_height != base_height) 1450 if (self->base_height != base_height)
1187 { 1451 {
1188 self->base_height = base_height; 1452 self->base_height = base_height;
1189 layout_update_font (self); 1453 layout_update_font (self);
1190 } 1454 }
1191 1455
1192void 1456void
1193set_width (CFPlus::Layout self, int max_width = -1) 1457set_width (DC::Layout self, int max_width = -1)
1194 CODE: 1458 CODE:
1195 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1459 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1196 1460
1197void 1461void
1198set_indent (CFPlus::Layout self, int indent) 1462set_indent (DC::Layout self, int indent)
1199 CODE: 1463 CODE:
1200 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1464 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1201 1465
1202void 1466void
1203set_spacing (CFPlus::Layout self, int spacing) 1467set_spacing (DC::Layout self, int spacing)
1204 CODE: 1468 CODE:
1205 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1469 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1206 1470
1207void 1471void
1208set_ellipsise (CFPlus::Layout self, int ellipsise) 1472set_ellipsise (DC::Layout self, int ellipsise)
1209 CODE: 1473 CODE:
1210 pango_layout_set_ellipsize (self->pl, 1474 pango_layout_set_ellipsize (self->pl,
1211 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1475 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1212 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1476 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1213 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1477 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1214 : PANGO_ELLIPSIZE_NONE 1478 : PANGO_ELLIPSIZE_NONE
1215 ); 1479 );
1216 1480
1217void 1481void
1218set_single_paragraph_mode (CFPlus::Layout self, int spm) 1482set_single_paragraph_mode (DC::Layout self, int spm)
1219 CODE: 1483 CODE:
1220 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1484 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1221 1485
1222void 1486void
1223size (CFPlus::Layout self) 1487size (DC::Layout self)
1224 PPCODE: 1488 PPCODE:
1225{ 1489{
1226 int w, h; 1490 int w, h;
1227 1491
1228 layout_get_pixel_size (self, &w, &h); 1492 layout_get_pixel_size (self, &w, &h);
1231 PUSHs (sv_2mortal (newSViv (w))); 1495 PUSHs (sv_2mortal (newSViv (w)));
1232 PUSHs (sv_2mortal (newSViv (h))); 1496 PUSHs (sv_2mortal (newSViv (h)));
1233} 1497}
1234 1498
1235int 1499int
1236descent (CFPlus::Layout self) 1500descent (DC::Layout self)
1237 CODE: 1501 CODE:
1238{ 1502{
1239 PangoRectangle rect; 1503 PangoRectangle rect;
1240 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1504 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1241 pango_layout_line_get_pixel_extents (line, 0, &rect); 1505 pango_layout_line_get_pixel_extents (line, 0, &rect);
1242 RETVAL = PANGO_DESCENT (rect); 1506 RETVAL = PANGO_DESCENT (rect);
1243} 1507}
1244 OUTPUT: 1508 OUTPUT:
1245 RETVAL 1509 RETVAL
1246 1510
1247int 1511int
1248xy_to_index (CFPlus::Layout self, int x, int y) 1512xy_to_index (DC::Layout self, int x, int y)
1249 CODE: 1513 CODE:
1250{ 1514{
1251 int index, trailing; 1515 int index, trailing;
1252 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1516 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1253 RETVAL = index + trailing; 1517 RETVAL = index + trailing;
1254} 1518}
1255 OUTPUT: 1519 OUTPUT:
1256 RETVAL 1520 RETVAL
1257 1521
1258void 1522void
1259cursor_pos (CFPlus::Layout self, int index) 1523cursor_pos (DC::Layout self, int index)
1260 PPCODE: 1524 PPCODE:
1261{ 1525{
1262 PangoRectangle strong_pos; 1526 PangoRectangle pos;
1263 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1527 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1264 1528
1265 EXTEND (SP, 3); 1529 EXTEND (SP, 3);
1266 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1530 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1531 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1268 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1532 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1269} 1533}
1270 1534
1271void 1535void
1272index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1536index_to_line_x (DC::Layout self, int index, int trailing = 0)
1273 PPCODE: 1537 PPCODE:
1274{ 1538{
1275 int line, x; 1539 int line, x;
1276 1540
1277 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1541 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1542#if !PANGO_VERSION_CHECK (1, 17, 3)
1278 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1543 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1279 1544 --line;
1545#endif
1280 EXTEND (SP, 2); 1546 EXTEND (SP, 2);
1281 PUSHs (sv_2mortal (newSViv (line - 1))); 1547 PUSHs (sv_2mortal (newSViv (line)));
1282 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1548 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1283} 1549}
1284 1550
1285void 1551void
1286line_x_to_index (CFPlus::Layout self, int line, int x) 1552line_x_to_index (DC::Layout self, int line, int x)
1287 PPCODE: 1553 PPCODE:
1288{ 1554{
1289 PangoLayoutLine *lp; 1555 PangoLayoutLine *lp;
1290 int index, trailing; 1556 int index, trailing;
1291 1557
1292 if (line < 0) 1558 if (line < 0)
1293 XSRETURN_EMPTY; 1559 XSRETURN_EMPTY;
1294 1560
1295 if (!(lp = pango_layout_get_line (self->pl, line))) 1561 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1296 XSRETURN_EMPTY; /* do better */ 1562 XSRETURN_EMPTY; /* do better */
1297 1563
1298 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1564 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1299 1565
1300 EXTEND (SP, 2); 1566 EXTEND (SP, 2);
1306 PUSHs (sv_2mortal (newSViv (trailing))); 1572 PUSHs (sv_2mortal (newSViv (trailing)));
1307 } 1573 }
1308} 1574}
1309 1575
1310void 1576void
1311render (CFPlus::Layout self, float x, float y, int flags = 0) 1577render (DC::Layout self, float x, float y, int flags = 0)
1312 PPCODE: 1578 CODE:
1579 rc_clear (self->rc);
1313 pango_opengl_render_layout_subpixel ( 1580 pango_opengl_render_layout_subpixel (
1314 self->pl, 1581 self->pl,
1582 self->rc,
1315 x * PANGO_SCALE, y * PANGO_SCALE, 1583 x * PANGO_SCALE, y * PANGO_SCALE,
1316 self->r, self->g, self->b, self->a, 1584 self->r, self->g, self->b, self->a,
1317 flags 1585 flags
1318 ); 1586 );
1587 // we assume that context_change actually clears/frees stuff
1588 // and does not do any recomputation...
1589 pango_layout_context_changed (self->pl);
1319 1590
1320MODULE = CFPlus PACKAGE = CFPlus::Texture 1591void
1592draw (DC::Layout self)
1593 CODE:
1594{
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1597 glEnable (GL_BLEND);
1598 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600 glEnable (GL_ALPHA_TEST);
1601 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602
1603 rc_draw (self->rc);
1604
1605 glDisable (GL_ALPHA_TEST);
1606 glDisable (GL_BLEND);
1607 glDisable (GL_TEXTURE_2D);
1608}
1609
1610MODULE = Deliantra::Client PACKAGE = DC::Texture
1321 1611
1322PROTOTYPES: ENABLE 1612PROTOTYPES: ENABLE
1323
1324int minpot (int n)
1325 1613
1326void 1614void
1327pad (SV *data_, int ow, int oh, int nw, int nh) 1615pad (SV *data_, int ow, int oh, int nw, int nh)
1328 CODE: 1616 CODE:
1329{ 1617{
1395 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1396 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1397 } 1685 }
1398} 1686}
1399 1687
1688void
1689draw_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)
1690 PROTOTYPE: @
1691 CODE:
1692{
1693 glEnable (GL_BLEND);
1694 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1695 glEnable (GL_TEXTURE_2D);
1696 glBindTexture (GL_TEXTURE_2D, name1);
1697
1698 glColor3f (intensity, intensity, intensity);
1699 glPushMatrix ();
1700 glScalef (1./3, 1./3, 1.);
1701
1702 if (blend > 0.f)
1703 {
1704 float dx3 = dx * -3.f / w;
1705 float dy3 = dy * -3.f / h;
1706 GLfloat env_color[4] = { 0., 0., 0., blend };
1707
1708 /* interpolate the two shadow textures */
1709 /* stage 0 == rgb(glcolor) + alpha(t0) */
1710 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1711
1712 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1713 gl.ActiveTexture (GL_TEXTURE1);
1714 glEnable (GL_TEXTURE_2D);
1715 glBindTexture (GL_TEXTURE_2D, name2);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1717
1718 /* rgb == rgb(glcolor) */
1719 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1722
1723 /* alpha = interpolate t0, t1 by env_alpha */
1724 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1725
1726 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1727 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1728 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1729
1730 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1731 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1732
1733 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1734 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1735
1736 glBegin (GL_QUADS);
1737 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1738 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1739 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1740 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1741 glEnd ();
1742
1743 glDisable (GL_TEXTURE_2D);
1744 gl.ActiveTexture (GL_TEXTURE0);
1745 }
1746 else
1747 {
1748 /* simple blending of one texture, also opengl <1.3 path */
1749 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1750
1751 glBegin (GL_QUADS);
1752 glTexCoord2f (0, 0); glVertex2f (0, 0);
1753 glTexCoord2f (0, t); glVertex2f (0, h);
1754 glTexCoord2f (s, t); glVertex2f (w, h);
1755 glTexCoord2f (s, 0); glVertex2f (w, 0);
1756 glEnd ();
1757 }
1758
1759 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1760 {
1761 int x, y;
1762 int dx3 = dx * 3;
1763 int dy3 = dy * 3;
1764
1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1766 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1767 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1768 glTranslatef (-1., -1., 0);
1769 glBegin (GL_QUADS);
1770
1771 for (y = 1; y < h; y += 3)
1772 {
1773 int y1 = y - dy3;
1774 int y1valid = y1 >= 0 && y1 < h;
1775
1776 for (x = 1; x < w; x += 3)
1777 {
1778 int x1 = x - dx3;
1779 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1780 uint8_t h2;
1781
1782 if (y1valid && x1 >= 0 && x1 < w)
1783 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1784 else
1785 h2 = 1; /* out of range == invisible */
1786
1787 if (h1 || h2)
1788 {
1789 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1790 glColor4f (1., 1., 1., alpha);
1791
1792 glTexCoord2f (0, 0.); glVertex2i (x , y );
1793 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1794 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1795 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1796 }
1797 }
1798 }
1799 }
1800
1801 glEnd ();
1802
1803 glPopMatrix ();
1804
1805 glDisable (GL_TEXTURE_2D);
1806 glDisable (GL_BLEND);
1807}
1808
1400IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1809IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1401 CODE: 1810 CODE:
1402{ 1811{
1403 GLint width; 1812 GLint width;
1404 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1813 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1406 RETVAL = width > 0; 1815 RETVAL = width > 0;
1407} 1816}
1408 OUTPUT: 1817 OUTPUT:
1409 RETVAL 1818 RETVAL
1410 1819
1411MODULE = CFPlus PACKAGE = CFPlus::Map 1820MODULE = Deliantra::Client PACKAGE = DC::Map
1412 1821
1413PROTOTYPES: DISABLE 1822PROTOTYPES: DISABLE
1414 1823
1415CFPlus::Map 1824DC::Map
1416new (SV *class) 1825new (SV *class)
1417 CODE: 1826 CODE:
1418 New (0, RETVAL, 1, struct map); 1827 New (0, RETVAL, 1, struct map);
1419 RETVAL->x = 0; 1828 RETVAL->x = 0;
1420 RETVAL->y = 0; 1829 RETVAL->y = 0;
1428 RETVAL->row = 0; 1837 RETVAL->row = 0;
1429 OUTPUT: 1838 OUTPUT:
1430 RETVAL 1839 RETVAL
1431 1840
1432void 1841void
1433DESTROY (CFPlus::Map self) 1842DESTROY (DC::Map self)
1434 CODE: 1843 CODE:
1435{ 1844{
1436 map_clear (self); 1845 map_clear (self);
1437 Safefree (self->face2tile); 1846 Safefree (self->face2tile);
1438 Safefree (self->tex); 1847 Safefree (self->tex);
1439 Safefree (self); 1848 Safefree (self);
1440} 1849}
1441 1850
1442void 1851void
1443resize (CFPlus::Map self, int map_width, int map_height) 1852resize (DC::Map self, int map_width, int map_height)
1444 CODE: 1853 CODE:
1445 self->w = map_width; 1854 self->w = map_width;
1446 self->h = map_height; 1855 self->h = map_height;
1447 1856
1448void 1857void
1449clear (CFPlus::Map self) 1858clear (DC::Map self)
1450 CODE: 1859 CODE:
1451 map_clear (self); 1860 map_clear (self);
1452 1861
1453void 1862void
1454set_tileid (CFPlus::Map self, int face, int tile) 1863set_tileid (DC::Map self, int face, int tile)
1455 CODE: 1864 CODE:
1456{ 1865{
1457 need_facenum (self, face); self->face2tile [face] = tile; 1866 need_facenum (self, face); self->face2tile [face] = tile;
1458 need_texid (self, tile); 1867 need_texid (self, tile);
1459} 1868}
1460 1869
1461void 1870void
1462set_smooth (CFPlus::Map self, int face, int smooth, int level) 1871set_smooth (DC::Map self, int face, int smooth, int level)
1463 CODE: 1872 CODE:
1464{ 1873{
1465 tileid texid; 1874 tileid texid;
1466 maptex *tex; 1875 maptex *tex;
1467 1876
1480 tex->smoothtile = self->face2tile [smooth]; 1889 tex->smoothtile = self->face2tile [smooth];
1481 tex->smoothlevel = level; 1890 tex->smoothlevel = level;
1482} 1891}
1483 1892
1484void 1893void
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) 1894set_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: 1895 CODE:
1487{ 1896{
1488 need_texid (self, texid); 1897 need_texid (self, texid);
1489 1898
1490 { 1899 {
1509 // use uglier nearest interpolation because linear suffers 1918 // use uglier nearest interpolation because linear suffers
1510 // from transparent color bleeding and ugly wrapping effects. 1919 // from transparent color bleeding and ugly wrapping effects.
1511 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1920 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1512} 1921}
1513 1922
1923void
1924expire_textures (DC::Map self, int texid, int count)
1925 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count)
1927 {
1928 maptex *tex = self->tex + texid;
1929
1930 if (tex->name)
1931 {
1932 if (tex->unused)
1933 {
1934 tex->name = 0;
1935 tex->unused = 0;
1936 XPUSHs (sv_2mortal (newSViv (texid)));
1937 }
1938 else
1939 tex->unused = 1;
1940 }
1941 }
1942
1514int 1943int
1515ox (CFPlus::Map self) 1944ox (DC::Map self)
1516 ALIAS: 1945 ALIAS:
1517 oy = 1 1946 oy = 1
1518 x = 2 1947 x = 2
1519 y = 3 1948 y = 3
1520 w = 4 1949 w = 4
1531 } 1960 }
1532 OUTPUT: 1961 OUTPUT:
1533 RETVAL 1962 RETVAL
1534 1963
1535void 1964void
1536scroll (CFPlus::Map self, int dx, int dy) 1965scroll (DC::Map self, int dx, int dy)
1537 CODE: 1966 CODE:
1538{ 1967{
1539 if (dx > 0) 1968 if (dx > 0)
1540 map_blank (self, self->x, self->y, dx, self->h); 1969 map_blank (self, self->x, self->y, dx, self->h);
1541 else if (dx < 0) 1970 else if (dx < 0)
1557 self->y += MAP_EXTEND_Y; 1986 self->y += MAP_EXTEND_Y;
1558 } 1987 }
1559} 1988}
1560 1989
1561SV * 1990SV *
1562map1a_update (CFPlus::Map self, SV *data_, int extmap) 1991map1a_update (DC::Map self, SV *data_, int extmap)
1563 CODE: 1992 CODE:
1564{ 1993{
1565 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1566 uint8_t *data_end = (uint8_t *)SvEND (data_); 1995 uint8_t *data_end = (uint8_t *)SvEND (data_);
1567 mapcell *cell; 1996 mapcell *cell;
1595 uint8_t ext, cmd; 2024 uint8_t ext, cmd;
1596 2025
1597 do 2026 do
1598 { 2027 {
1599 ext = *data++; 2028 ext = *data++;
1600 cmd = ext & 0x3f; 2029 cmd = ext & 0x7f;
1601 2030
1602 if (cmd < 4) 2031 if (cmd < 4)
1603 cell->darkness = 255 - ext * 64 + 1; 2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1604 else if (cmd == 5) // health 2033 else if (cmd == 5) // health
1605 { 2034 {
1606 cell->stat_width = 1; 2035 cell->stat_width = 1;
1607 cell->stat_hp = *data++; 2036 cell->stat_hp = *data++;
1608 } 2037 }
1609 else if (cmd == 6) // monster width 2038 else if (cmd == 6) // monster width
1610 cell->stat_width = *data++ + 1; 2039 cell->stat_width = *data++ + 1;
1611 else if (cmd == 0x47) 2040 else if (cmd == 0x47)
1612 { 2041 {
1613 if (*data == 4) 2042 if (*data == 1) cell->player = data [1];
1614 ; // decode player count 2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1615 2046
1616 data += *data + 1; 2047 data += *data + 1;
1617 } 2048 }
1618 else if (cmd == 8) // cell flags 2049 else if (cmd == 8) // cell flags
1619 cell->flags = *data++; 2050 cell->flags = *data++;
1636 cell->tile [z] = self->face2tile [face]; 2067 cell->tile [z] = self->face2tile [face];
1637 2068
1638 if (cell->tile [z]) 2069 if (cell->tile [z])
1639 { 2070 {
1640 maptex *tex = self->tex + cell->tile [z]; 2071 maptex *tex = self->tex + cell->tile [z];
2072 tex->unused = 0;
1641 if (!tex->name) 2073 if (!tex->name)
1642 av_push (missing, newSViv (cell->tile [z])); 2074 av_push (missing, newSViv (cell->tile [z]));
1643 2075
1644 if (tex->smoothtile) 2076 if (tex->smoothtile)
1645 { 2077 {
1646 maptex *smooth = self->tex + tex->smoothtile; 2078 maptex *smooth = self->tex + tex->smoothtile;
2079 smooth->unused = 0;
1647 if (!smooth->name) 2080 if (!smooth->name)
1648 av_push (missing, newSViv (tex->smoothtile)); 2081 av_push (missing, newSViv (tex->smoothtile));
1649 } 2082 }
1650 } 2083 }
1651 } 2084 }
1652 } 2085 }
1653 else 2086 else
1654 cell->darkness = 0; 2087 CELL_CLEAR (cell);
1655 } 2088 }
1656} 2089}
1657 OUTPUT: 2090 OUTPUT:
1658 RETVAL 2091 RETVAL
1659 2092
1660SV * 2093SV *
1661mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2094mapmap (DC::Map self, int x0, int y0, int w, int h)
1662 CODE: 2095 CODE:
1663{ 2096{
1664 int x1, x; 2097 int x1, x;
1665 int y1, y; 2098 int y1, y;
1666 int z; 2099 int z;
1711} 2144}
1712 OUTPUT: 2145 OUTPUT:
1713 RETVAL 2146 RETVAL
1714 2147
1715void 2148void
1716draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1717 CODE: 2150 CODE:
1718{ 2151{
1719 int x, y, z; 2152 int x, y, z;
1720 2153
1721 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1722 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2155 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) 2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1724 smooth_key skey; 2157 smooth_key skey;
1725 2158 int pl_x, pl_y;
2159 maptex pl_tex;
1726 rc_t *rc = rc_alloc (); 2160 rc_t *rc = rc_alloc ();
2161 rc_t *rc_ov = rc_alloc ();
1727 rc_key_t key; 2162 rc_key_t key;
1728 rc_array_t *arr; 2163 rc_array_t *arr;
1729 2164
2165 pl_tex.name = 0;
2166
1730 // thats current max. sorry. 2167 // that's current max. sorry.
1731 if (sw > 255) sw = 255; 2168 if (sw > 255) sw = 255;
1732 if (sh > 255) sh = 255; 2169 if (sh > 255) sh = 255;
1733 2170
1734 // clear key, in case of extra padding 2171 // clear key, in case of extra padding
1735 memset (&skey, 0, sizeof (skey)); 2172 memset (&skey, 0, sizeof (skey));
1739 key.g = 255; 2176 key.g = 255;
1740 key.b = 255; 2177 key.b = 255;
1741 key.a = 255; 2178 key.a = 255;
1742 key.mode = GL_QUADS; 2179 key.mode = GL_QUADS;
1743 key.format = GL_T2F_V3F; 2180 key.format = GL_T2F_V3F;
1744 key.texname = -1;
1745 2181
1746 mx += self->x; 2182 mx += self->x;
1747 my += self->y; 2183 my += self->y;
1748 2184
1749 // first pass: determine smooth_max 2185 // first pass: determine smooth_max
1773 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1774 2210
1775 for (z = 0; z <= 2; z++) 2211 for (z = 0; z <= 2; z++)
1776 { 2212 {
1777 memset (smooth_level, 0, sizeof (smooth_level)); 2213 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1;
1778 2215
1779 for (y = 0; y < sh; y++) 2216 for (y = 0; y < sh; y++)
1780 if (0 <= y + my && y + my < self->rows) 2217 if (0 <= y + my && y + my < self->rows)
1781 { 2218 {
1782 maprow *row = self->row + (y + my); 2219 maprow *row = self->row + (y + my);
1790 if (tile) 2227 if (tile)
1791 { 2228 {
1792 maptex tex = self->tex [tile]; 2229 maptex tex = self->tex [tile];
1793 int px, py; 2230 int px, py;
1794 2231
1795 // suppressing texture state switches here
1796 // is only moderately effective, but worth the extra effort
1797 if (key.texname != tex.name) 2232 if (key.texname != tex.name)
1798 { 2233 {
2234 self->tex [tile].unused = 0;
2235
1799 if (!tex.name) 2236 if (!tex.name)
1800 tex = self->tex [2]; /* missing, replace by noface */ 2237 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1801 2238
1802 key.texname = tex.name; 2239 key.texname = tex.name;
1803 arr = rc_array (rc, &key); 2240 arr = rc_array (rc, &key);
1804 } 2241 }
1805 2242
1806 px = (x + 1) * T - tex.w; 2243 px = (x + 1) * T - tex.w;
1807 py = (y + 1) * T - tex.h; 2244 py = (y + 1) * T - tex.h;
2245
2246 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 {
2248 pl_x = px;
2249 pl_y = py;
2250 pl_tex = tex;
2251 continue;
2252 }
1808 2253
1809 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2254 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1810 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2255 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); 2256 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); 2257 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 2258
1839 // update smooth hash 2259 // update smooth hash
1840 if (tex.smoothtile) 2260 if (tex.smoothtile)
1841 { 2261 {
1842 skey.tile = tex.smoothtile; 2262 skey.tile = tex.smoothtile;
1873 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2293 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); 2294 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); 2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1876 } 2296 }
1877 } 2297 }
2298
2299 if (expect_false (z == 2) && expect_false (cell->flags))
2300 {
2301 // overlays such as the speech bubble, probably more to come
2302 if (cell->flags & 1)
2303 {
2304 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32;
2308 int py = y * T - T * 6 / 32;
2309
2310 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov);
2312
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2317 }
2318 }
1878 } 2319 }
1879 } 2320 }
2321
2322 rc_draw (rc);
2323 rc_clear (rc);
1880 2324
1881 // go through all smoothlevels, lowest to highest, then draw. 2325 // go through all smoothlevels, lowest to highest, then draw.
1882 // this is basically counting sort 2326 // this is basically counting sort
1883 { 2327 {
1884 int w, b; 2328 int w, b;
1885 2329
2330 glEnable (GL_TEXTURE_2D);
2331 glBegin (GL_QUADS);
1886 for (w = 0; w < 256 / 32; ++w) 2332 for (w = 0; w < 256 / 32; ++w)
1887 { 2333 {
1888 uint32_t smask = smooth_level [w]; 2334 uint32_t smask = smooth_level [w];
1889 if (smask) 2335 if (smask)
1890 for (b = 0; b < 32; ++b) 2336 for (b = 0; b < 32; ++b)
1915 { 2361 {
1916 // this time avoiding texture state changes 2362 // this time avoiding texture state changes
1917 // save gobs of state changes. 2363 // save gobs of state changes.
1918 if (key.texname != tex.name) 2364 if (key.texname != tex.name)
1919 { 2365 {
2366 self->tex [skey->tile].unused = 0;
2367
2368 glEnd ();
1920 key.texname = tex.name; 2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1921 arr = rc_array (rc, &key); 2370 glBegin (GL_QUADS);
1922 } 2371 }
1923 2372
1924 if (border) 2373 if (border)
1925 { 2374 {
1926 float ox = border * dx; 2375 float ox = border * dx;
1927 2376
1928 rc_t2f_v3f (arr, ox , 0.f , px , py , 0); 2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1929 rc_t2f_v3f (arr, ox , dy , px , py + T, 0); 2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1930 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0); 2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1931 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0); 2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1932 } 2381 }
1933 2382
1934 if (corner) 2383 if (corner)
1935 { 2384 {
1936 float ox = corner * dx; 2385 float ox = corner * dx;
1937 2386
1938 rc_t2f_v3f (arr, ox , dy , px , py , 0); 2387 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1939 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0); 2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1940 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0); 2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1941 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0); 2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
1942 } 2391 }
1943 } 2392 }
1944 } 2393 }
1945 } 2394 }
1946 } 2395 }
1947 } 2396 }
2397
2398 glEnd ();
2399 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1;
1948 } 2401 }
1949 2402
1950 hv_clear (smooth); 2403 hv_clear (smooth);
2404 }
2405
2406 if (pl_tex.name)
2407 {
2408 maptex tex = pl_tex;
2409 int px = pl_x + sdx;
2410 int py = pl_y + sdy;
2411
2412 key.texname = tex.name;
2413 arr = rc_array (rc, &key);
2414
2415 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2416 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2417 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2418 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2419
1951 rc_draw (rc); 2420 rc_draw (rc);
1952 rc_clear (rc);
1953 } 2421 }
2422
2423 rc_draw (rc_ov);
2424 rc_clear (rc_ov);
1954 2425
1955 glDisable (GL_BLEND); 2426 glDisable (GL_BLEND);
1956 rc_free (rc); 2427 rc_free (rc);
2428 rc_free (rc_ov);
1957 2429
1958 // top layer: overlays such as the health bar 2430 // top layer: overlays such as the health bar
1959 for (y = 0; y < sh; y++) 2431 for (y = 0; y < sh; y++)
1960 if (0 <= y + my && y + my < self->rows) 2432 if (0 <= y + my && y + my < self->rows)
1961 { 2433 {
1966 { 2438 {
1967 mapcell *cell = row->col + (x + mx - row->c0); 2439 mapcell *cell = row->col + (x + mx - row->c0);
1968 2440
1969 int px = x * T; 2441 int px = x * T;
1970 int py = y * T; 2442 int py = y * T;
2443
2444 if (expect_false (cell->player == player))
2445 {
2446 px += sdx;
2447 py += sdy;
2448 }
1971 2449
1972 if (cell->stat_hp) 2450 if (cell->stat_hp)
1973 { 2451 {
1974 int width = cell->stat_width * T; 2452 int width = cell->stat_width * T;
1975 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1986 } 2464 }
1987 } 2465 }
1988} 2466}
1989 2467
1990void 2468void
1991draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2469draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1992 CODE: 2470 CODE:
1993{ 2471{
1994 static float color[16][3] = { 2472 static float color[16][3] = {
1995 { 0.00F, 0.00F, 0.00F }, 2473 { 0.00f, 0.00f, 0.00f },
1996 { 1.00F, 1.00F, 1.00F }, 2474 { 1.00f, 1.00f, 1.00f },
1997 { 0.00F, 0.00F, 0.55F }, 2475 { 0.00f, 0.00f, 0.55f },
1998 { 1.00F, 0.00F, 0.00F }, 2476 { 1.00f, 0.00f, 0.00f },
1999 2477
2000 { 1.00F, 0.54F, 0.00F }, 2478 { 1.00f, 0.54f, 0.00f },
2001 { 0.11F, 0.56F, 1.00F }, 2479 { 0.11f, 0.56f, 1.00f },
2002 { 0.93F, 0.46F, 0.00F }, 2480 { 0.93f, 0.46f, 0.00f },
2003 { 0.18F, 0.54F, 0.34F }, 2481 { 0.18f, 0.54f, 0.34f },
2004 2482
2005 { 0.56F, 0.73F, 0.56F }, 2483 { 0.56f, 0.73f, 0.56f },
2006 { 0.80F, 0.80F, 0.80F }, 2484 { 0.80f, 0.80f, 0.80f },
2007 { 0.55F, 0.41F, 0.13F }, 2485 { 0.55f, 0.41f, 0.13f },
2008 { 0.99F, 0.77F, 0.26F }, 2486 { 0.99f, 0.77f, 0.26f },
2009 2487
2010 { 0.74F, 0.65F, 0.41F }, 2488 { 0.74f, 0.65f, 0.41f },
2011 2489
2012 { 0.00F, 1.00F, 1.00F }, 2490 { 0.00f, 1.00f, 1.00f },
2013 { 1.00F, 0.00F, 1.00F }, 2491 { 1.00f, 0.00f, 1.00f },
2014 { 1.00F, 1.00F, 0.00F }, 2492 { 1.00f, 1.00f, 0.00f },
2015 }; 2493 };
2016 2494
2017 int x, y; 2495 int x, y;
2018 2496
2019 glEnable (GL_TEXTURE_2D); 2497 glEnable (GL_TEXTURE_2D);
2498 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2499 * but the nvidia driver (185.18.14) mishandles alpha textures
2500 * and takes the colour from god knows where instead of using
2501 * Cp. MODULATE results in the same colour, but slightly different
2502 * alpha, but atcually gives us the correct colour with nvidia.
2503 */
2020 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2504 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2021 glEnable (GL_BLEND); 2505 glEnable (GL_BLEND);
2022 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2506 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2023 glBegin (GL_QUADS); 2507 glBegin (GL_QUADS);
2024 2508
2025 for (y = 0; y < h; y++) 2509 for (y = 0; y < h; y++)
2029 2513
2030 if (m) 2514 if (m)
2031 { 2515 {
2032 float *c = color [m & 15]; 2516 float *c = color [m & 15];
2033 2517
2034 float tx1 = m & 0x40 ? 0.5 : 0.; 2518 float tx1 = m & 0x40 ? 0.5f : 0.f;
2035 float tx2 = tx1 + 0.5; 2519 float tx2 = tx1 + 0.5f;
2036 2520
2037 glColor4f (c[0], c[1], c[2], 0.75); 2521 glColor4f (c[0], c[1], c[2], 1);
2038 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2522 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2039 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2523 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2040 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2524 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2041 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2525 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2042 } 2526 }
2046 glDisable (GL_BLEND); 2530 glDisable (GL_BLEND);
2047 glDisable (GL_TEXTURE_2D); 2531 glDisable (GL_TEXTURE_2D);
2048} 2532}
2049 2533
2050void 2534void
2051fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2535fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2052 PPCODE: 2536 PPCODE:
2053{ 2537{
2054 int x, y; 2538 int x, y;
2055 int sw1 = sw + 2; 2539 int sw1 = sw + 2;
2056 int sh1 = sh + 2; 2540 int sh1 = sh + 2;
2057 int sh3 = sh * 3; 2541 int sh3 = sh * 3;
2058 int sw34 = (sw * 3 + 3) & ~3; 2542 int sw3 = sw * 3;
2059 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2060 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2061 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2062 2546
2063 SvPOK_only (darkness3_sv); 2547 SvPOK_only (darkness3_sv);
2064 SvCUR_set (darkness3_sv, sw34 * sh3); 2548 SvCUR_set (darkness3_sv, sw3 * sh3);
2065 2549
2066 mx += self->x - 1; 2550 mx += self->x - 1;
2067 my += self->y - 1; 2551 my += self->y - 1;
2068
2069 memset (darkness1, 255, sw1 * sh1);
2070 2552
2071 for (y = 0; y < sh1; y++) 2553 for (y = 0; y < sh1; y++)
2072 if (0 <= y + my && y + my < self->rows) 2554 if (0 <= y + my && y + my < self->rows)
2073 { 2555 {
2074 maprow *row = self->row + (y + my); 2556 maprow *row = self->row + (y + my);
2077 if (row->c0 <= x + mx && x + mx < row->c1) 2559 if (row->c0 <= x + mx && x + mx < row->c1)
2078 { 2560 {
2079 mapcell *cell = row->col + (x + mx - row->c0); 2561 mapcell *cell = row->col + (x + mx - row->c0);
2080 2562
2081 darkness1 [y * sw1 + x] = cell->darkness 2563 darkness1 [y * sw1 + x] = cell->darkness
2082 ? 255 - (cell->darkness - 1) 2564 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2083 : 255 - FOW_DARKNESS; 2565 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2084 } 2566 }
2085 } 2567 }
2086 2568
2087 for (y = 0; y < sh; ++y) 2569 for (y = 0; y < sh; ++y)
2088 for (x = 0; x < sw; ++x) 2570 for (x = 0; x < sw; ++x)
2107 2589
2108 uint8_t r13 = (d13 + d23 + d12) / 3; 2590 uint8_t r13 = (d13 + d23 + d12) / 3;
2109 uint8_t r23 = d23; 2591 uint8_t r23 = d23;
2110 uint8_t r33 = (d23 + d33 + d32) / 3; 2592 uint8_t r33 = (d23 + d33 + d32) / 3;
2111 2593
2112 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2594 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2113 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2595 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2114 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2596 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2115 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2597 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2116 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2598 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); 2599 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2118 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2600 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2119 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2601 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2120 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2602 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2121 } 2603 }
2122 2604
2123 free (darkness1); 2605 free (darkness1);
2124 2606
2125 EXTEND (SP, 3); 2607 EXTEND (SP, 3);
2126 PUSHs (sv_2mortal (newSViv (sw34))); 2608 PUSHs (sv_2mortal (newSViv (sw3)));
2127 PUSHs (sv_2mortal (newSViv (sh3))); 2609 PUSHs (sv_2mortal (newSViv (sh3)));
2128 PUSHs (darkness3_sv); 2610 PUSHs (darkness3_sv);
2129} 2611}
2130 2612
2131SV * 2613SV *
2132get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2614get_rect (DC::Map self, int x0, int y0, int w, int h)
2133 CODE: 2615 CODE:
2134{ 2616{
2135 int x, y, x1, y1; 2617 int x, y, x1, y1;
2136 SV *data_sv = newSV (w * h * 7 + 5); 2618 SV *data_sv = newSV (w * h * 7 + 5);
2137 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2619 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2194 else 2676 else
2195 *data++ = 0; 2677 *data++ = 0;
2196 } 2678 }
2197 } 2679 }
2198 2680
2681 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 {
2199 SvPOK_only (data_sv); 2684 SvPOK_only (data_sv);
2200 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 }
2687
2201 RETVAL = data_sv; 2688 RETVAL = data_sv;
2202} 2689}
2203 OUTPUT: 2690 OUTPUT:
2204 RETVAL 2691 RETVAL
2205 2692
2206void 2693void
2207set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2694set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2208 PPCODE: 2695 PPCODE:
2209{ 2696{
2210 int x, y, z; 2697 int x, y, z;
2211 int w, h; 2698 int w, h;
2212 int x1, y1; 2699 int x1, y1;
2700 STRLEN len;
2701 uint8_t *data, *end;
2702
2703 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv);
2706 end = data + len + 8;
2707
2708 if (len < 5)
2709 XSRETURN_EMPTY;
2213 2710
2214 if (*data++ != 0) 2711 if (*data++ != 0)
2215 return; /* version mismatch */ 2712 XSRETURN_EMPTY; /* version mismatch */
2216 2713
2217 w = *data++ << 8; w |= *data++; 2714 w = *data++ << 8; w |= *data++;
2218 h = *data++ << 8; h |= *data++; 2715 h = *data++ << 8; h |= *data++;
2219 2716
2220 // we need to do this 'cause we don't keep an absolute coord system for rows 2717 // we need to do this 'cause we don't keep an absolute coord system for rows
2232 { 2729 {
2233 maprow *row = map_get_row (self, y); 2730 maprow *row = map_get_row (self, y);
2234 2731
2235 for (x = x0; x < x1; x++) 2732 for (x = x0; x < x1; x++)
2236 { 2733 {
2734 uint8_t flags;
2735
2736 if (data + 7 >= end)
2737 XSRETURN_EMPTY;
2738
2237 uint8_t flags = *data++; 2739 flags = *data++;
2238 2740
2239 if (flags) 2741 if (flags)
2240 { 2742 {
2241 mapcell *cell = row_get_cell (row, x); 2743 mapcell *cell = row_get_cell (row, x);
2242 tileid tile[3] = { 0, 0, 0 }; 2744 tileid tile[3] = { 0, 0, 0 };
2245 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2747 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2246 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2748 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2247 2749
2248 if (cell->darkness == 0) 2750 if (cell->darkness == 0)
2249 { 2751 {
2250 cell->darkness = 0; 2752 /*cell->darkness = 0;*/
2753 EXTEND (SP, 3);
2251 2754
2252 for (z = 0; z <= 2; z++) 2755 for (z = 0; z <= 2; z++)
2253 { 2756 {
2254 tileid t = tile [z]; 2757 tileid t = tile [z];
2255 2758
2256 if (t >= self->texs || (t && !self->tex [t].name)) 2759 if (t >= self->texs || (t && !self->tex [t].name))
2257 { 2760 {
2258 XPUSHs (sv_2mortal (newSViv (t))); 2761 PUSHs (sv_2mortal (newSViv (t)));
2259 need_texid (self, t); 2762 need_texid (self, t);
2260 } 2763 }
2261 2764
2262 cell->tile [z] = t; 2765 cell->tile [z] = t;
2263 } 2766 }
2265 } 2768 }
2266 } 2769 }
2267 } 2770 }
2268} 2771}
2269 2772
2270MODULE = CFPlus PACKAGE = CFPlus::RW 2773MODULE = Deliantra::Client PACKAGE = DC::RW
2271 2774
2272CFPlus::RW 2775DC::RW
2273new (SV *class, SV *data_sv) 2776new (SV *class, SV *data_sv)
2274 CODE: 2777 CODE:
2275{ 2778{
2276 STRLEN datalen; 2779 STRLEN datalen;
2277 char *data = SvPVbyte (data_sv, datalen); 2780 char *data = SvPVbyte (data_sv, datalen);
2279 RETVAL = SDL_RWFromConstMem (data, datalen); 2782 RETVAL = SDL_RWFromConstMem (data, datalen);
2280} 2783}
2281 OUTPUT: 2784 OUTPUT:
2282 RETVAL 2785 RETVAL
2283 2786
2284CFPlus::RW 2787DC::RW
2285new_from_file (SV *class, const char *path, const char *mode = "rb") 2788new_from_file (SV *class, const char *path, const char *mode = "rb")
2286 CODE: 2789 CODE:
2287 RETVAL = SDL_RWFromFile (path, mode); 2790 RETVAL = SDL_RWFromFile (path, mode);
2288 OUTPUT: 2791 OUTPUT:
2289 RETVAL 2792 RETVAL
2290 2793
2291# fails on win32: 2794# fails on win32:
2292# CFPlus.xs(2268) : error C2059: syntax error : '(' 2795# dc.xs(2268) : error C2059: syntax error : '('
2293#void 2796#void
2294#close (CFPlus::RW self) 2797#close (DC::RW self)
2295# CODE: 2798# CODE:
2296# (self->(close)) (self); 2799# (self->(close)) (self);
2297 2800
2298MODULE = CFPlus PACKAGE = CFPlus::Channel 2801MODULE = Deliantra::Client PACKAGE = DC::Channel
2299 2802
2300PROTOTYPES: DISABLE 2803PROTOTYPES: DISABLE
2301 2804
2302CFPlus::Channel 2805DC::Channel
2303find () 2806find ()
2304 CODE: 2807 CODE:
2305{ 2808{
2306 RETVAL = Mix_GroupAvailable (-1); 2809 RETVAL = Mix_GroupAvailable (-1);
2307 2810
2308 if (RETVAL < 0) 2811 if (RETVAL < 0)
2309 { 2812 {
2310 RETVAL = Mix_GroupOldest (-1); 2813 RETVAL = Mix_GroupOldest (-1);
2311 2814
2312 if (RETVAL < 0) 2815 if (RETVAL < 0)
2816 {
2817 // happens sometimes, maybe it just stopped playing(?)
2818 RETVAL = Mix_GroupAvailable (-1);
2819
2820 if (RETVAL < 0)
2313 XSRETURN_UNDEF; 2821 XSRETURN_UNDEF;
2314 2822 }
2823 else
2315 Mix_HaltChannel (RETVAL); 2824 Mix_HaltChannel (RETVAL);
2316 } 2825 }
2317 2826
2318 Mix_UnregisterAllEffects (RETVAL); 2827 Mix_UnregisterAllEffects (RETVAL);
2319 Mix_Volume (RETVAL, 128); 2828 Mix_Volume (RETVAL, 128);
2320} 2829}
2321 OUTPUT: 2830 OUTPUT:
2322 RETVAL 2831 RETVAL
2323 2832
2324void 2833void
2325halt (CFPlus::Channel self) 2834halt (DC::Channel self)
2326 CODE: 2835 CODE:
2327 Mix_HaltChannel (self); 2836 Mix_HaltChannel (self);
2328 2837
2329void 2838void
2330expire (CFPlus::Channel self, int ticks = -1) 2839expire (DC::Channel self, int ticks = -1)
2331 CODE: 2840 CODE:
2332 Mix_ExpireChannel (self, ticks); 2841 Mix_ExpireChannel (self, ticks);
2333 2842
2334void 2843void
2335fade_out (CFPlus::Channel self, int ticks = -1) 2844fade_out (DC::Channel self, int ticks = -1)
2336 CODE: 2845 CODE:
2337 Mix_FadeOutChannel (self, ticks); 2846 Mix_FadeOutChannel (self, ticks);
2338 2847
2339int 2848int
2340volume (CFPlus::Channel self, int volume) 2849volume (DC::Channel self, int volume)
2341 CODE: 2850 CODE:
2342 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2851 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2343 OUTPUT: 2852 OUTPUT:
2344 RETVAL 2853 RETVAL
2345 2854
2346void 2855void
2347unregister_all_effects (CFPlus::Channel self) 2856unregister_all_effects (DC::Channel self)
2348 CODE: 2857 CODE:
2349 Mix_UnregisterAllEffects (self); 2858 Mix_UnregisterAllEffects (self);
2350 2859
2351void 2860void
2352set_panning (CFPlus::Channel self, int left, int right) 2861set_panning (DC::Channel self, int left, int right)
2353 CODE: 2862 CODE:
2354 left = CLAMP (left , 0, 255); 2863 left = CLAMP (left , 0, 255);
2355 right = CLAMP (right, 0, 255); 2864 right = CLAMP (right, 0, 255);
2356 Mix_SetPanning (self, left, right); 2865 Mix_SetPanning (self, left, right);
2357 2866
2358void 2867void
2359set_distance (CFPlus::Channel self, int distance) 2868set_distance (DC::Channel self, int distance)
2360 CODE: 2869 CODE:
2361 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2870 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2362 2871
2363void 2872void
2364set_position (CFPlus::Channel self, int angle, int distance) 2873set_position (DC::Channel self, int angle, int distance)
2365 CODE: 2874 CODE:
2366 2875
2367void 2876void
2368set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2877set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2369 CODE: 2878 CODE:
2370{ 2879{
2371 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2880 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); 2881 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2373 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2882 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2374} 2883}
2375 2884
2376void 2885void
2377set_reverse_stereo (CFPlus::Channel self, int flip) 2886set_reverse_stereo (DC::Channel self, int flip)
2378 CODE: 2887 CODE:
2379 Mix_SetReverseStereo (self, flip); 2888 Mix_SetReverseStereo (self, flip);
2380 2889
2381MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2890MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2382 2891
2383PROTOTYPES: DISABLE 2892PROTOTYPES: DISABLE
2384 2893
2894void
2895decoders ()
2896 PPCODE:
2897#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2898 int i, num = Mix_GetNumChunkDecoders ();
2899 EXTEND (SP, num);
2900 for (i = 0; i < num; ++i)
2901 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2902#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif
2905
2385CFPlus::MixChunk 2906DC::MixChunk
2386new (SV *class, CFPlus::RW rwops) 2907new (SV *class, DC::RW rwops)
2387 CODE: 2908 CODE:
2388 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2909 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2389 OUTPUT: 2910 OUTPUT:
2390 RETVAL 2911 RETVAL
2391 2912
2392void 2913void
2393DESTROY (CFPlus::MixChunk self) 2914DESTROY (DC::MixChunk self)
2394 CODE: 2915 CODE:
2395 Mix_FreeChunk (self); 2916 Mix_FreeChunk (self);
2396 2917
2397int 2918int
2398volume (CFPlus::MixChunk self, int volume = -1) 2919volume (DC::MixChunk self, int volume = -1)
2399 CODE: 2920 CODE:
2400 if (items > 1) 2921 if (items > 1)
2401 volume = CLAMP (volume, 0, 128); 2922 volume = CLAMP (volume, 0, 128);
2402 RETVAL = Mix_VolumeChunk (self, volume); 2923 RETVAL = Mix_VolumeChunk (self, volume);
2403 OUTPUT: 2924 OUTPUT:
2404 RETVAL 2925 RETVAL
2405 2926
2406CFPlus::Channel 2927DC::Channel
2407play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2928play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2408 CODE: 2929 CODE:
2409{ 2930{
2410 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2931 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2411 2932
2412 if (RETVAL < 0) 2933 if (RETVAL < 0)
2419 } 2940 }
2420} 2941}
2421 OUTPUT: 2942 OUTPUT:
2422 RETVAL 2943 RETVAL
2423 2944
2424MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2945MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2946
2947void
2948decoders ()
2949 PPCODE:
2950#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2951 int i, num = Mix_GetNumMusicDecoders ();
2952 EXTEND (SP, num);
2953 for (i = 0; i < num; ++i)
2954 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2955#else
2956 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2957#endif
2425 2958
2426int 2959int
2427volume (int volume = -1) 2960volume (int volume = -1)
2428 PROTOTYPE: ;$ 2961 PROTOTYPE: ;$
2429 CODE: 2962 CODE:
2441void 2974void
2442halt () 2975halt ()
2443 CODE: 2976 CODE:
2444 Mix_HaltMusic (); 2977 Mix_HaltMusic ();
2445 2978
2979int
2980playing ()
2981 CODE:
2982 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT:
2984 RETVAL
2985
2446CFPlus::MixMusic 2986DC::MixMusic
2447new (SV *class, CFPlus::RW rwops) 2987new (SV *class, DC::RW rwops)
2448 CODE: 2988 CODE:
2449 RETVAL = Mix_LoadMUS_RW (rwops); 2989 RETVAL = Mix_LoadMUS_RW (rwops);
2450 OUTPUT: 2990 OUTPUT:
2451 RETVAL 2991 RETVAL
2452 2992
2453void 2993void
2454DESTROY (CFPlus::MixMusic self) 2994DESTROY (DC::MixMusic self)
2455 CODE: 2995 CODE:
2456 Mix_FreeMusic (self); 2996 Mix_FreeMusic (self);
2457 2997
2458int 2998int
2459play (CFPlus::MixMusic self, int loops = -1) 2999play (DC::MixMusic self, int loops = -1)
2460 CODE: 3000 CODE:
2461 RETVAL = Mix_PlayMusic (self, loops); 3001 RETVAL = Mix_PlayMusic (self, loops);
2462 OUTPUT: 3002 OUTPUT:
2463 RETVAL 3003 RETVAL
2464 3004
2465void 3005void
2466fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 3006fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2467 CODE: 3007 CODE:
2468 Mix_FadeInMusicPos (self, loops, ms, position); 3008 Mix_FadeInMusicPos (self, loops, ms, position);
2469 3009
2470MODULE = CFPlus PACKAGE = CFPlus::OpenGL 3010MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2471 3011
2472PROTOTYPES: ENABLE 3012PROTOTYPES: ENABLE
2473 3013
2474BOOT: 3014BOOT:
2475{ 3015{
2476 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 3016 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2477 static const struct { 3017 static const struct {
2478 const char *name; 3018 const char *name;
2479 IV iv; 3019 IV iv;
2480 } *civ, const_iv[] = { 3020 } *civ, const_iv[] = {
2481# define const_iv(name) { # name, (IV)name } 3021# define const_iv(name) { # name, (IV)name }
2482 const_iv (GL_VENDOR), 3022 const_iv (GL_VENDOR),
2483 const_iv (GL_VERSION), 3023 const_iv (GL_VERSION),
2484 const_iv (GL_EXTENSIONS), 3024 const_iv (GL_EXTENSIONS),
3025 const_iv (GL_MAX_TEXTURE_UNITS),
2485 const_iv (GL_COLOR_MATERIAL), 3026 const_iv (GL_COLOR_MATERIAL),
2486 const_iv (GL_SMOOTH), 3027 const_iv (GL_SMOOTH),
2487 const_iv (GL_FLAT), 3028 const_iv (GL_FLAT),
2488 const_iv (GL_DITHER), 3029 const_iv (GL_DITHER),
2489 const_iv (GL_BLEND), 3030 const_iv (GL_BLEND),
2501 const_iv (GL_ZERO), 3042 const_iv (GL_ZERO),
2502 const_iv (GL_SRC_ALPHA), 3043 const_iv (GL_SRC_ALPHA),
2503 const_iv (GL_DST_ALPHA), 3044 const_iv (GL_DST_ALPHA),
2504 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3045 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2505 const_iv (GL_ONE_MINUS_DST_ALPHA), 3046 const_iv (GL_ONE_MINUS_DST_ALPHA),
3047 const_iv (GL_SRC_COLOR),
3048 const_iv (GL_DST_COLOR),
3049 const_iv (GL_ONE_MINUS_SRC_COLOR),
3050 const_iv (GL_ONE_MINUS_DST_COLOR),
2506 const_iv (GL_SRC_ALPHA_SATURATE), 3051 const_iv (GL_SRC_ALPHA_SATURATE),
2507 const_iv (GL_RGB), 3052 const_iv (GL_RGB),
2508 const_iv (GL_RGBA), 3053 const_iv (GL_RGBA),
2509 const_iv (GL_RGBA4), 3054 const_iv (GL_RGBA4),
2510 const_iv (GL_RGBA8), 3055 const_iv (GL_RGBA8),
2516 const_iv (GL_INTENSITY), 3061 const_iv (GL_INTENSITY),
2517 const_iv (GL_LUMINANCE), 3062 const_iv (GL_LUMINANCE),
2518 const_iv (GL_LUMINANCE_ALPHA), 3063 const_iv (GL_LUMINANCE_ALPHA),
2519 const_iv (GL_FLOAT), 3064 const_iv (GL_FLOAT),
2520 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3065 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3066 const_iv (GL_COMPRESSED_ALPHA_ARB),
3067 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3068 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3069 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3070 const_iv (GL_COMPRESSED_RGB_ARB),
3071 const_iv (GL_COMPRESSED_RGBA_ARB),
2521 const_iv (GL_COMPILE), 3072 const_iv (GL_COMPILE),
2522 const_iv (GL_PROXY_TEXTURE_1D), 3073 const_iv (GL_PROXY_TEXTURE_1D),
2523 const_iv (GL_PROXY_TEXTURE_2D), 3074 const_iv (GL_PROXY_TEXTURE_2D),
2524 const_iv (GL_TEXTURE_1D), 3075 const_iv (GL_TEXTURE_1D),
2525 const_iv (GL_TEXTURE_2D), 3076 const_iv (GL_TEXTURE_2D),
2564 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3115 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2565 const_iv (GL_POINT_SMOOTH_HINT), 3116 const_iv (GL_POINT_SMOOTH_HINT),
2566 const_iv (GL_LINE_SMOOTH_HINT), 3117 const_iv (GL_LINE_SMOOTH_HINT),
2567 const_iv (GL_POLYGON_SMOOTH_HINT), 3118 const_iv (GL_POLYGON_SMOOTH_HINT),
2568 const_iv (GL_GENERATE_MIPMAP_HINT), 3119 const_iv (GL_GENERATE_MIPMAP_HINT),
3120 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2569 const_iv (GL_FASTEST), 3121 const_iv (GL_FASTEST),
2570 const_iv (GL_DONT_CARE), 3122 const_iv (GL_DONT_CARE),
2571 const_iv (GL_NICEST), 3123 const_iv (GL_NICEST),
2572 const_iv (GL_V2F), 3124 const_iv (GL_V2F),
2573 const_iv (GL_V3F), 3125 const_iv (GL_V3F),
2574 const_iv (GL_T2F_V3F), 3126 const_iv (GL_T2F_V3F),
2575 const_iv (GL_T2F_N3F_V3F), 3127 const_iv (GL_T2F_N3F_V3F),
3128 const_iv (GL_FUNC_ADD),
3129 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2576# undef const_iv 3131# undef const_iv
2577 }; 3132 };
2578 3133
2579 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2580 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2581 3136
2582 texture_av = newAV (); 3137 texture_av = newAV ();
2583 AvREAL_off (texture_av); 3138 AvREAL_off (texture_av);
2584} 3139}
2585 3140
3141void
3142disable_GL_EXT_blend_func_separate ()
3143 CODE:
3144 gl.BlendFuncSeparate = 0;
3145 gl.BlendFuncSeparateEXT = 0;
3146
3147void
3148apple_nvidia_bug (int enable)
3149
2586char * 3150char *
2587gl_vendor () 3151gl_vendor ()
2588 CODE: 3152 CODE:
2589 RETVAL = (char *)glGetString (GL_VENDOR); 3153 RETVAL = (char *)glGetString (GL_VENDOR);
2590 OUTPUT: 3154 OUTPUT:
2620 3184
2621int glGetError () 3185int glGetError ()
2622 3186
2623void glFinish () 3187void glFinish ()
2624 3188
3189void glFlush ()
3190
2625void glClear (int mask) 3191void glClear (int mask)
2626 3192
2627void glClearColor (float r, float g, float b, float a = 1.0) 3193void glClearColor (float r, float g, float b, float a = 1.0)
2628 PROTOTYPE: @ 3194 PROTOTYPE: @
2629 3195
2638void glBlendFunc (int sfactor, int dfactor) 3204void glBlendFunc (int sfactor, int dfactor)
2639 3205
2640void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3206void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2641 CODE: 3207 CODE:
2642 gl_BlendFuncSeparate (sa, da, saa, daa); 3208 gl_BlendFuncSeparate (sa, da, saa, daa);
3209
3210# void glBlendEquation (int se)
2643 3211
2644void glDepthMask (int flag) 3212void glDepthMask (int flag)
2645 3213
2646void glLogicOp (int opcode) 3214void glLogicOp (int opcode)
2647 3215
2682void glRotate (float angle, float x, float y, float z) 3250void glRotate (float angle, float x, float y, float z)
2683 CODE: 3251 CODE:
2684 glRotatef (angle, x, y, z); 3252 glRotatef (angle, x, y, z);
2685 3253
2686void glColor (float r, float g, float b, float a = 1.0) 3254void glColor (float r, float g, float b, float a = 1.0)
3255 PROTOTYPE: @
2687 ALIAS: 3256 ALIAS:
2688 glColor_premultiply = 1 3257 glColor_premultiply = 1
2689 CODE: 3258 CODE:
2690 if (ix) 3259 if (ix)
2691 { 3260 {
2711 3280
2712void glRect (float x1, float y1, float x2, float y2) 3281void glRect (float x1, float y1, float x2, float y2)
2713 CODE: 3282 CODE:
2714 glRectf (x1, y1, x2, y2); 3283 glRectf (x1, y1, x2, y2);
2715 3284
3285void glRect_lineloop (float x1, float y1, float x2, float y2)
3286 CODE:
3287 glBegin (GL_LINE_LOOP);
3288 glVertex2f (x1, y1);
3289 glVertex2f (x2, y1);
3290 glVertex2f (x2, y2);
3291 glVertex2f (x1, y2);
3292 glEnd ();
3293
2716PROTOTYPES: ENABLE 3294PROTOTYPES: ENABLE
2717 3295
2718void glBegin (int mode) 3296void glBegin (int mode)
2719 3297
2720void glEnd () 3298void glEnd ()
2752void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3330void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2753 CODE: 3331 CODE:
2754 if (gl.SeparableFilter2D) 3332 if (gl.SeparableFilter2D)
2755 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3333 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2756 3334
2757void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3335void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2758 3336
2759void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3337void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2760 3338
2761void glDrawPixels (int width, int height, int format, int type, char *pixels) 3339void glDrawPixels (int width, int height, int format, int type, char *pixels)
2762 3340
2788 3366
2789void glEndList () 3367void glEndList ()
2790 3368
2791void glCallList (int list) 3369void glCallList (int list)
2792 3370
2793MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3371void c_init ()
3372 CODE:
3373 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3374 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3375
3376MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2794 3377
2795PROTOTYPES: DISABLE 3378PROTOTYPES: DISABLE
2796 3379
2797void 3380void
2798find_widget (SV *self, NV x, NV y) 3381find_widget (SV *self, NV x, NV y)
2802 XPUSHs (self); 3385 XPUSHs (self);
2803} 3386}
2804 3387
2805BOOT: 3388BOOT:
2806{ 3389{
2807 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3390 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2808 3391
2809 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3392 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); 3393 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); 3394 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); 3395 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2813} 3396}
2814 3397
2815void 3398void
2816draw (SV *self) 3399draw (SV *self)
2817 CODE: 3400 CODE:
2821 NV x, y, w, h; 3404 NV x, y, w, h;
2822 SV *draw_x_sv = GvSV (draw_x_gv); 3405 SV *draw_x_sv = GvSV (draw_x_gv);
2823 SV *draw_y_sv = GvSV (draw_y_gv); 3406 SV *draw_y_sv = GvSV (draw_y_gv);
2824 SV *draw_w_sv = GvSV (draw_w_gv); 3407 SV *draw_w_sv = GvSV (draw_w_gv);
2825 SV *draw_h_sv = GvSV (draw_h_gv); 3408 SV *draw_h_sv = GvSV (draw_h_gv);
2826 SV *hover;
2827 double draw_x, draw_y, draw_w, draw_h; 3409 double draw_x, draw_y;
2828 3410
2829 if (!SvROK (self)) 3411 if (!SvROK (self))
2830 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3412 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2831 3413
2832 hv = (HV *)SvRV (self); 3414 hv = (HV *)SvRV (self);
2833 3415
2834 if (SvTYPE (hv) != SVt_PVHV) 3416 if (SvTYPE (hv) != SVt_PVHV)
2835 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3417 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2836 3418
2837 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3419 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.; 3420 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2839 3421
2840 if (!h || !w) 3422 if (!h || !w)
2860 { 3442 {
2861 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3443 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2862 3444
2863 if (svp && SvTRUE (*svp)) 3445 if (svp && SvTRUE (*svp))
2864 { 3446 {
2865 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3447 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2866 glEnable (GL_BLEND); 3448 glEnable (GL_BLEND);
2867 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3449 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2868 glBegin (GL_QUADS); 3450 glBegin (GL_QUADS);
2869 glVertex2f (0, 0); 3451 glVertex2f (0, 0);
2870 glVertex2f (w, 0); 3452 glVertex2f (w, 0);
2873 glEnd (); 3455 glEnd ();
2874 glDisable (GL_BLEND); 3456 glDisable (GL_BLEND);
2875 } 3457 }
2876 } 3458 }
2877#if 0 3459#if 0
2878 if ($ENV{CFPLUS_DEBUG} & 1) { 3460 // draw borders, for debugging
2879 glPushMatrix; 3461 glPushMatrix ();
2880 glColor 1, 1, 0, 1; 3462 glColor4f (1., 1., 0., 1.);
2881 glTranslate 0.375, 0.375; 3463 glTranslatef (.5, .5, 0.);
2882 glBegin GL_LINE_LOOP; 3464 glBegin (GL_LINE_LOOP);
2883 glVertex 0 , 0; 3465 glVertex2f (0 , 0);
2884 glVertex $self->{w} - 1, 0; 3466 glVertex2f (w - 1, 0);
2885 glVertex $self->{w} - 1, $self->{h} - 1; 3467 glVertex2f (w - 1, h - 1);
2886 glVertex 0 , $self->{h} - 1; 3468 glVertex2f (0 , h - 1);
2887 glEnd; 3469 glEnd ();
2888 glPopMatrix; 3470 glPopMatrix ();
2889 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2890 }
2891#endif 3471#endif
2892 PUSHMARK (SP); 3472 PUSHMARK (SP);
2893 XPUSHs (self); 3473 XPUSHs (self);
2894 PUTBACK; 3474 PUTBACK;
2895 call_method ("_draw", G_VOID | G_DISCARD); 3475 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines