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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 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{
114 av_push (texture_av, (SV *)(size_t)name); 145 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name); 146 glDeleteTextures (1, &name);
116} 147}
117 148
118#include "texcache.c" 149#include "texcache.c"
150#include "rendercache.c"
119 151
120#include "pango-font.c" 152#include "pango-font.c"
121#include "pango-fontmap.c" 153#include "pango-fontmap.c"
122#include "pango-render.c" 154#include "pango-render.c"
123 155
124typedef IV CFPlus__Channel; 156typedef IV DC__Channel;
125typedef SDL_RWops *CFPlus__RW; 157typedef SDL_RWops *DC__RW;
126typedef Mix_Chunk *CFPlus__MixChunk; 158typedef Mix_Chunk *DC__MixChunk;
127typedef Mix_Music *CFPlus__MixMusic; 159typedef Mix_Music *DC__MixMusic;
128 160
129typedef PangoFontDescription *CFPlus__Font; 161typedef PangoFontDescription *DC__Font;
130 162
131static int 163static int
132shape_attr_p (PangoLayoutRun *run) 164shape_attr_p (PangoLayoutRun *run)
133{ 165{
134 GSList *attrs = run->item->analysis.extra_attrs; 166 GSList *attrs = run->item->analysis.extra_attrs;
148 180
149typedef struct cf_layout { 181typedef struct cf_layout {
150 PangoLayout *pl; 182 PangoLayout *pl;
151 float r, g, b, a; // default color for rgba mode 183 float r, g, b, a; // default color for rgba mode
152 int base_height; 184 int base_height;
153 CFPlus__Font font; 185 DC__Font font;
186 rc_t *rc;
154} *CFPlus__Layout; 187} *DC__Layout;
155 188
156static CFPlus__Font default_font; 189static DC__Font default_font;
157static PangoContext *opengl_context; 190static PangoContext *opengl_context;
158static PangoFontMap *opengl_fontmap; 191static PangoFontMap *opengl_fontmap;
159 192
160static void 193static void
161substitute_func (FcPattern *pattern, gpointer data) 194substitute_func (FcPattern *pattern, gpointer data)
166#endif 199#endif
167 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 200 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168} 201}
169 202
170static void 203static void
171layout_update_font (CFPlus__Layout self) 204layout_update_font (DC__Layout self)
172{ 205{
173 /* 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
174 * reasonably well with bitstream vera 207 * reasonably well with dejavu/bistream fonts
175 */ 208 */
176 PangoFontDescription *font = self->font ? self->font : default_font; 209 PangoFontDescription *font = self->font ? self->font : default_font;
177 210
178 pango_font_description_set_absolute_size (font, 211 pango_font_description_set_absolute_size (font,
179 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 212 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
180 213
181 pango_layout_set_font_description (self->pl, font); 214 pango_layout_set_font_description (self->pl, font);
182} 215}
183 216
184static void 217static void
185layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 218layout_get_pixel_size (DC__Layout self, int *w, int *h)
186{ 219{
187 PangoRectangle rect; 220 PangoRectangle rect;
188 221
189 // get_pixel_* wrongly rounds down 222 // get_pixel_* wrongly rounds down
190 pango_layout_get_extents (self->pl, 0, &rect); 223 pango_layout_get_extents (self->pl, 0, &rect);
201 234
202typedef uint16_t tileid; 235typedef uint16_t tileid;
203typedef uint16_t faceid; 236typedef uint16_t faceid;
204 237
205typedef struct { 238typedef struct {
206 int name; 239 GLuint name;
207 int w, h; 240 int w, h;
208 float s, t; 241 float s, t;
209 uint8_t r, g, b, a; 242 uint8_t r, g, b, a;
210 tileid smoothtile; 243 tileid smoothtile;
211 uint8_t smoothlevel; 244 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */
212} maptex; 246} maptex;
213 247
214typedef struct { 248typedef struct {
215 uint32_t player; 249 uint32_t player;
216 tileid tile[3]; 250 tileid tile[3];
229 int faces; tileid *face2tile; // [faceid] 263 int faces; tileid *face2tile; // [faceid]
230 int texs; maptex *tex; // [tileid] 264 int texs; maptex *tex; // [tileid]
231 265
232 int32_t rows; 266 int32_t rows;
233 maprow *row; 267 maprow *row;
234} *CFPlus__Map; 268} *DC__Map;
235 269
236static char * 270static char *
237prepend (char *ptr, int sze, int inc) 271prepend (char *ptr, int sze, int inc)
238{ 272{
239 char *p; 273 char *p;
277 self->texs *= 2; 311 self->texs *= 2;
278 } 312 }
279} 313}
280 314
281static maprow * 315static maprow *
282map_get_row (CFPlus__Map self, int y) 316map_get_row (DC__Map self, int y)
283{ 317{
284 if (0 > y) 318 if (0 > y)
285 { 319 {
286 int extend = - y + MAP_EXTEND_Y; 320 int extend = - y + MAP_EXTEND_Y;
287 Prepend (maprow, self->row, self->rows, extend); 321 Prepend (maprow, self->row, self->rows, extend);
325 359
326 return row->col + (x - row->c0); 360 return row->col + (x - row->c0);
327} 361}
328 362
329static mapcell * 363static mapcell *
330map_get_cell (CFPlus__Map self, int x, int y) 364map_get_cell (DC__Map self, int x, int y)
331{ 365{
332 return row_get_cell (map_get_row (self, y), x); 366 return row_get_cell (map_get_row (self, y), x);
333} 367}
334 368
335static void 369static void
336map_clear (CFPlus__Map self) 370map_clear (DC__Map self)
337{ 371{
338 int r; 372 int r;
339 373
340 for (r = 0; r < self->rows; r++) 374 for (r = 0; r < self->rows; r++)
341 Safefree (self->row[r].col); 375 Safefree (self->row[r].col);
348 self->oy = 0; 382 self->oy = 0;
349 self->row = 0; 383 self->row = 0;
350 self->rows = 0; 384 self->rows = 0;
351} 385}
352 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
353static void 397static void
354map_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)
355{ 399{
356 int x, y; 400 int x, y;
357 maprow *row; 401 maprow *row;
358 mapcell *cell; 402 mapcell *cell;
359 403
371 if (x >= row->c1) 415 if (x >= row->c1)
372 break; 416 break;
373 417
374 cell = row->col + x - row->c0; 418 cell = row->col + x - row->c0;
375 419
376 cell->darkness = 0; 420 CELL_CLEAR (cell);
377 cell->stat_hp = 0;
378 cell->flags = 0;
379 cell->player = 0;
380 } 421 }
381 } 422 }
382} 423}
383 424
384typedef struct { 425typedef struct {
438 n |= n >> 16; 479 n |= n >> 16;
439 480
440 return n + 1; 481 return n + 1;
441} 482}
442 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
443/* SDL should provide this, really. */ 495/* SDL should provide this, really. */
444#define SDLK_MODIFIER_MIN 300 496#define SDLK_MODIFIER_MIN 300
445#define SDLK_MODIFIER_MAX 314 497#define SDLK_MODIFIER_MAX 314
446 498
447/******************************************************************************/ 499/******************************************************************************/
485 return 0; 537 return 0;
486 538
487 return 1; 539 return 1;
488} 540}
489 541
490MODULE = 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
491 595
492PROTOTYPES: ENABLE 596PROTOTYPES: ENABLE
493 597
494BOOT: 598BOOT:
495{ 599{
496 HV *stash = gv_stashpv ("CFPlus", 1); 600 HV *stash = gv_stashpv ("DC", 1);
497 static const struct { 601 static const struct {
498 const char *name; 602 const char *name;
499 IV iv; 603 IV iv;
500 } *civ, const_iv[] = { 604 } *civ, const_iv[] = {
501# define const_iv(name) { # name, (IV)name } 605# define const_iv(name) { # name, (IV)name }
523 627
524 const_iv (SDL_APPINPUTFOCUS), 628 const_iv (SDL_APPINPUTFOCUS),
525 const_iv (SDL_APPMOUSEFOCUS), 629 const_iv (SDL_APPMOUSEFOCUS),
526 const_iv (SDL_APPACTIVE), 630 const_iv (SDL_APPACTIVE),
527 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),
528 const_iv (SDLK_KP0), 684 const_iv (SDLK_KP0),
529 const_iv (SDLK_KP1), 685 const_iv (SDLK_KP1),
530 const_iv (SDLK_KP2), 686 const_iv (SDLK_KP2),
531 const_iv (SDLK_KP3), 687 const_iv (SDLK_KP3),
532 const_iv (SDLK_KP4), 688 const_iv (SDLK_KP4),
604 const_iv (KMOD_LMETA), 760 const_iv (KMOD_LMETA),
605 const_iv (KMOD_RMETA), 761 const_iv (KMOD_RMETA),
606 const_iv (KMOD_NUM), 762 const_iv (KMOD_NUM),
607 const_iv (KMOD_CAPS), 763 const_iv (KMOD_CAPS),
608 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)
609# undef const_iv 798# undef const_iv
610 }; 799 };
611 800
612 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; )
613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
631 820
632NV floor (NV x) 821NV floor (NV x)
633 822
634NV ceil (NV x) 823NV ceil (NV x)
635 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
636void 835void
637pango_init () 836pango_init ()
638 CODE: 837 CODE:
639{ 838{
640 opengl_fontmap = pango_opengl_font_map_new (); 839 opengl_fontmap = pango_opengl_font_map_new ();
641 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);
642 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
643} 847}
644 848
645char *
646SDL_GetError () 849char *SDL_GetError ()
647 850
648int 851void SDL_braino ()
649SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
650 852
651void 853int SDL_Init (U32 flags)
854
855int SDL_InitSubSystem (U32 flags)
856
857void SDL_QuitSubSystem (U32 flags)
858
652SDL_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
653 869
654void 870void
655SDL_ListModes (int rgb, int alpha) 871SDL_ListModes (int rgb, int alpha)
656 PPCODE: 872 PPCODE:
657{ 873{
669 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 885 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
670 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 886 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
671 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 887 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
672 888
673 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 889 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
674#if SDL_VERSION_ATLEAST(1,2,10)
675 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
676 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 890 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
677#endif
678 891
679 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 892 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
680 893
681 if (m && m != (SDL_Rect **)-1) 894 if (m && m != (SDL_Rect **)-1)
682 while (*m) 895 while (*m)
683 { 896 {
684 if ((*m)->w >= 640 && (*m)->h >= 480) 897 if ((*m)->w >= 400 && (*m)->h >= 300)
685 { 898 {
686 AV *av = newAV (); 899 AV *av = newAV ();
687 av_push (av, newSViv ((*m)->w)); 900 av_push (av, newSViv ((*m)->w));
688 av_push (av, newSViv ((*m)->h)); 901 av_push (av, newSViv ((*m)->h));
689 av_push (av, newSViv (rgb)); 902 av_push (av, newSViv (rgb));
713 926
714 if (RETVAL) 927 if (RETVAL)
715 { 928 {
716 av_clear (texture_av); 929 av_clear (texture_av);
717 930
718 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 931 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719#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);
720#include "glfunc.h" 933#include "glfunc.h"
721#undef GL_FUNC 934#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
722 } 938 }
723} 939}
724 OUTPUT: 940 OUTPUT:
725 RETVAL 941 RETVAL
726 942
730char * 946char *
731SDL_GetKeyName (int sym) 947SDL_GetKeyName (int sym)
732 948
733int 949int
734SDL_GetAppState () 950SDL_GetAppState ()
951
952int
953SDL_GetModState ()
735 954
736void 955void
737poll_events () 956poll_events ()
738 PPCODE: 957 PPCODE:
739{ 958{
749 { 968 {
750 case SDL_KEYDOWN: 969 case SDL_KEYDOWN:
751 case SDL_KEYUP: 970 case SDL_KEYUP:
752 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 971 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
753 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 972 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
754 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);
755 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 */
756 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 975 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
757 break; 976 break;
758 977
759 case SDL_ACTIVEEVENT: 978 case SDL_ACTIVEEVENT:
760 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 979 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
778 x = ev.motion.x; 997 x = ev.motion.x;
779 y = ev.motion.y; 998 y = ev.motion.y;
780 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 999 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
781 } 1000 }
782 1001
783 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1002 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
784 hv_store (hv, "state", 5, newSViv (state), 0); 1003 hv_store (hv, "state", 5, newSViv (state), 0);
785 hv_store (hv, "x", 1, newSViv (x), 0); 1004 hv_store (hv, "x", 1, newSViv (x), 0);
786 hv_store (hv, "y", 1, newSViv (y), 0); 1005 hv_store (hv, "y", 1, newSViv (y), 0);
787 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1006 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
788 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1007 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
789 } 1008 }
790 break; 1009 break;
791 1010
792 case SDL_MOUSEBUTTONDOWN: 1011 case SDL_MOUSEBUTTONDOWN:
793 case SDL_MOUSEBUTTONUP: 1012 case SDL_MOUSEBUTTONUP:
794 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1013 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
795 1014
796 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1015 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
797 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1016 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
798 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1017 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
799 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1018 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
804 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1023 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1024 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806 break; 1025 break;
807 } 1026 }
808 1027
809 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))));
810 } 1029 }
811} 1030}
812 1031
813int 1032int
814Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024) 1033Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815 POSTCALL: 1034 POSTCALL:
816 Mix_HookMusicFinished (music_finished); 1035 Mix_HookMusicFinished (music_finished);
817 Mix_ChannelFinished (channel_finished); 1036 Mix_ChannelFinished (channel_finished);
1037
1038void
1039Mix_QuerySpec ()
1040 PPCODE:
1041{
1042 int freq, channels;
1043 Uint16 format;
1044
1045 if (Mix_QuerySpec (&freq, &format, &channels))
1046 {
1047 EXTEND (SP, 3);
1048 PUSHs (sv_2mortal (newSViv (freq)));
1049 PUSHs (sv_2mortal (newSViv (format)));
1050 PUSHs (sv_2mortal (newSViv (channels)));
1051 }
1052}
818 1053
819void 1054void
820Mix_CloseAudio () 1055Mix_CloseAudio ()
821 1056
822int 1057int
857 } 1092 }
858 } 1093 }
859#endif 1094#endif
860} 1095}
861 1096
862void 1097int
863add_font (char *file) 1098add_font (char *file)
864 CODE: 1099 CODE:
865 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1100 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101 OUTPUT:
1102 RETVAL
866 1103
867void 1104void
868load_image_inline (SV *image_) 1105load_image_inline (SV *image_)
869 ALIAS: 1106 ALIAS:
870 load_image_file = 1 1107 load_image_file = 1
956void 1193void
957error (char *message) 1194error (char *message)
958 CODE: 1195 CODE:
959 fprintf (stderr, "ERROR: %s\n", message); 1196 fprintf (stderr, "ERROR: %s\n", message);
960#ifdef _WIN32 1197#ifdef _WIN32
961 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1198 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
962#endif 1199#endif
963 1200
964void 1201void
965fatal (char *message) 1202fatal (char *message)
966 CODE: 1203 CODE:
967 fprintf (stderr, "FATAL: %s\n", message); 1204 fprintf (stderr, "FATAL: %s\n", message);
968#ifdef _WIN32 1205#ifdef _WIN32
969 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1206 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
970#endif 1207#endif
971 _exit (1); 1208 _exit (1);
972 1209
973void 1210void
974_exit (int retval = 0) 1211_exit (int retval = 0)
986#if DEBUG 1223#if DEBUG
987 VALGRIND_DO_LEAK_CHECK; 1224 VALGRIND_DO_LEAK_CHECK;
988#endif 1225#endif
989} 1226}
990 1227
991MODULE = CFPlus PACKAGE = CFPlus::Font 1228int
1229SvREFCNT (SV *sv)
1230 CODE:
1231 RETVAL = SvREFCNT (sv);
1232 OUTPUT:
1233 RETVAL
1234
1235MODULE = Deliantra::Client PACKAGE = DC::Font
992 1236
993PROTOTYPES: DISABLE 1237PROTOTYPES: DISABLE
994 1238
995CFPlus::Font 1239DC::Font
996new_from_file (SV *class, char *path, int id = 0) 1240new_from_file (SV *class, char *path, int id = 0)
997 CODE: 1241 CODE:
998{ 1242{
999 int count; 1243 int count;
1000 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1244 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1003} 1247}
1004 OUTPUT: 1248 OUTPUT:
1005 RETVAL 1249 RETVAL
1006 1250
1007void 1251void
1008DESTROY (CFPlus::Font self) 1252DESTROY (DC::Font self)
1009 CODE: 1253 CODE:
1010 pango_font_description_free (self); 1254 pango_font_description_free (self);
1011 1255
1012void 1256void
1013make_default (CFPlus::Font self) 1257make_default (DC::Font self)
1014 PROTOTYPE: $ 1258 PROTOTYPE: $
1015 CODE: 1259 CODE:
1016 default_font = self; 1260 default_font = self;
1017 1261
1018MODULE = CFPlus PACKAGE = CFPlus::Layout 1262MODULE = Deliantra::Client PACKAGE = DC::Layout
1019 1263
1020PROTOTYPES: DISABLE 1264PROTOTYPES: DISABLE
1021 1265
1022void 1266void
1023reset_glyph_cache () 1267glyph_cache_backup ()
1024 PROTOTYPE: 1268 PROTOTYPE:
1025 CODE: 1269 CODE:
1270 tc_backup ();
1271
1272void
1273glyph_cache_restore ()
1274 PROTOTYPE:
1275 CODE:
1026 tc_clear (); 1276 tc_restore ();
1027 1277
1028CFPlus::Layout 1278DC::Layout
1029new (SV *class) 1279new (SV *class)
1030 CODE: 1280 CODE:
1031 New (0, RETVAL, 1, struct cf_layout); 1281 New (0, RETVAL, 1, struct cf_layout);
1032 1282
1033 RETVAL->pl = pango_layout_new (opengl_context); 1283 RETVAL->pl = pango_layout_new (opengl_context);
1035 RETVAL->g = 1.; 1285 RETVAL->g = 1.;
1036 RETVAL->b = 1.; 1286 RETVAL->b = 1.;
1037 RETVAL->a = 1.; 1287 RETVAL->a = 1.;
1038 RETVAL->base_height = MIN_FONT_HEIGHT; 1288 RETVAL->base_height = MIN_FONT_HEIGHT;
1039 RETVAL->font = 0; 1289 RETVAL->font = 0;
1290 RETVAL->rc = rc_alloc ();
1040 1291
1041 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1292 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042 layout_update_font (RETVAL); 1293 layout_update_font (RETVAL);
1043 OUTPUT: 1294 OUTPUT:
1044 RETVAL 1295 RETVAL
1045 1296
1046void 1297void
1047DESTROY (CFPlus::Layout self) 1298DESTROY (DC::Layout self)
1048 CODE: 1299 CODE:
1049 g_object_unref (self->pl); 1300 g_object_unref (self->pl);
1301 rc_free (self->rc);
1050 Safefree (self); 1302 Safefree (self);
1051 1303
1052void 1304void
1053set_text (CFPlus::Layout self, SV *text_) 1305set_text (DC::Layout self, SV *text_)
1054 CODE: 1306 CODE:
1055{ 1307{
1056 STRLEN textlen; 1308 STRLEN textlen;
1057 char *text = SvPVutf8 (text_, textlen); 1309 char *text = SvPVutf8 (text_, textlen);
1058 1310
1059 pango_layout_set_text (self->pl, text, textlen); 1311 pango_layout_set_text (self->pl, text, textlen);
1060} 1312}
1061 1313
1062void 1314void
1063set_markup (CFPlus::Layout self, SV *text_) 1315set_markup (DC::Layout self, SV *text_)
1064 CODE: 1316 CODE:
1065{ 1317{
1066 STRLEN textlen; 1318 STRLEN textlen;
1067 char *text = SvPVutf8 (text_, textlen); 1319 char *text = SvPVutf8 (text_, textlen);
1068 1320
1069 pango_layout_set_markup (self->pl, text, textlen); 1321 pango_layout_set_markup (self->pl, text, textlen);
1070} 1322}
1071 1323
1072void 1324void
1073set_shapes (CFPlus::Layout self, ...) 1325set_shapes (DC::Layout self, ...)
1074 CODE: 1326 CODE:
1075{ 1327{
1076 PangoAttrList *attrs = 0; 1328 PangoAttrList *attrs = 0;
1077 const char *text = pango_layout_get_text (self->pl); 1329 const char *text = pango_layout_get_text (self->pl);
1078 const char *pos = text; 1330 const char *pos = text;
1113 if (attrs) 1365 if (attrs)
1114 pango_layout_set_attributes (self->pl, attrs); 1366 pango_layout_set_attributes (self->pl, attrs);
1115} 1367}
1116 1368
1117void 1369void
1118get_shapes (CFPlus::Layout self) 1370get_shapes (DC::Layout self)
1119 PPCODE: 1371 PPCODE:
1120{ 1372{
1121 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1373 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122 1374
1123 do 1375 do
1124 { 1376 {
1125 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1377 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126 1378
1127 if (run && shape_attr_p (run)) 1379 if (run && shape_attr_p (run))
1128 { 1380 {
1129 PangoRectangle extents; 1381 PangoRectangle extents;
1130 pango_layout_iter_get_run_extents (iter, 0, &extents); 1382 pango_layout_iter_get_run_extents (iter, 0, &extents);
1138 1390
1139 pango_layout_iter_free (iter); 1391 pango_layout_iter_free (iter);
1140} 1392}
1141 1393
1142int 1394int
1143has_wrapped (CFPlus::Layout self) 1395has_wrapped (DC::Layout self)
1144 CODE: 1396 CODE:
1145{ 1397{
1146 int lines = 1; 1398 int lines = 1;
1147 const char *text = pango_layout_get_text (self->pl); 1399 const char *text = pango_layout_get_text (self->pl);
1148 1400
1153} 1405}
1154 OUTPUT: 1406 OUTPUT:
1155 RETVAL 1407 RETVAL
1156 1408
1157SV * 1409SV *
1158get_text (CFPlus::Layout self) 1410get_text (DC::Layout self)
1159 CODE: 1411 CODE:
1160 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1412 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161 sv_utf8_decode (RETVAL); 1413 sv_utf8_decode (RETVAL);
1162 OUTPUT: 1414 OUTPUT:
1163 RETVAL 1415 RETVAL
1164 1416
1165void 1417void
1166set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1418set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167 CODE: 1419 CODE:
1168 self->r = r; 1420 self->r = r;
1169 self->g = g; 1421 self->g = g;
1170 self->b = b; 1422 self->b = b;
1171 self->a = a; 1423 self->a = a;
1172 1424
1173void 1425void
1174set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1426set_font (DC::Layout self, DC::Font font = 0)
1175 CODE: 1427 CODE:
1176 if (self->font != font) 1428 if (self->font != font)
1177 { 1429 {
1178 self->font = font; 1430 self->font = font;
1179 layout_update_font (self); 1431 layout_update_font (self);
1180 } 1432 }
1181 1433
1182void 1434void
1183set_height (CFPlus::Layout self, int base_height) 1435set_height (DC::Layout self, int base_height)
1184 CODE: 1436 CODE:
1185 if (self->base_height != base_height) 1437 if (self->base_height != base_height)
1186 { 1438 {
1187 self->base_height = base_height; 1439 self->base_height = base_height;
1188 layout_update_font (self); 1440 layout_update_font (self);
1189 } 1441 }
1190 1442
1191void 1443void
1192set_width (CFPlus::Layout self, int max_width = -1) 1444set_width (DC::Layout self, int max_width = -1)
1193 CODE: 1445 CODE:
1194 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1446 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195 1447
1196void 1448void
1197set_indent (CFPlus::Layout self, int indent) 1449set_indent (DC::Layout self, int indent)
1198 CODE: 1450 CODE:
1199 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1451 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200 1452
1201void 1453void
1202set_spacing (CFPlus::Layout self, int spacing) 1454set_spacing (DC::Layout self, int spacing)
1203 CODE: 1455 CODE:
1204 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1456 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205 1457
1206void 1458void
1207set_ellipsise (CFPlus::Layout self, int ellipsise) 1459set_ellipsise (DC::Layout self, int ellipsise)
1208 CODE: 1460 CODE:
1209 pango_layout_set_ellipsize (self->pl, 1461 pango_layout_set_ellipsize (self->pl,
1210 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1462 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1463 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1464 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213 : PANGO_ELLIPSIZE_NONE 1465 : PANGO_ELLIPSIZE_NONE
1214 ); 1466 );
1215 1467
1216void 1468void
1217set_single_paragraph_mode (CFPlus::Layout self, int spm) 1469set_single_paragraph_mode (DC::Layout self, int spm)
1218 CODE: 1470 CODE:
1219 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1471 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220 1472
1221void 1473void
1222size (CFPlus::Layout self) 1474size (DC::Layout self)
1223 PPCODE: 1475 PPCODE:
1224{ 1476{
1225 int w, h; 1477 int w, h;
1226 1478
1227 layout_get_pixel_size (self, &w, &h); 1479 layout_get_pixel_size (self, &w, &h);
1230 PUSHs (sv_2mortal (newSViv (w))); 1482 PUSHs (sv_2mortal (newSViv (w)));
1231 PUSHs (sv_2mortal (newSViv (h))); 1483 PUSHs (sv_2mortal (newSViv (h)));
1232} 1484}
1233 1485
1234int 1486int
1235descent (CFPlus::Layout self) 1487descent (DC::Layout self)
1236 CODE: 1488 CODE:
1237{ 1489{
1238 PangoRectangle rect; 1490 PangoRectangle rect;
1239 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1491 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240 pango_layout_line_get_pixel_extents (line, 0, &rect); 1492 pango_layout_line_get_pixel_extents (line, 0, &rect);
1241 RETVAL = PANGO_DESCENT (rect); 1493 RETVAL = PANGO_DESCENT (rect);
1242} 1494}
1243 OUTPUT: 1495 OUTPUT:
1244 RETVAL 1496 RETVAL
1245 1497
1246int 1498int
1247xy_to_index (CFPlus::Layout self, int x, int y) 1499xy_to_index (DC::Layout self, int x, int y)
1248 CODE: 1500 CODE:
1249{ 1501{
1250 int index, trailing; 1502 int index, trailing;
1251 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1503 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252 RETVAL = index + trailing; 1504 RETVAL = index + trailing;
1253} 1505}
1254 OUTPUT: 1506 OUTPUT:
1255 RETVAL 1507 RETVAL
1256 1508
1257void 1509void
1258cursor_pos (CFPlus::Layout self, int index) 1510cursor_pos (DC::Layout self, int index)
1259 PPCODE: 1511 PPCODE:
1260{ 1512{
1261 PangoRectangle strong_pos; 1513 PangoRectangle pos;
1262 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1514 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1263 1515
1264 EXTEND (SP, 3); 1516 EXTEND (SP, 3);
1265 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1517 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1518 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1519 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268} 1520}
1269 1521
1270void 1522void
1271index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1523index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272 PPCODE: 1524 PPCODE:
1273{ 1525{
1274 int line, x; 1526 int line, x;
1275 1527
1276 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1528 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1529#if !PANGO_VERSION_CHECK (1, 17, 3)
1277 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1530 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278 1531 --line;
1532#endif
1279 EXTEND (SP, 2); 1533 EXTEND (SP, 2);
1280 PUSHs (sv_2mortal (newSViv (line - 1))); 1534 PUSHs (sv_2mortal (newSViv (line)));
1281 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1535 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282} 1536}
1283 1537
1284void 1538void
1285line_x_to_index (CFPlus::Layout self, int line, int x) 1539line_x_to_index (DC::Layout self, int line, int x)
1286 PPCODE: 1540 PPCODE:
1287{ 1541{
1288 PangoLayoutLine *lp; 1542 PangoLayoutLine *lp;
1289 int index, trailing; 1543 int index, trailing;
1290 1544
1291 if (line < 0) 1545 if (line < 0)
1292 XSRETURN_EMPTY; 1546 XSRETURN_EMPTY;
1293 1547
1294 if (!(lp = pango_layout_get_line (self->pl, line))) 1548 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295 XSRETURN_EMPTY; /* do better */ 1549 XSRETURN_EMPTY; /* do better */
1296 1550
1297 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1551 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298 1552
1299 EXTEND (SP, 2); 1553 EXTEND (SP, 2);
1305 PUSHs (sv_2mortal (newSViv (trailing))); 1559 PUSHs (sv_2mortal (newSViv (trailing)));
1306 } 1560 }
1307} 1561}
1308 1562
1309void 1563void
1310render (CFPlus::Layout self, float x, float y, int flags = 0) 1564render (DC::Layout self, float x, float y, int flags = 0)
1311 PPCODE: 1565 CODE:
1566 rc_clear (self->rc);
1312 pango_opengl_render_layout_subpixel ( 1567 pango_opengl_render_layout_subpixel (
1313 self->pl, 1568 self->pl,
1569 self->rc,
1314 x * PANGO_SCALE, y * PANGO_SCALE, 1570 x * PANGO_SCALE, y * PANGO_SCALE,
1315 self->r, self->g, self->b, self->a, 1571 self->r, self->g, self->b, self->a,
1316 flags 1572 flags
1317 ); 1573 );
1574 // we assume that context_change actually clears/frees stuff
1575 // and does not do any recomputation...
1576 pango_layout_context_changed (self->pl);
1318 1577
1319MODULE = CFPlus PACKAGE = CFPlus::Texture 1578void
1579draw (DC::Layout self)
1580 CODE:
1581{
1582 glEnable (GL_TEXTURE_2D);
1583 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1584 glEnable (GL_BLEND);
1585 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587 glEnable (GL_ALPHA_TEST);
1588 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589
1590 rc_draw (self->rc);
1591
1592 glDisable (GL_ALPHA_TEST);
1593 glDisable (GL_BLEND);
1594 glDisable (GL_TEXTURE_2D);
1595}
1596
1597MODULE = Deliantra::Client PACKAGE = DC::Texture
1320 1598
1321PROTOTYPES: ENABLE 1599PROTOTYPES: ENABLE
1322
1323int minpot (int n)
1324 1600
1325void 1601void
1326pad (SV *data_, int ow, int oh, int nw, int nh) 1602pad (SV *data_, int ow, int oh, int nw, int nh)
1327 CODE: 1603 CODE:
1328{ 1604{
1394 glDisable (GL_ALPHA_TEST); 1670 glDisable (GL_ALPHA_TEST);
1395 glDisable (GL_BLEND); 1671 glDisable (GL_BLEND);
1396 } 1672 }
1397} 1673}
1398 1674
1675void
1676draw_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)
1677 PROTOTYPE: @
1678 CODE:
1679{
1680 glEnable (GL_BLEND);
1681 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1682 glEnable (GL_TEXTURE_2D);
1683 glBindTexture (GL_TEXTURE_2D, name1);
1684
1685 glColor3f (intensity, intensity, intensity);
1686 glPushMatrix ();
1687 glScalef (1./3, 1./3, 1.);
1688
1689 if (blend > 0.f)
1690 {
1691 float dx3 = dx * -3.f / w;
1692 float dy3 = dy * -3.f / h;
1693 GLfloat env_color[4] = { 0., 0., 0., blend };
1694
1695 /* interpolate the two shadow textures */
1696 /* stage 0 == rgb(glcolor) + alpha(t0) */
1697 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1698
1699 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1700 gl.ActiveTexture (GL_TEXTURE1);
1701 glEnable (GL_TEXTURE_2D);
1702 glBindTexture (GL_TEXTURE_2D, name2);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1704
1705 /* rgb == rgb(glcolor) */
1706 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1707 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1709
1710 /* alpha = interpolate t0, t1 by env_alpha */
1711 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1712
1713 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1714 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1715 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1716
1717 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1718 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1719
1720 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1721 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1722
1723 glBegin (GL_QUADS);
1724 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1728 glEnd ();
1729
1730 glDisable (GL_TEXTURE_2D);
1731 gl.ActiveTexture (GL_TEXTURE0);
1732 }
1733 else
1734 {
1735 /* simple blending of one texture, also opengl <1.3 path */
1736 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1737
1738 glBegin (GL_QUADS);
1739 glTexCoord2f (0, 0); glVertex2f (0, 0);
1740 glTexCoord2f (0, t); glVertex2f (0, h);
1741 glTexCoord2f (s, t); glVertex2f (w, h);
1742 glTexCoord2f (s, 0); glVertex2f (w, 0);
1743 glEnd ();
1744 }
1745
1746 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1747 {
1748 int x, y;
1749 int dx3 = dx * 3;
1750 int dy3 = dy * 3;
1751
1752 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1753 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1754 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1755 glTranslatef (-1., -1., 0);
1756 glBegin (GL_QUADS);
1757
1758 for (y = 1; y < h; y += 3)
1759 {
1760 int y1 = y - dy3;
1761 int y1valid = y1 >= 0 && y1 < h;
1762
1763 for (x = 1; x < w; x += 3)
1764 {
1765 int x1 = x - dx3;
1766 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1767 uint8_t h2;
1768
1769 if (y1valid && x1 >= 0 && x1 < w)
1770 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1771 else
1772 h2 = 1; /* out of range == invisible */
1773
1774 if (h1 || h2)
1775 {
1776 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1777 glColor4f (1., 1., 1., alpha);
1778
1779 glTexCoord2f (0, 0.); glVertex2i (x , y );
1780 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1781 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1782 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1783 }
1784 }
1785 }
1786 }
1787
1788 glEnd ();
1789
1790 glPopMatrix ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1794}
1795
1399IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1796IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1400 CODE: 1797 CODE:
1401{ 1798{
1402 GLint width; 1799 GLint width;
1403 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1800 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1405 RETVAL = width > 0; 1802 RETVAL = width > 0;
1406} 1803}
1407 OUTPUT: 1804 OUTPUT:
1408 RETVAL 1805 RETVAL
1409 1806
1410MODULE = CFPlus PACKAGE = CFPlus::Map 1807MODULE = Deliantra::Client PACKAGE = DC::Map
1411 1808
1412PROTOTYPES: DISABLE 1809PROTOTYPES: DISABLE
1413 1810
1414CFPlus::Map 1811DC::Map
1415new (SV *class) 1812new (SV *class)
1416 CODE: 1813 CODE:
1417 New (0, RETVAL, 1, struct map); 1814 New (0, RETVAL, 1, struct map);
1418 RETVAL->x = 0; 1815 RETVAL->x = 0;
1419 RETVAL->y = 0; 1816 RETVAL->y = 0;
1427 RETVAL->row = 0; 1824 RETVAL->row = 0;
1428 OUTPUT: 1825 OUTPUT:
1429 RETVAL 1826 RETVAL
1430 1827
1431void 1828void
1432DESTROY (CFPlus::Map self) 1829DESTROY (DC::Map self)
1433 CODE: 1830 CODE:
1434{ 1831{
1435 map_clear (self); 1832 map_clear (self);
1436 Safefree (self->face2tile); 1833 Safefree (self->face2tile);
1437 Safefree (self->tex); 1834 Safefree (self->tex);
1438 Safefree (self); 1835 Safefree (self);
1439} 1836}
1440 1837
1441void 1838void
1442resize (CFPlus::Map self, int map_width, int map_height) 1839resize (DC::Map self, int map_width, int map_height)
1443 CODE: 1840 CODE:
1444 self->w = map_width; 1841 self->w = map_width;
1445 self->h = map_height; 1842 self->h = map_height;
1446 1843
1447void 1844void
1448clear (CFPlus::Map self) 1845clear (DC::Map self)
1449 CODE: 1846 CODE:
1450 map_clear (self); 1847 map_clear (self);
1451 1848
1452void 1849void
1453set_tileid (CFPlus::Map self, int face, int tile) 1850set_tileid (DC::Map self, int face, int tile)
1454 CODE: 1851 CODE:
1455{ 1852{
1456 need_facenum (self, face); self->face2tile [face] = tile; 1853 need_facenum (self, face); self->face2tile [face] = tile;
1457 need_texid (self, tile); 1854 need_texid (self, tile);
1458} 1855}
1459 1856
1460void 1857void
1461set_smooth (CFPlus::Map self, int face, int smooth, int level) 1858set_smooth (DC::Map self, int face, int smooth, int level)
1462 CODE: 1859 CODE:
1463{ 1860{
1464 tileid texid; 1861 tileid texid;
1465 maptex *tex; 1862 maptex *tex;
1466 1863
1479 tex->smoothtile = self->face2tile [smooth]; 1876 tex->smoothtile = self->face2tile [smooth];
1480 tex->smoothlevel = level; 1877 tex->smoothlevel = level;
1481} 1878}
1482 1879
1483void 1880void
1484set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1881set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485 CODE: 1882 CODE:
1486{ 1883{
1487 need_texid (self, texid); 1884 need_texid (self, texid);
1488 1885
1489 { 1886 {
1508 // use uglier nearest interpolation because linear suffers 1905 // use uglier nearest interpolation because linear suffers
1509 // from transparent color bleeding and ugly wrapping effects. 1906 // from transparent color bleeding and ugly wrapping effects.
1510 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1907 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511} 1908}
1512 1909
1910void
1911expire_textures (DC::Map self, int texid, int count)
1912 PPCODE:
1913 for (; texid < self->texs && count; ++texid, --count)
1914 {
1915 maptex *tex = self->tex + texid;
1916
1917 if (tex->name)
1918 {
1919 if (tex->unused)
1920 {
1921 tex->name = 0;
1922 tex->unused = 0;
1923 XPUSHs (sv_2mortal (newSViv (texid)));
1924 }
1925 else
1926 tex->unused = 1;
1927 }
1928 }
1929
1513int 1930int
1514ox (CFPlus::Map self) 1931ox (DC::Map self)
1515 ALIAS: 1932 ALIAS:
1516 oy = 1 1933 oy = 1
1517 x = 2 1934 x = 2
1518 y = 3 1935 y = 3
1519 w = 4 1936 w = 4
1530 } 1947 }
1531 OUTPUT: 1948 OUTPUT:
1532 RETVAL 1949 RETVAL
1533 1950
1534void 1951void
1535scroll (CFPlus::Map self, int dx, int dy) 1952scroll (DC::Map self, int dx, int dy)
1536 CODE: 1953 CODE:
1537{ 1954{
1538 if (dx > 0) 1955 if (dx > 0)
1539 map_blank (self, self->x, self->y, dx, self->h); 1956 map_blank (self, self->x, self->y, dx, self->h);
1540 else if (dx < 0) 1957 else if (dx < 0)
1556 self->y += MAP_EXTEND_Y; 1973 self->y += MAP_EXTEND_Y;
1557 } 1974 }
1558} 1975}
1559 1976
1560SV * 1977SV *
1561map1a_update (CFPlus::Map self, SV *data_, int extmap) 1978map1a_update (DC::Map self, SV *data_, int extmap)
1562 CODE: 1979 CODE:
1563{ 1980{
1564 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1981 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1565 uint8_t *data_end = (uint8_t *)SvEND (data_); 1982 uint8_t *data_end = (uint8_t *)SvEND (data_);
1566 mapcell *cell; 1983 mapcell *cell;
1594 uint8_t ext, cmd; 2011 uint8_t ext, cmd;
1595 2012
1596 do 2013 do
1597 { 2014 {
1598 ext = *data++; 2015 ext = *data++;
1599 cmd = ext & 0x3f; 2016 cmd = ext & 0x7f;
1600 2017
1601 if (cmd < 4) 2018 if (cmd < 4)
1602 cell->darkness = 255 - ext * 64 + 1; 2019 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1603 else if (cmd == 5) // health 2020 else if (cmd == 5) // health
1604 { 2021 {
1605 cell->stat_width = 1; 2022 cell->stat_width = 1;
1606 cell->stat_hp = *data++; 2023 cell->stat_hp = *data++;
1607 } 2024 }
1608 else if (cmd == 6) // monster width 2025 else if (cmd == 6) // monster width
1609 cell->stat_width = *data++ + 1; 2026 cell->stat_width = *data++ + 1;
1610 else if (cmd == 0x47) 2027 else if (cmd == 0x47)
1611 { 2028 {
1612 if (*data == 4) 2029 if (*data == 1) cell->player = data [1];
1613 ; // decode player count 2030 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1614 2033
1615 data += *data + 1; 2034 data += *data + 1;
1616 } 2035 }
1617 else if (cmd == 8) // cell flags 2036 else if (cmd == 8) // cell flags
1618 cell->flags = *data++; 2037 cell->flags = *data++;
1635 cell->tile [z] = self->face2tile [face]; 2054 cell->tile [z] = self->face2tile [face];
1636 2055
1637 if (cell->tile [z]) 2056 if (cell->tile [z])
1638 { 2057 {
1639 maptex *tex = self->tex + cell->tile [z]; 2058 maptex *tex = self->tex + cell->tile [z];
2059 tex->unused = 0;
1640 if (!tex->name) 2060 if (!tex->name)
1641 av_push (missing, newSViv (cell->tile [z])); 2061 av_push (missing, newSViv (cell->tile [z]));
1642 2062
1643 if (tex->smoothtile) 2063 if (tex->smoothtile)
1644 { 2064 {
1645 maptex *smooth = self->tex + tex->smoothtile; 2065 maptex *smooth = self->tex + tex->smoothtile;
2066 smooth->unused = 0;
1646 if (!smooth->name) 2067 if (!smooth->name)
1647 av_push (missing, newSViv (tex->smoothtile)); 2068 av_push (missing, newSViv (tex->smoothtile));
1648 } 2069 }
1649 } 2070 }
1650 } 2071 }
1651 } 2072 }
1652 else 2073 else
1653 cell->darkness = 0; 2074 CELL_CLEAR (cell);
1654 } 2075 }
1655} 2076}
1656 OUTPUT: 2077 OUTPUT:
1657 RETVAL 2078 RETVAL
1658 2079
1659SV * 2080SV *
1660mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2081mapmap (DC::Map self, int x0, int y0, int w, int h)
1661 CODE: 2082 CODE:
1662{ 2083{
1663 int x1, x; 2084 int x1, x;
1664 int y1, y; 2085 int y1, y;
1665 int z; 2086 int z;
1710} 2131}
1711 OUTPUT: 2132 OUTPUT:
1712 RETVAL 2133 RETVAL
1713 2134
1714void 2135void
1715draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2136draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1716 CODE: 2137 CODE:
1717{ 2138{
2139 int x, y, z;
2140
1718 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2141 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1719 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2142 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2143 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721 smooth_key skey; 2144 smooth_key skey;
1722 int x, y, z; 2145 int pl_x, pl_y;
1723 int last_name; 2146 maptex pl_tex;
2147 rc_t *rc = rc_alloc ();
2148 rc_t *rc_ov = rc_alloc ();
2149 rc_key_t key;
2150 rc_array_t *arr;
1724 2151
2152 pl_tex.name = 0;
2153
1725 // thats current max. sorry. 2154 // that's current max. sorry.
1726 if (sw > 255) sw = 255; 2155 if (sw > 255) sw = 255;
1727 if (sh > 255) sh = 255; 2156 if (sh > 255) sh = 255;
1728 2157
1729 // clear key, in case of extra padding 2158 // clear key, in case of extra padding
1730 memset (&skey, 0, sizeof (skey)); 2159 memset (&skey, 0, sizeof (skey));
1731 2160
1732 glColor4ub (255, 255, 255, 255); 2161 memset (&key, 0, sizeof (key));
1733 2162 key.r = 255;
1734 glEnable (GL_BLEND); 2163 key.g = 255;
1735 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2164 key.b = 255;
1736 glEnable (GL_TEXTURE_2D); 2165 key.a = 255;
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2166 key.mode = GL_QUADS;
1738 2167 key.format = GL_T2F_V3F;
1739 glBegin (GL_QUADS);
1740
1741 last_name = -1;
1742 2168
1743 mx += self->x; 2169 mx += self->x;
1744 my += self->y; 2170 my += self->y;
1745 2171
1746 // first pass: determine smooth_max 2172 // first pass: determine smooth_max
1763 MAX (self->tex [cell->tile [1]].smoothlevel, 2189 MAX (self->tex [cell->tile [1]].smoothlevel,
1764 self->tex [cell->tile [2]].smoothlevel)); 2190 self->tex [cell->tile [2]].smoothlevel));
1765 } 2191 }
1766 } 2192 }
1767 2193
2194 glEnable (GL_BLEND);
2195 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197
1768 for (z = 0; z <= 2; z++) 2198 for (z = 0; z <= 2; z++)
1769 { 2199 {
1770 memset (smooth_level, 0, sizeof (smooth_level)); 2200 memset (smooth_level, 0, sizeof (smooth_level));
2201 key.texname = -1;
1771 2202
1772 for (y = 0; y < sh; y++) 2203 for (y = 0; y < sh; y++)
1773 if (0 <= y + my && y + my < self->rows) 2204 if (0 <= y + my && y + my < self->rows)
1774 { 2205 {
1775 maprow *row = self->row + (y + my); 2206 maprow *row = self->row + (y + my);
1783 if (tile) 2214 if (tile)
1784 { 2215 {
1785 maptex tex = self->tex [tile]; 2216 maptex tex = self->tex [tile];
1786 int px, py; 2217 int px, py;
1787 2218
1788 // suppressing texture state switches here
1789 // is only moderately effective, but worth the extra effort
1790 if (last_name != tex.name) 2219 if (key.texname != tex.name)
1791 { 2220 {
2221 self->tex [tile].unused = 0;
2222
1792 if (!tex.name) 2223 if (!tex.name)
1793 tex = self->tex [2]; /* missing, replace by noface */ 2224 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1794 2225
1795 glEnd (); 2226 key.texname = tex.name;
1796 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2227 arr = rc_array (rc, &key);
1797 glBegin (GL_QUADS);
1798 } 2228 }
1799 2229
1800 px = (x + 1) * T - tex.w; 2230 px = (x + 1) * T - tex.w;
1801 py = (y + 1) * T - tex.h; 2231 py = (y + 1) * T - tex.h;
1802 2232
1803 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2233 if (expect_false (cell->player == player) && expect_false (z == 2))
1804 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1805 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1806 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1807
1808 if (cell->flags && z == 2)
1809 { 2234 {
1810 if (cell->flags & 1) 2235 pl_x = px;
2236 pl_y = py;
2237 pl_tex = tex;
1811 { 2238 continue;
1812 maptex tex = self->tex [1];
1813 int px = x * T + T * 2 / 32;
1814 int py = y * T - T * 6 / 32;
1815
1816 glEnd ();
1817 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1818 glBegin (GL_QUADS);
1819
1820 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824 }
1825 } 2239 }
2240
2241 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2242 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2243 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2244 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1826 2245
1827 // update smooth hash 2246 // update smooth hash
1828 if (tex.smoothtile) 2247 if (tex.smoothtile)
1829 { 2248 {
1830 skey.tile = tex.smoothtile; 2249 skey.tile = tex.smoothtile;
1861 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2280 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1862 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2281 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1863 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2282 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1864 } 2283 }
1865 } 2284 }
2285
2286 if (expect_false (z == 2) && expect_false (cell->flags))
2287 {
2288 // overlays such as the speech bubble, probably more to come
2289 if (cell->flags & 1)
2290 {
2291 rc_key_t key_ov = key;
2292 maptex tex = self->tex [TEXID_SPEECH];
2293 rc_array_t *arr;
2294 int px = x * T + T * 2 / 32;
2295 int py = y * T - T * 6 / 32;
2296
2297 key_ov.texname = tex.name;
2298 arr = rc_array (rc_ov, &key_ov);
2299
2300 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2301 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2302 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2303 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2304 }
2305 }
1866 } 2306 }
1867 } 2307 }
2308
2309 rc_draw (rc);
2310 rc_clear (rc);
1868 2311
1869 // go through all smoothlevels, lowest to highest, then draw. 2312 // go through all smoothlevels, lowest to highest, then draw.
1870 // this is basically counting sort 2313 // this is basically counting sort
1871 { 2314 {
1872 int w, b; 2315 int w, b;
1873 2316
2317 glEnable (GL_TEXTURE_2D);
2318 glBegin (GL_QUADS);
1874 for (w = 0; w < 256 / 32; ++w) 2319 for (w = 0; w < 256 / 32; ++w)
1875 { 2320 {
1876 uint32_t smask = smooth_level [w]; 2321 uint32_t smask = smooth_level [w];
1877 if (smask) 2322 if (smask)
1878 for (b = 0; b < 32; ++b) 2323 for (b = 0; b < 32; ++b)
1897 int border = bits & 15; 2342 int border = bits & 15;
1898 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2343 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899 float dx = tex.s * .0625f; // 16 images/row 2344 float dx = tex.s * .0625f; // 16 images/row
1900 float dy = tex.t * .5f ; // 2 images/column 2345 float dy = tex.t * .5f ; // 2 images/column
1901 2346
1902 // this time naively avoiding texture state changes
1903 // save gobs of state changes.
1904 if (last_name != tex.name) 2347 if (tex.name)
1905 { 2348 {
2349 // this time avoiding texture state changes
2350 // save gobs of state changes.
1906 if (!tex.name) 2351 if (key.texname != tex.name)
1907 continue; // smoothing not yet available 2352 {
2353 self->tex [skey->tile].unused = 0;
1908 2354
1909 glEnd (); 2355 glEnd ();
1910 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2356 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911 glBegin (GL_QUADS); 2357 glBegin (GL_QUADS);
1912 } 2358 }
1913 2359
1914 if (border) 2360 if (border)
1915 { 2361 {
1916 float ox = border * dx; 2362 float ox = border * dx;
1917 2363
1918 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2364 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2365 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2366 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2367 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922 } 2368 }
1923 2369
1924 if (corner) 2370 if (corner)
1925 { 2371 {
1926 float ox = corner * dx; 2372 float ox = corner * dx;
1927 2373
1928 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2374 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2375 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2376 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2377 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2378 }
1932 } 2379 }
1933 } 2380 }
1934 } 2381 }
1935 } 2382 }
1936 } 2383 }
2384
2385 glEnd ();
2386 glDisable (GL_TEXTURE_2D);
2387 key.texname = -1;
1937 } 2388 }
1938 2389
1939 hv_clear (smooth); 2390 hv_clear (smooth);
1940 } 2391 }
1941 2392
1942 glEnd (); 2393 if (pl_tex.name)
2394 {
2395 maptex tex = pl_tex;
2396 int px = pl_x + sdx;
2397 int py = pl_y + sdy;
1943 2398
1944 glDisable (GL_TEXTURE_2D); 2399 key.texname = tex.name;
2400 arr = rc_array (rc, &key);
2401
2402 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2403 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2406
2407 rc_draw (rc);
2408 }
2409
2410 rc_draw (rc_ov);
2411 rc_clear (rc_ov);
2412
1945 glDisable (GL_BLEND); 2413 glDisable (GL_BLEND);
2414 rc_free (rc);
2415 rc_free (rc_ov);
1946 2416
1947 // top layer: overlays such as the health bar 2417 // top layer: overlays such as the health bar
1948 for (y = 0; y < sh; y++) 2418 for (y = 0; y < sh; y++)
1949 if (0 <= y + my && y + my < self->rows) 2419 if (0 <= y + my && y + my < self->rows)
1950 { 2420 {
1955 { 2425 {
1956 mapcell *cell = row->col + (x + mx - row->c0); 2426 mapcell *cell = row->col + (x + mx - row->c0);
1957 2427
1958 int px = x * T; 2428 int px = x * T;
1959 int py = y * T; 2429 int py = y * T;
2430
2431 if (expect_false (cell->player == player))
2432 {
2433 px += sdx;
2434 py += sdy;
2435 }
1960 2436
1961 if (cell->stat_hp) 2437 if (cell->stat_hp)
1962 { 2438 {
1963 int width = cell->stat_width * T; 2439 int width = cell->stat_width * T;
1964 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2440 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1975 } 2451 }
1976 } 2452 }
1977} 2453}
1978 2454
1979void 2455void
1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2456draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1981 CODE: 2457 CODE:
1982{ 2458{
1983 static float color[16][3] = { 2459 static float color[16][3] = {
1984 { 0.00F, 0.00F, 0.00F }, 2460 { 0.00f, 0.00f, 0.00f },
1985 { 1.00F, 1.00F, 1.00F }, 2461 { 1.00f, 1.00f, 1.00f },
1986 { 0.00F, 0.00F, 0.55F }, 2462 { 0.00f, 0.00f, 0.55f },
1987 { 1.00F, 0.00F, 0.00F }, 2463 { 1.00f, 0.00f, 0.00f },
1988 2464
1989 { 1.00F, 0.54F, 0.00F }, 2465 { 1.00f, 0.54f, 0.00f },
1990 { 0.11F, 0.56F, 1.00F }, 2466 { 0.11f, 0.56f, 1.00f },
1991 { 0.93F, 0.46F, 0.00F }, 2467 { 0.93f, 0.46f, 0.00f },
1992 { 0.18F, 0.54F, 0.34F }, 2468 { 0.18f, 0.54f, 0.34f },
1993 2469
1994 { 0.56F, 0.73F, 0.56F }, 2470 { 0.56f, 0.73f, 0.56f },
1995 { 0.80F, 0.80F, 0.80F }, 2471 { 0.80f, 0.80f, 0.80f },
1996 { 0.55F, 0.41F, 0.13F }, 2472 { 0.55f, 0.41f, 0.13f },
1997 { 0.99F, 0.77F, 0.26F }, 2473 { 0.99f, 0.77f, 0.26f },
1998 2474
1999 { 0.74F, 0.65F, 0.41F }, 2475 { 0.74f, 0.65f, 0.41f },
2000 2476
2001 { 0.00F, 1.00F, 1.00F }, 2477 { 0.00f, 1.00f, 1.00f },
2002 { 1.00F, 0.00F, 1.00F }, 2478 { 1.00f, 0.00f, 1.00f },
2003 { 1.00F, 1.00F, 0.00F }, 2479 { 1.00f, 1.00f, 0.00f },
2004 }; 2480 };
2005 2481
2006 int x, y; 2482 int x, y;
2007 2483
2008 glEnable (GL_TEXTURE_2D); 2484 glEnable (GL_TEXTURE_2D);
2485 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2486 * but the nvidia driver (185.18.14) mishandles alpha textures
2487 * and takes the colour from god knows where instead of using
2488 * Cp. MODULATE results in the same colour, but slightly different
2489 * alpha, but atcually gives us the correct colour with nvidia.
2490 */
2009 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2491 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2010 glEnable (GL_BLEND); 2492 glEnable (GL_BLEND);
2011 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2493 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2012 glBegin (GL_QUADS); 2494 glBegin (GL_QUADS);
2013 2495
2014 for (y = 0; y < h; y++) 2496 for (y = 0; y < h; y++)
2018 2500
2019 if (m) 2501 if (m)
2020 { 2502 {
2021 float *c = color [m & 15]; 2503 float *c = color [m & 15];
2022 2504
2023 float tx1 = m & 0x40 ? 0.5 : 0.; 2505 float tx1 = m & 0x40 ? 0.5f : 0.f;
2024 float tx2 = tx1 + 0.5; 2506 float tx2 = tx1 + 0.5f;
2025 2507
2026 glColor4f (c[0], c[1], c[2], 0.75); 2508 glColor4f (c[0], c[1], c[2], 1);
2027 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2509 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2028 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2510 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2029 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2511 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2030 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2512 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2031 } 2513 }
2035 glDisable (GL_BLEND); 2517 glDisable (GL_BLEND);
2036 glDisable (GL_TEXTURE_2D); 2518 glDisable (GL_TEXTURE_2D);
2037} 2519}
2038 2520
2039void 2521void
2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2522fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041 PPCODE: 2523 PPCODE:
2042{ 2524{
2043 int x, y; 2525 int x, y;
2044 int sw1 = sw + 2; 2526 int sw1 = sw + 2;
2045 int sh1 = sh + 2; 2527 int sh1 = sh + 2;
2046 int sh3 = sh * 3; 2528 int sh3 = sh * 3;
2047 int sw34 = (sw * 3 + 3) & ~3; 2529 int sw3 = sw * 3;
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2530 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2531 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2532 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2051 2533
2052 SvPOK_only (darkness3_sv); 2534 SvPOK_only (darkness3_sv);
2053 SvCUR_set (darkness3_sv, sw34 * sh3); 2535 SvCUR_set (darkness3_sv, sw3 * sh3);
2054 2536
2055 mx += self->x - 1; 2537 mx += self->x - 1;
2056 my += self->y - 1; 2538 my += self->y - 1;
2057
2058 memset (darkness1, 255, sw1 * sh1);
2059 2539
2060 for (y = 0; y < sh1; y++) 2540 for (y = 0; y < sh1; y++)
2061 if (0 <= y + my && y + my < self->rows) 2541 if (0 <= y + my && y + my < self->rows)
2062 { 2542 {
2063 maprow *row = self->row + (y + my); 2543 maprow *row = self->row + (y + my);
2066 if (row->c0 <= x + mx && x + mx < row->c1) 2546 if (row->c0 <= x + mx && x + mx < row->c1)
2067 { 2547 {
2068 mapcell *cell = row->col + (x + mx - row->c0); 2548 mapcell *cell = row->col + (x + mx - row->c0);
2069 2549
2070 darkness1 [y * sw1 + x] = cell->darkness 2550 darkness1 [y * sw1 + x] = cell->darkness
2071 ? 255 - (cell->darkness - 1) 2551 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2072 : 255 - FOW_DARKNESS; 2552 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2073 } 2553 }
2074 } 2554 }
2075 2555
2076 for (y = 0; y < sh; ++y) 2556 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x) 2557 for (x = 0; x < sw; ++x)
2096 2576
2097 uint8_t r13 = (d13 + d23 + d12) / 3; 2577 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23; 2578 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3; 2579 uint8_t r33 = (d23 + d33 + d32) / 3;
2100 2580
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2581 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2582 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2583 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2584 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2105 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2585 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2586 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2587 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2588 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2589 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2110 } 2590 }
2111 2591
2112 free (darkness1); 2592 free (darkness1);
2113 2593
2114 EXTEND (SP, 3); 2594 EXTEND (SP, 3);
2115 PUSHs (sv_2mortal (newSViv (sw34))); 2595 PUSHs (sv_2mortal (newSViv (sw3)));
2116 PUSHs (sv_2mortal (newSViv (sh3))); 2596 PUSHs (sv_2mortal (newSViv (sh3)));
2117 PUSHs (darkness3_sv); 2597 PUSHs (darkness3_sv);
2118} 2598}
2119 2599
2120SV * 2600SV *
2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2601get_rect (DC::Map self, int x0, int y0, int w, int h)
2122 CODE: 2602 CODE:
2123{ 2603{
2124 int x, y, x1, y1; 2604 int x, y, x1, y1;
2125 SV *data_sv = newSV (w * h * 7 + 5); 2605 SV *data_sv = newSV (w * h * 7 + 5);
2126 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2606 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2183 else 2663 else
2184 *data++ = 0; 2664 *data++ = 0;
2185 } 2665 }
2186 } 2666 }
2187 2667
2668 /* if size is w*h + 5 then no data has been found */
2669 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2670 {
2188 SvPOK_only (data_sv); 2671 SvPOK_only (data_sv);
2189 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2672 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673 }
2674
2190 RETVAL = data_sv; 2675 RETVAL = data_sv;
2191} 2676}
2192 OUTPUT: 2677 OUTPUT:
2193 RETVAL 2678 RETVAL
2194 2679
2195void 2680void
2196set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2681set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2197 PPCODE: 2682 PPCODE:
2198{ 2683{
2199 int x, y, z; 2684 int x, y, z;
2200 int w, h; 2685 int w, h;
2201 int x1, y1; 2686 int x1, y1;
2687 STRLEN len;
2688 uint8_t *data, *end;
2689
2690 len = SvLEN (data_sv);
2691 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692 data = SvPVbyte_nolen (data_sv);
2693 end = data + len + 8;
2694
2695 if (len < 5)
2696 XSRETURN_EMPTY;
2202 2697
2203 if (*data++ != 0) 2698 if (*data++ != 0)
2204 return; /* version mismatch */ 2699 XSRETURN_EMPTY; /* version mismatch */
2205 2700
2206 w = *data++ << 8; w |= *data++; 2701 w = *data++ << 8; w |= *data++;
2207 h = *data++ << 8; h |= *data++; 2702 h = *data++ << 8; h |= *data++;
2208 2703
2209 // we need to do this 'cause we don't keep an absolute coord system for rows 2704 // we need to do this 'cause we don't keep an absolute coord system for rows
2221 { 2716 {
2222 maprow *row = map_get_row (self, y); 2717 maprow *row = map_get_row (self, y);
2223 2718
2224 for (x = x0; x < x1; x++) 2719 for (x = x0; x < x1; x++)
2225 { 2720 {
2721 uint8_t flags;
2722
2723 if (data + 7 >= end)
2724 XSRETURN_EMPTY;
2725
2226 uint8_t flags = *data++; 2726 flags = *data++;
2227 2727
2228 if (flags) 2728 if (flags)
2229 { 2729 {
2230 mapcell *cell = row_get_cell (row, x); 2730 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 }; 2731 tileid tile[3] = { 0, 0, 0 };
2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2734 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2735 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2236 2736
2237 if (cell->darkness == 0) 2737 if (cell->darkness == 0)
2238 { 2738 {
2239 cell->darkness = 0; 2739 /*cell->darkness = 0;*/
2740 EXTEND (SP, 3);
2240 2741
2241 for (z = 0; z <= 2; z++) 2742 for (z = 0; z <= 2; z++)
2242 { 2743 {
2243 tileid t = tile [z]; 2744 tileid t = tile [z];
2244 2745
2245 if (t >= self->texs || (t && !self->tex [t].name)) 2746 if (t >= self->texs || (t && !self->tex [t].name))
2246 { 2747 {
2247 XPUSHs (sv_2mortal (newSViv (t))); 2748 PUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t); 2749 need_texid (self, t);
2249 } 2750 }
2250 2751
2251 cell->tile [z] = t; 2752 cell->tile [z] = t;
2252 } 2753 }
2254 } 2755 }
2255 } 2756 }
2256 } 2757 }
2257} 2758}
2258 2759
2259MODULE = CFPlus PACKAGE = CFPlus::RW 2760MODULE = Deliantra::Client PACKAGE = DC::RW
2260 2761
2261CFPlus::RW 2762DC::RW
2262new (SV *class, SV *data_sv) 2763new (SV *class, SV *data_sv)
2263 CODE: 2764 CODE:
2264{ 2765{
2265 STRLEN datalen; 2766 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen); 2767 char *data = SvPVbyte (data_sv, datalen);
2268 RETVAL = SDL_RWFromConstMem (data, datalen); 2769 RETVAL = SDL_RWFromConstMem (data, datalen);
2269} 2770}
2270 OUTPUT: 2771 OUTPUT:
2271 RETVAL 2772 RETVAL
2272 2773
2273CFPlus::RW 2774DC::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb") 2775new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE: 2776 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode); 2777 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT: 2778 OUTPUT:
2278 RETVAL 2779 RETVAL
2279 2780
2280# fails on win32: 2781# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '(' 2782# dc.xs(2268) : error C2059: syntax error : '('
2282#void 2783#void
2283#close (CFPlus::RW self) 2784#close (DC::RW self)
2284# CODE: 2785# CODE:
2285# (self->(close)) (self); 2786# (self->(close)) (self);
2286 2787
2287MODULE = CFPlus PACKAGE = CFPlus::Channel 2788MODULE = Deliantra::Client PACKAGE = DC::Channel
2288 2789
2289PROTOTYPES: DISABLE 2790PROTOTYPES: DISABLE
2290 2791
2291CFPlus::Channel 2792DC::Channel
2292find () 2793find ()
2293 CODE: 2794 CODE:
2294{ 2795{
2295 RETVAL = Mix_GroupAvailable (-1); 2796 RETVAL = Mix_GroupAvailable (-1);
2296 2797
2309} 2810}
2310 OUTPUT: 2811 OUTPUT:
2311 RETVAL 2812 RETVAL
2312 2813
2313void 2814void
2314halt (CFPlus::Channel self) 2815halt (DC::Channel self)
2315 CODE: 2816 CODE:
2316 Mix_HaltChannel (self); 2817 Mix_HaltChannel (self);
2317 2818
2318void 2819void
2319expire (CFPlus::Channel self, int ticks = -1) 2820expire (DC::Channel self, int ticks = -1)
2320 CODE: 2821 CODE:
2321 Mix_ExpireChannel (self, ticks); 2822 Mix_ExpireChannel (self, ticks);
2322 2823
2323void 2824void
2324fade_out (CFPlus::Channel self, int ticks = -1) 2825fade_out (DC::Channel self, int ticks = -1)
2325 CODE: 2826 CODE:
2326 Mix_FadeOutChannel (self, ticks); 2827 Mix_FadeOutChannel (self, ticks);
2327 2828
2328int 2829int
2329volume (CFPlus::Channel self, int volume) 2830volume (DC::Channel self, int volume)
2330 CODE: 2831 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128)); 2832 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT: 2833 OUTPUT:
2333 RETVAL 2834 RETVAL
2334 2835
2335void 2836void
2336unregister_all_effects (CFPlus::Channel self) 2837unregister_all_effects (DC::Channel self)
2337 CODE: 2838 CODE:
2338 Mix_UnregisterAllEffects (self); 2839 Mix_UnregisterAllEffects (self);
2339 2840
2340void 2841void
2341set_panning (CFPlus::Channel self, int left, int right) 2842set_panning (DC::Channel self, int left, int right)
2342 CODE: 2843 CODE:
2343 left = CLAMP (left , 0, 255); 2844 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255); 2845 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right); 2846 Mix_SetPanning (self, left, right);
2346 2847
2347void 2848void
2348set_distance (CFPlus::Channel self, int distance) 2849set_distance (DC::Channel self, int distance)
2349 CODE: 2850 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255)); 2851 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351 2852
2352void 2853void
2353set_position (CFPlus::Channel self, int angle, int distance) 2854set_position (DC::Channel self, int angle, int distance)
2354 CODE: 2855 CODE:
2355 2856
2356void 2857void
2357set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance) 2858set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358 CODE: 2859 CODE:
2359{ 2860{
2360 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2861 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2862 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2362 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2863 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363} 2864}
2364 2865
2365void 2866void
2366set_reverse_stereo (CFPlus::Channel self, int flip) 2867set_reverse_stereo (DC::Channel self, int flip)
2367 CODE: 2868 CODE:
2368 Mix_SetReverseStereo (self, flip); 2869 Mix_SetReverseStereo (self, flip);
2369 2870
2370MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2871MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371 2872
2372PROTOTYPES: DISABLE 2873PROTOTYPES: DISABLE
2373 2874
2875void
2876decoders ()
2877 PPCODE:
2878#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2879 int i, num = Mix_GetNumChunkDecoders ();
2880 EXTEND (SP, num);
2881 for (i = 0; i < num; ++i)
2882 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2883#else
2884 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2885#endif
2886
2374CFPlus::MixChunk 2887DC::MixChunk
2375new (SV *class, CFPlus::RW rwops) 2888new (SV *class, DC::RW rwops)
2376 CODE: 2889 CODE:
2377 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2890 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378 OUTPUT: 2891 OUTPUT:
2379 RETVAL 2892 RETVAL
2380 2893
2381void 2894void
2382DESTROY (CFPlus::MixChunk self) 2895DESTROY (DC::MixChunk self)
2383 CODE: 2896 CODE:
2384 Mix_FreeChunk (self); 2897 Mix_FreeChunk (self);
2385 2898
2386int 2899int
2387volume (CFPlus::MixChunk self, int volume = -1) 2900volume (DC::MixChunk self, int volume = -1)
2388 CODE: 2901 CODE:
2389 if (items > 1) 2902 if (items > 1)
2390 volume = CLAMP (volume, 0, 128); 2903 volume = CLAMP (volume, 0, 128);
2391 RETVAL = Mix_VolumeChunk (self, volume); 2904 RETVAL = Mix_VolumeChunk (self, volume);
2392 OUTPUT: 2905 OUTPUT:
2393 RETVAL 2906 RETVAL
2394 2907
2395CFPlus::Channel 2908DC::Channel
2396play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1) 2909play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397 CODE: 2910 CODE:
2398{ 2911{
2399 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2912 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400 2913
2401 if (RETVAL < 0) 2914 if (RETVAL < 0)
2408 } 2921 }
2409} 2922}
2410 OUTPUT: 2923 OUTPUT:
2411 RETVAL 2924 RETVAL
2412 2925
2413MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2926MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2927
2928void
2929decoders ()
2930 PPCODE:
2931#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2932 int i, num = Mix_GetNumMusicDecoders ();
2933 EXTEND (SP, num);
2934 for (i = 0; i < num; ++i)
2935 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2936#else
2937 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2938#endif
2414 2939
2415int 2940int
2416volume (int volume = -1) 2941volume (int volume = -1)
2417 PROTOTYPE: ;$ 2942 PROTOTYPE: ;$
2418 CODE: 2943 CODE:
2430void 2955void
2431halt () 2956halt ()
2432 CODE: 2957 CODE:
2433 Mix_HaltMusic (); 2958 Mix_HaltMusic ();
2434 2959
2960int
2961playing ()
2962 CODE:
2963 RETVAL = Mix_PlayingMusic ();
2964 OUTPUT:
2965 RETVAL
2966
2435CFPlus::MixMusic 2967DC::MixMusic
2436new (SV *class, CFPlus::RW rwops) 2968new (SV *class, DC::RW rwops)
2437 CODE: 2969 CODE:
2438 RETVAL = Mix_LoadMUS_RW (rwops); 2970 RETVAL = Mix_LoadMUS_RW (rwops);
2439 OUTPUT: 2971 OUTPUT:
2440 RETVAL 2972 RETVAL
2441 2973
2442void 2974void
2443DESTROY (CFPlus::MixMusic self) 2975DESTROY (DC::MixMusic self)
2444 CODE: 2976 CODE:
2445 Mix_FreeMusic (self); 2977 Mix_FreeMusic (self);
2446 2978
2447int 2979int
2448play (CFPlus::MixMusic self, int loops = -1) 2980play (DC::MixMusic self, int loops = -1)
2449 CODE: 2981 CODE:
2450 RETVAL = Mix_PlayMusic (self, loops); 2982 RETVAL = Mix_PlayMusic (self, loops);
2451 OUTPUT: 2983 OUTPUT:
2452 RETVAL 2984 RETVAL
2453 2985
2454void 2986void
2455fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2987fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456 CODE: 2988 CODE:
2457 Mix_FadeInMusicPos (self, loops, ms, position); 2989 Mix_FadeInMusicPos (self, loops, ms, position);
2458 2990
2459MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2991MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460 2992
2461PROTOTYPES: ENABLE 2993PROTOTYPES: ENABLE
2462 2994
2463BOOT: 2995BOOT:
2464{ 2996{
2465 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2997 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466 static const struct { 2998 static const struct {
2467 const char *name; 2999 const char *name;
2468 IV iv; 3000 IV iv;
2469 } *civ, const_iv[] = { 3001 } *civ, const_iv[] = {
2470# define const_iv(name) { # name, (IV)name } 3002# define const_iv(name) { # name, (IV)name }
2471 const_iv (GL_VENDOR), 3003 const_iv (GL_VENDOR),
2472 const_iv (GL_VERSION), 3004 const_iv (GL_VERSION),
2473 const_iv (GL_EXTENSIONS), 3005 const_iv (GL_EXTENSIONS),
3006 const_iv (GL_MAX_TEXTURE_UNITS),
2474 const_iv (GL_COLOR_MATERIAL), 3007 const_iv (GL_COLOR_MATERIAL),
2475 const_iv (GL_SMOOTH), 3008 const_iv (GL_SMOOTH),
2476 const_iv (GL_FLAT), 3009 const_iv (GL_FLAT),
2477 const_iv (GL_DITHER), 3010 const_iv (GL_DITHER),
2478 const_iv (GL_BLEND), 3011 const_iv (GL_BLEND),
2490 const_iv (GL_ZERO), 3023 const_iv (GL_ZERO),
2491 const_iv (GL_SRC_ALPHA), 3024 const_iv (GL_SRC_ALPHA),
2492 const_iv (GL_DST_ALPHA), 3025 const_iv (GL_DST_ALPHA),
2493 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3026 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2494 const_iv (GL_ONE_MINUS_DST_ALPHA), 3027 const_iv (GL_ONE_MINUS_DST_ALPHA),
3028 const_iv (GL_SRC_COLOR),
3029 const_iv (GL_DST_COLOR),
3030 const_iv (GL_ONE_MINUS_SRC_COLOR),
3031 const_iv (GL_ONE_MINUS_DST_COLOR),
2495 const_iv (GL_SRC_ALPHA_SATURATE), 3032 const_iv (GL_SRC_ALPHA_SATURATE),
2496 const_iv (GL_RGB), 3033 const_iv (GL_RGB),
2497 const_iv (GL_RGBA), 3034 const_iv (GL_RGBA),
2498 const_iv (GL_RGBA4), 3035 const_iv (GL_RGBA4),
2499 const_iv (GL_RGBA8), 3036 const_iv (GL_RGBA8),
2505 const_iv (GL_INTENSITY), 3042 const_iv (GL_INTENSITY),
2506 const_iv (GL_LUMINANCE), 3043 const_iv (GL_LUMINANCE),
2507 const_iv (GL_LUMINANCE_ALPHA), 3044 const_iv (GL_LUMINANCE_ALPHA),
2508 const_iv (GL_FLOAT), 3045 const_iv (GL_FLOAT),
2509 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 3046 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
3047 const_iv (GL_COMPRESSED_ALPHA_ARB),
3048 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3049 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3050 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3051 const_iv (GL_COMPRESSED_RGB_ARB),
3052 const_iv (GL_COMPRESSED_RGBA_ARB),
2510 const_iv (GL_COMPILE), 3053 const_iv (GL_COMPILE),
2511 const_iv (GL_PROXY_TEXTURE_1D), 3054 const_iv (GL_PROXY_TEXTURE_1D),
2512 const_iv (GL_PROXY_TEXTURE_2D), 3055 const_iv (GL_PROXY_TEXTURE_2D),
2513 const_iv (GL_TEXTURE_1D), 3056 const_iv (GL_TEXTURE_1D),
2514 const_iv (GL_TEXTURE_2D), 3057 const_iv (GL_TEXTURE_2D),
2553 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3096 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554 const_iv (GL_POINT_SMOOTH_HINT), 3097 const_iv (GL_POINT_SMOOTH_HINT),
2555 const_iv (GL_LINE_SMOOTH_HINT), 3098 const_iv (GL_LINE_SMOOTH_HINT),
2556 const_iv (GL_POLYGON_SMOOTH_HINT), 3099 const_iv (GL_POLYGON_SMOOTH_HINT),
2557 const_iv (GL_GENERATE_MIPMAP_HINT), 3100 const_iv (GL_GENERATE_MIPMAP_HINT),
3101 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558 const_iv (GL_FASTEST), 3102 const_iv (GL_FASTEST),
2559 const_iv (GL_DONT_CARE), 3103 const_iv (GL_DONT_CARE),
2560 const_iv (GL_NICEST), 3104 const_iv (GL_NICEST),
2561 const_iv (GL_V2F), 3105 const_iv (GL_V2F),
2562 const_iv (GL_V3F), 3106 const_iv (GL_V3F),
2563 const_iv (GL_T2F_V3F), 3107 const_iv (GL_T2F_V3F),
2564 const_iv (GL_T2F_N3F_V3F), 3108 const_iv (GL_T2F_N3F_V3F),
3109 const_iv (GL_FUNC_ADD),
3110 const_iv (GL_FUNC_SUBTRACT),
3111 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2565# undef const_iv 3112# undef const_iv
2566 }; 3113 };
2567 3114
2568 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3115 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2569 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3116 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2570 3117
2571 texture_av = newAV (); 3118 texture_av = newAV ();
2572 AvREAL_off (texture_av); 3119 AvREAL_off (texture_av);
2573} 3120}
2574 3121
3122void
3123disable_GL_EXT_blend_func_separate ()
3124 CODE:
3125 gl.BlendFuncSeparate = 0;
3126 gl.BlendFuncSeparateEXT = 0;
3127
3128void
3129apple_nvidia_bug (int enable)
3130
2575char * 3131char *
2576gl_vendor () 3132gl_vendor ()
2577 CODE: 3133 CODE:
2578 RETVAL = (char *)glGetString (GL_VENDOR); 3134 RETVAL = (char *)glGetString (GL_VENDOR);
2579 OUTPUT: 3135 OUTPUT:
2628 3184
2629void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3185void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2630 CODE: 3186 CODE:
2631 gl_BlendFuncSeparate (sa, da, saa, daa); 3187 gl_BlendFuncSeparate (sa, da, saa, daa);
2632 3188
3189# void glBlendEquation (int se)
3190
2633void glDepthMask (int flag) 3191void glDepthMask (int flag)
2634 3192
2635void glLogicOp (int opcode) 3193void glLogicOp (int opcode)
2636 3194
2637void glColorMask (int red, int green, int blue, int alpha) 3195void glColorMask (int red, int green, int blue, int alpha)
2671void glRotate (float angle, float x, float y, float z) 3229void glRotate (float angle, float x, float y, float z)
2672 CODE: 3230 CODE:
2673 glRotatef (angle, x, y, z); 3231 glRotatef (angle, x, y, z);
2674 3232
2675void glColor (float r, float g, float b, float a = 1.0) 3233void glColor (float r, float g, float b, float a = 1.0)
3234 PROTOTYPE: @
2676 ALIAS: 3235 ALIAS:
2677 glColor_premultiply = 1 3236 glColor_premultiply = 1
2678 CODE: 3237 CODE:
2679 if (ix) 3238 if (ix)
2680 { 3239 {
2700 3259
2701void glRect (float x1, float y1, float x2, float y2) 3260void glRect (float x1, float y1, float x2, float y2)
2702 CODE: 3261 CODE:
2703 glRectf (x1, y1, x2, y2); 3262 glRectf (x1, y1, x2, y2);
2704 3263
3264void glRect_lineloop (float x1, float y1, float x2, float y2)
3265 CODE:
3266 glBegin (GL_LINE_LOOP);
3267 glVertex2f (x1, y1);
3268 glVertex2f (x2, y1);
3269 glVertex2f (x2, y2);
3270 glVertex2f (x1, y2);
3271 glEnd ();
3272
2705PROTOTYPES: ENABLE 3273PROTOTYPES: ENABLE
2706 3274
2707void glBegin (int mode) 3275void glBegin (int mode)
2708 3276
2709void glEnd () 3277void glEnd ()
2741void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3309void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2742 CODE: 3310 CODE:
2743 if (gl.SeparableFilter2D) 3311 if (gl.SeparableFilter2D)
2744 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3312 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745 3313
2746void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3314void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747 3315
2748void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3316void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749 3317
2750void glDrawPixels (int width, int height, int format, int type, char *pixels) 3318void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751 3319
2777 3345
2778void glEndList () 3346void glEndList ()
2779 3347
2780void glCallList (int list) 3348void glCallList (int list)
2781 3349
2782MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3350void c_init ()
3351 CODE:
3352 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3353 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3354
3355MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783 3356
2784PROTOTYPES: DISABLE 3357PROTOTYPES: DISABLE
2785 3358
2786void 3359void
2787find_widget (SV *self, NV x, NV y) 3360find_widget (SV *self, NV x, NV y)
2791 XPUSHs (self); 3364 XPUSHs (self);
2792} 3365}
2793 3366
2794BOOT: 3367BOOT:
2795{ 3368{
2796 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3369 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797 3370
2798 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3371 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3372 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3373 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3374 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802} 3375}
2803 3376
2804void 3377void
2805draw (SV *self) 3378draw (SV *self)
2806 CODE: 3379 CODE:
2810 NV x, y, w, h; 3383 NV x, y, w, h;
2811 SV *draw_x_sv = GvSV (draw_x_gv); 3384 SV *draw_x_sv = GvSV (draw_x_gv);
2812 SV *draw_y_sv = GvSV (draw_y_gv); 3385 SV *draw_y_sv = GvSV (draw_y_gv);
2813 SV *draw_w_sv = GvSV (draw_w_gv); 3386 SV *draw_w_sv = GvSV (draw_w_gv);
2814 SV *draw_h_sv = GvSV (draw_h_gv); 3387 SV *draw_h_sv = GvSV (draw_h_gv);
2815 SV *hover;
2816 double draw_x, draw_y, draw_w, draw_h; 3388 double draw_x, draw_y;
2817 3389
2818 if (!SvROK (self)) 3390 if (!SvROK (self))
2819 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3391 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820 3392
2821 hv = (HV *)SvRV (self); 3393 hv = (HV *)SvRV (self);
2822 3394
2823 if (SvTYPE (hv) != SVt_PVHV) 3395 if (SvTYPE (hv) != SVt_PVHV)
2824 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3396 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825 3397
2826 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3398 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3399 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828 3400
2829 if (!h || !w) 3401 if (!h || !w)
2849 { 3421 {
2850 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3422 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851 3423
2852 if (svp && SvTRUE (*svp)) 3424 if (svp && SvTRUE (*svp))
2853 { 3425 {
2854 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3426 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855 glEnable (GL_BLEND); 3427 glEnable (GL_BLEND);
2856 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3428 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857 glBegin (GL_QUADS); 3429 glBegin (GL_QUADS);
2858 glVertex2f (0, 0); 3430 glVertex2f (0, 0);
2859 glVertex2f (w, 0); 3431 glVertex2f (w, 0);
2862 glEnd (); 3434 glEnd ();
2863 glDisable (GL_BLEND); 3435 glDisable (GL_BLEND);
2864 } 3436 }
2865 } 3437 }
2866#if 0 3438#if 0
2867 if ($ENV{CFPLUS_DEBUG} & 1) { 3439 // draw borders, for debugging
2868 glPushMatrix; 3440 glPushMatrix ();
2869 glColor 1, 1, 0, 1; 3441 glColor4f (1., 1., 0., 1.);
2870 glTranslate 0.375, 0.375; 3442 glTranslatef (.5, .5, 0.);
2871 glBegin GL_LINE_LOOP; 3443 glBegin (GL_LINE_LOOP);
2872 glVertex 0 , 0; 3444 glVertex2f (0 , 0);
2873 glVertex $self->{w} - 1, 0; 3445 glVertex2f (w - 1, 0);
2874 glVertex $self->{w} - 1, $self->{h} - 1; 3446 glVertex2f (w - 1, h - 1);
2875 glVertex 0 , $self->{h} - 1; 3447 glVertex2f (0 , h - 1);
2876 glEnd; 3448 glEnd ();
2877 glPopMatrix; 3449 glPopMatrix ();
2878 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879 }
2880#endif 3450#endif
2881 PUSHMARK (SP); 3451 PUSHMARK (SP);
2882 XPUSHs (self); 3452 XPUSHs (self);
2883 PUTBACK; 3453 PUTBACK;
2884 call_method ("_draw", G_VOID | G_DISCARD); 3454 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines