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.201 by root, Tue Jul 17 17:39:06 2007 UTC vs.
Revision 1.291 by root, Thu Nov 26 07:19:11 2009 UTC

… …
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
22#endif 27#endif
23 28
24#include <assert.h> 29#include <assert.h>
25#include <math.h> 30#include <math.h>
26#include <string.h> 31#include <string.h>
27#include <stdio.h> 32#include <stdio.h>
28#include <stdlib.h> 33#include <stdlib.h>
29 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
30#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
31#include <SDL_endian.h> 39#include <SDL_endian.h>
32#include <SDL_image.h> 40#include <SDL_image.h>
33#include <SDL_mixer.h> 41#include <SDL_mixer.h>
34#include <SDL_opengl.h> 42#include <SDL_opengl.h>
35 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
36#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
38 51
39#include <glib/gmacros.h> 52#include <glib/gmacros.h>
40 53
41#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
42 66
43#ifndef _WIN32 67#ifndef _WIN32
44# include <sys/types.h> 68# include <sys/types.h>
45# include <sys/socket.h> 69# include <sys/socket.h>
46# include <netinet/in.h> 70# include <netinet/in.h>
47# include <netinet/tcp.h> 71# include <netinet/tcp.h>
48# include <inttypes.h> 72# include <inttypes.h>
49#endif 73#endif
50 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 85
53#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
54 87
55#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
57 90
58#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
59 92
60#if 0 93/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 95
63# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
64#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
65 101
66static AV *texture_av; 102static AV *texture_av;
67 103
68static struct 104static struct
69{ 105{
… …
106 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
108} 144}
109 145
110#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
111 148
112#include "pango-font.c" 149#include "pango-font.c"
113#include "pango-fontmap.c" 150#include "pango-fontmap.c"
114#include "pango-render.c" 151#include "pango-render.c"
115 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
116typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
117typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
118 157
119typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
120 159
121static int 160static int
122shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
123{ 162{
124 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
… …
138 177
139typedef struct cf_layout { 178typedef struct cf_layout {
140 PangoLayout *pl; 179 PangoLayout *pl;
141 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
142 int base_height; 181 int base_height;
143 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
144} *CFPlus__Layout; 184} *DC__Layout;
145 185
146static CFPlus__Font default_font; 186static DC__Font default_font;
147static PangoContext *opengl_context; 187static PangoContext *opengl_context;
148static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
149 189
150static void 190static void
151substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
… …
156#endif 196#endif
157 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
158} 198}
159 199
160static void 200static void
161layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
162{ 202{
163 /* use a random scale factor to account for unknown descenders, 0.8 works 203 /* use a random scale factor to account for unknown descenders, 0.8 works
164 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
165 */ 205 */
166 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
167 207
168 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
169 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
170 210
171 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
172} 212}
173 213
174static void 214static void
175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
176{ 216{
177 PangoRectangle rect; 217 PangoRectangle rect;
178 218
179 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
180 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
… …
191 231
192typedef uint16_t tileid; 232typedef uint16_t tileid;
193typedef uint16_t faceid; 233typedef uint16_t faceid;
194 234
195typedef struct { 235typedef struct {
196 int name; 236 GLuint name;
197 int w, h; 237 int w, h;
198 float s, t; 238 float s, t;
199 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
200 tileid smoothtile; 240 tileid smoothtile;
201 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
202} maptex; 243} maptex;
203 244
204typedef struct { 245typedef struct {
205 uint32_t player; 246 uint32_t player;
206 tileid tile[3]; 247 tileid tile[3];
… …
219 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
220 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
221 262
222 int32_t rows; 263 int32_t rows;
223 maprow *row; 264 maprow *row;
224} *CFPlus__Map; 265} *DC__Map;
225 266
226static char * 267static char *
227prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
228{ 269{
229 char *p; 270 char *p;
… …
267 self->texs *= 2; 308 self->texs *= 2;
268 } 309 }
269} 310}
270 311
271static maprow * 312static maprow *
272map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
273{ 314{
274 if (0 > y) 315 if (0 > y)
275 { 316 {
276 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
277 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
… …
315 356
316 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
317} 358}
318 359
319static mapcell * 360static mapcell *
320map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
321{ 362{
322 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
323} 364}
324 365
325static void 366static void
326map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
327{ 368{
328 int r; 369 int r;
329 370
330 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
331 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
… …
338 self->oy = 0; 379 self->oy = 0;
339 self->row = 0; 380 self->row = 0;
340 self->rows = 0; 381 self->rows = 0;
341} 382}
342 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
343static void 394static void
344map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
345{ 396{
346 int x, y; 397 int x, y;
347 maprow *row; 398 maprow *row;
348 mapcell *cell; 399 mapcell *cell;
349 400
… …
361 if (x >= row->c1) 412 if (x >= row->c1)
362 break; 413 break;
363 414
364 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
365 416
366 cell->darkness = 0; 417 CELL_CLEAR (cell);
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
370 } 418 }
371 } 419 }
372} 420}
373 421
374typedef struct { 422typedef struct {
… …
428 n |= n >> 16; 476 n |= n >> 16;
429 477
430 return n + 1; 478 return n + 1;
431} 479}
432 480
481static unsigned int
482popcount (unsigned int n)
483{
484 n -= (n >> 1) & 0x55555555U;
485 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486 n = ((n >> 4) + n) & 0x0f0f0f0fU;
487 n *= 0x01010101U;
488
489 return n >> 24;
490}
491
433/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
436 495
437MODULE = CFPlus PACKAGE = CFPlus 496/******************************************************************************/
497
498static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
499static GV *hover_gv;
500
501static int
502within_widget (SV *widget, NV x, NV y)
503{
504 HV *self;
505 SV **svp;
506 NV wx, ww, wy, wh;
507
508 if (!SvROK (widget))
509 return 0;
510
511 self = (HV *)SvRV (widget);
512
513 if (SvTYPE (self) != SVt_PVHV)
514 return 0;
515
516 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
517 if (y < wy)
518 return 0;
519
520 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
521 if (y >= wy + wh)
522 return 0;
523
524 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
525 if (x < wx)
526 return 0;
527
528 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
529 if (x >= wx + ww)
530 return 0;
531
532 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
533 if (!svp || !SvTRUE (*svp))
534 return 0;
535
536 return 1;
537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
590
591MODULE = Deliantra::Client PACKAGE = DC
438 592
439PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
440 594
441BOOT: 595BOOT:
442{ 596{
443 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
444 static const struct { 598 static const struct {
445 const char *name; 599 const char *name;
446 IV iv; 600 IV iv;
447 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
448# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
… …
470 624
471 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
474 628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
678
679 const_iv (SDLK_FIRST),
680 const_iv (SDLK_LAST),
475 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
476 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
477 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
478 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
479 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
… …
551 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
552 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
553 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
554 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
555 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
762
763 const_iv (KMOD_LRAM),
764
765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
556# undef const_iv 795# undef const_iv
557 }; 796 };
558 797
559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
578 817
579NV floor (NV x) 818NV floor (NV x)
580 819
581NV ceil (NV x) 820NV ceil (NV x)
582 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
583void 826void
584pango_init () 827pango_init ()
585 CODE: 828 CODE:
586{ 829{
587 opengl_fontmap = pango_opengl_font_map_new (); 830 opengl_fontmap = pango_opengl_font_map_new ();
588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 831 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 832 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
833 /*pango_context_set_font_description (opengl_context, default_font);*/
834#if PANGO_VERSION_CHECK (1, 15, 2)
835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
837#endif
590} 838}
591 839
592char *
593SDL_GetError () 840char *SDL_GetError ()
594 841
595int 842void SDL_braino ()
596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
597 843
598void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
599SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
600 860
601void 861void
602SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
603 PPCODE: 863 PPCODE:
604{ 864{
… …
616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
619 879
620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
621#if SDL_VERSION_ATLEAST(1,2,10)
622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
625 882
626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
627 884
628 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
629 while (*m) 886 while (*m)
630 { 887 {
631 if ((*m)->w >= 640 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
632 { 889 {
633 AV *av = newAV (); 890 AV *av = newAV ();
634 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
635 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
660 917
661 if (RETVAL) 918 if (RETVAL)
662 { 919 {
663 av_clear (texture_av); 920 av_clear (texture_av);
664 921
665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 923#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
667#include "glfunc.h" 924#include "glfunc.h"
668#undef GL_FUNC 925#undef GL_FUNC
669 } 926 }
670} 927}
… …
677char * 934char *
678SDL_GetKeyName (int sym) 935SDL_GetKeyName (int sym)
679 936
680int 937int
681SDL_GetAppState () 938SDL_GetAppState ()
939
940int
941SDL_GetModState ()
682 942
683void 943void
684poll_events () 944poll_events ()
685 PPCODE: 945 PPCODE:
686{ 946{
… …
696 { 956 {
697 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
698 case SDL_KEYUP: 958 case SDL_KEYUP:
699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 961 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 962 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
704 break; 964 break;
705 965
706 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
725 x = ev.motion.x; 985 x = ev.motion.x;
726 y = ev.motion.y; 986 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 } 988 }
729 989
730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
731 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
732 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
733 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
734 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
735 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 } 996 }
737 break; 997 break;
738 998
739 case SDL_MOUSEBUTTONDOWN: 999 case SDL_MOUSEBUTTONDOWN:
740 case SDL_MOUSEBUTTONUP: 1000 case SDL_MOUSEBUTTONUP:
741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1001 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
742 1002
743 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1003 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
744 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1004 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
745 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1005 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
746 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1006 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1011 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1012 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
753 break; 1013 break;
754 } 1014 }
755 1015
756 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1016 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
757 } 1017 }
758} 1018}
759 1019
760int 1020int
761Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1021Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
762 POSTCALL: 1022 POSTCALL:
763 Mix_HookMusicFinished (music_finished); 1023 Mix_HookMusicFinished (music_finished);
764 Mix_ChannelFinished (channel_finished); 1024 Mix_ChannelFinished (channel_finished);
765 1025
766void 1026void
1027Mix_QuerySpec ()
1028 PPCODE:
1029{
1030 int freq, channels;
1031 Uint16 format;
1032
1033 if (Mix_QuerySpec (&freq, &format, &channels))
1034 {
1035 EXTEND (SP, 3);
1036 PUSHs (sv_2mortal (newSViv (freq)));
1037 PUSHs (sv_2mortal (newSViv (format)));
1038 PUSHs (sv_2mortal (newSViv (channels)));
1039 }
1040}
1041
1042void
767Mix_CloseAudio () 1043Mix_CloseAudio ()
768 1044
769int 1045int
770Mix_AllocateChannels (int numchans = -1) 1046Mix_AllocateChannels (int numchans = -1)
1047
1048const char *
1049Mix_GetError ()
771 1050
772void 1051void
773lowdelay (int fd, int val = 1) 1052lowdelay (int fd, int val = 1)
774 CODE: 1053 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1054 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
… …
801 } 1080 }
802 } 1081 }
803#endif 1082#endif
804} 1083}
805 1084
806void 1085int
807add_font (char *file) 1086add_font (char *file)
808 CODE: 1087 CODE:
809 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT:
1090 RETVAL
810 1091
811void 1092void
812load_image_inline (SV *image_) 1093load_image_inline (SV *image_)
813 ALIAS: 1094 ALIAS:
814 load_image_file = 1 1095 load_image_file = 1
… …
817 STRLEN image_len; 1098 STRLEN image_len;
818 char *image = (char *)SvPVbyte (image_, image_len); 1099 char *image = (char *)SvPVbyte (image_, image_len);
819 SDL_Surface *surface, *surface2; 1100 SDL_Surface *surface, *surface2;
820 SDL_PixelFormat fmt; 1101 SDL_PixelFormat fmt;
821 SDL_RWops *rw = ix 1102 SDL_RWops *rw = ix
822 ? SDL_RWFromFile (image, "r") 1103 ? SDL_RWFromFile (image, "rb")
823 : SDL_RWFromConstMem (image, image_len); 1104 : SDL_RWFromConstMem (image, image_len);
824 1105
825 if (!rw) 1106 if (!rw)
826 croak ("load_image: %s", SDL_GetError ()); 1107 croak ("load_image: %s", SDL_GetError ());
827 1108
… …
900void 1181void
901error (char *message) 1182error (char *message)
902 CODE: 1183 CODE:
903 fprintf (stderr, "ERROR: %s\n", message); 1184 fprintf (stderr, "ERROR: %s\n", message);
904#ifdef _WIN32 1185#ifdef _WIN32
905 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1186 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
906#endif 1187#endif
907 1188
908void 1189void
909fatal (char *message) 1190fatal (char *message)
910 CODE: 1191 CODE:
911 fprintf (stderr, "FATAL: %s\n", message); 1192 fprintf (stderr, "FATAL: %s\n", message);
912#ifdef _WIN32 1193#ifdef _WIN32
913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1194 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
914#endif 1195#endif
915 _exit (1); 1196 _exit (1);
916 1197
917void 1198void
918_exit (int retval = 0) 1199_exit (int retval = 0)
… …
930#if DEBUG 1211#if DEBUG
931 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
932#endif 1213#endif
933} 1214}
934 1215
935MODULE = CFPlus PACKAGE = CFPlus::Font 1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
936 1222
937CFPlus::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1224
1225PROTOTYPES: DISABLE
1226
1227DC::Font
938new_from_file (SV *class, char *path, int id = 0) 1228new_from_file (SV *class, char *path, int id = 0)
939 CODE: 1229 CODE:
940{ 1230{
941 int count; 1231 int count;
942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
945} 1235}
946 OUTPUT: 1236 OUTPUT:
947 RETVAL 1237 RETVAL
948 1238
949void 1239void
950DESTROY (CFPlus::Font self) 1240DESTROY (DC::Font self)
951 CODE: 1241 CODE:
952 pango_font_description_free (self); 1242 pango_font_description_free (self);
953 1243
954void 1244void
955make_default (CFPlus::Font self) 1245make_default (DC::Font self)
1246 PROTOTYPE: $
956 CODE: 1247 CODE:
957 default_font = self; 1248 default_font = self;
958 1249
959MODULE = CFPlus PACKAGE = CFPlus::Layout 1250MODULE = Deliantra::Client PACKAGE = DC::Layout
960 1251
1252PROTOTYPES: DISABLE
1253
961void 1254void
962reset_glyph_cache () 1255glyph_cache_backup ()
1256 PROTOTYPE:
963 CODE: 1257 CODE:
1258 tc_backup ();
1259
1260void
1261glyph_cache_restore ()
1262 PROTOTYPE:
1263 CODE:
964 tc_clear (); 1264 tc_restore ();
965 1265
966CFPlus::Layout 1266DC::Layout
967new (SV *class) 1267new (SV *class)
968 CODE: 1268 CODE:
969 New (0, RETVAL, 1, struct cf_layout); 1269 New (0, RETVAL, 1, struct cf_layout);
970 1270
971 RETVAL->pl = pango_layout_new (opengl_context); 1271 RETVAL->pl = pango_layout_new (opengl_context);
… …
973 RETVAL->g = 1.; 1273 RETVAL->g = 1.;
974 RETVAL->b = 1.; 1274 RETVAL->b = 1.;
975 RETVAL->a = 1.; 1275 RETVAL->a = 1.;
976 RETVAL->base_height = MIN_FONT_HEIGHT; 1276 RETVAL->base_height = MIN_FONT_HEIGHT;
977 RETVAL->font = 0; 1277 RETVAL->font = 0;
1278 RETVAL->rc = rc_alloc ();
978 1279
979 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1280 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
980 layout_update_font (RETVAL); 1281 layout_update_font (RETVAL);
981 OUTPUT: 1282 OUTPUT:
982 RETVAL 1283 RETVAL
983 1284
984void 1285void
985DESTROY (CFPlus::Layout self) 1286DESTROY (DC::Layout self)
986 CODE: 1287 CODE:
987 g_object_unref (self->pl); 1288 g_object_unref (self->pl);
1289 rc_free (self->rc);
988 Safefree (self); 1290 Safefree (self);
989 1291
990void 1292void
991set_text (CFPlus::Layout self, SV *text_) 1293set_text (DC::Layout self, SV *text_)
992 CODE: 1294 CODE:
993{ 1295{
994 STRLEN textlen; 1296 STRLEN textlen;
995 char *text = SvPVutf8 (text_, textlen); 1297 char *text = SvPVutf8 (text_, textlen);
996 1298
997 pango_layout_set_text (self->pl, text, textlen); 1299 pango_layout_set_text (self->pl, text, textlen);
998} 1300}
999 1301
1000void 1302void
1001set_markup (CFPlus::Layout self, SV *text_) 1303set_markup (DC::Layout self, SV *text_)
1002 CODE: 1304 CODE:
1003{ 1305{
1004 STRLEN textlen; 1306 STRLEN textlen;
1005 char *text = SvPVutf8 (text_, textlen); 1307 char *text = SvPVutf8 (text_, textlen);
1006 1308
1007 pango_layout_set_markup (self->pl, text, textlen); 1309 pango_layout_set_markup (self->pl, text, textlen);
1008} 1310}
1009 1311
1010void 1312void
1011set_shapes (CFPlus::Layout self, ...) 1313set_shapes (DC::Layout self, ...)
1012 CODE: 1314 CODE:
1013{ 1315{
1014 PangoAttrList *attrs = 0; 1316 PangoAttrList *attrs = 0;
1015 const char *text = pango_layout_get_text (self->pl); 1317 const char *text = pango_layout_get_text (self->pl);
1016 const char *pos = text; 1318 const char *pos = text;
… …
1051 if (attrs) 1353 if (attrs)
1052 pango_layout_set_attributes (self->pl, attrs); 1354 pango_layout_set_attributes (self->pl, attrs);
1053} 1355}
1054 1356
1055void 1357void
1056get_shapes (CFPlus::Layout self) 1358get_shapes (DC::Layout self)
1057 PPCODE: 1359 PPCODE:
1058{ 1360{
1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1361 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1060 1362
1061 do 1363 do
1062 { 1364 {
1063 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1365 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1064 1366
1065 if (run && shape_attr_p (run)) 1367 if (run && shape_attr_p (run))
1066 { 1368 {
1067 PangoRectangle extents; 1369 PangoRectangle extents;
1068 pango_layout_iter_get_run_extents (iter, 0, &extents); 1370 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1076 1378
1077 pango_layout_iter_free (iter); 1379 pango_layout_iter_free (iter);
1078} 1380}
1079 1381
1080int 1382int
1081has_wrapped (CFPlus::Layout self) 1383has_wrapped (DC::Layout self)
1082 CODE: 1384 CODE:
1083{ 1385{
1084 int lines = 1; 1386 int lines = 1;
1085 const char *text = pango_layout_get_text (self->pl); 1387 const char *text = pango_layout_get_text (self->pl);
1086 1388
… …
1091} 1393}
1092 OUTPUT: 1394 OUTPUT:
1093 RETVAL 1395 RETVAL
1094 1396
1095SV * 1397SV *
1096get_text (CFPlus::Layout self) 1398get_text (DC::Layout self)
1097 CODE: 1399 CODE:
1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1400 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1099 sv_utf8_decode (RETVAL); 1401 sv_utf8_decode (RETVAL);
1100 OUTPUT: 1402 OUTPUT:
1101 RETVAL 1403 RETVAL
1102 1404
1103void 1405void
1104set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1406set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1105 CODE: 1407 CODE:
1106 self->r = r; 1408 self->r = r;
1107 self->g = g; 1409 self->g = g;
1108 self->b = b; 1410 self->b = b;
1109 self->a = a; 1411 self->a = a;
1110 1412
1111void 1413void
1112set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1414set_font (DC::Layout self, DC::Font font = 0)
1113 CODE: 1415 CODE:
1114 if (self->font != font) 1416 if (self->font != font)
1115 { 1417 {
1116 self->font = font; 1418 self->font = font;
1117 layout_update_font (self); 1419 layout_update_font (self);
1118 } 1420 }
1119 1421
1120void 1422void
1121set_height (CFPlus::Layout self, int base_height) 1423set_height (DC::Layout self, int base_height)
1122 CODE: 1424 CODE:
1123 if (self->base_height != base_height) 1425 if (self->base_height != base_height)
1124 { 1426 {
1125 self->base_height = base_height; 1427 self->base_height = base_height;
1126 layout_update_font (self); 1428 layout_update_font (self);
1127 } 1429 }
1128 1430
1129void 1431void
1130set_width (CFPlus::Layout self, int max_width = -1) 1432set_width (DC::Layout self, int max_width = -1)
1131 CODE: 1433 CODE:
1132 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1434 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1133 1435
1134void 1436void
1135set_indent (CFPlus::Layout self, int indent) 1437set_indent (DC::Layout self, int indent)
1136 CODE: 1438 CODE:
1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1439 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1138 1440
1139void 1441void
1140set_spacing (CFPlus::Layout self, int spacing) 1442set_spacing (DC::Layout self, int spacing)
1141 CODE: 1443 CODE:
1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1444 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1143 1445
1144void 1446void
1145set_ellipsise (CFPlus::Layout self, int ellipsise) 1447set_ellipsise (DC::Layout self, int ellipsise)
1146 CODE: 1448 CODE:
1147 pango_layout_set_ellipsize (self->pl, 1449 pango_layout_set_ellipsize (self->pl,
1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1450 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1451 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1452 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1151 : PANGO_ELLIPSIZE_NONE 1453 : PANGO_ELLIPSIZE_NONE
1152 ); 1454 );
1153 1455
1154void 1456void
1155set_single_paragraph_mode (CFPlus::Layout self, int spm) 1457set_single_paragraph_mode (DC::Layout self, int spm)
1156 CODE: 1458 CODE:
1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1459 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1158 1460
1159void 1461void
1160size (CFPlus::Layout self) 1462size (DC::Layout self)
1161 PPCODE: 1463 PPCODE:
1162{ 1464{
1163 int w, h; 1465 int w, h;
1164 1466
1165 layout_get_pixel_size (self, &w, &h); 1467 layout_get_pixel_size (self, &w, &h);
… …
1168 PUSHs (sv_2mortal (newSViv (w))); 1470 PUSHs (sv_2mortal (newSViv (w)));
1169 PUSHs (sv_2mortal (newSViv (h))); 1471 PUSHs (sv_2mortal (newSViv (h)));
1170} 1472}
1171 1473
1172int 1474int
1173descent (CFPlus::Layout self) 1475descent (DC::Layout self)
1174 CODE: 1476 CODE:
1175{ 1477{
1176 PangoRectangle rect; 1478 PangoRectangle rect;
1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1479 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1178 pango_layout_line_get_pixel_extents (line, 0, &rect); 1480 pango_layout_line_get_pixel_extents (line, 0, &rect);
1179 RETVAL = PANGO_DESCENT (rect); 1481 RETVAL = PANGO_DESCENT (rect);
1180} 1482}
1181 OUTPUT: 1483 OUTPUT:
1182 RETVAL 1484 RETVAL
1183 1485
1184int 1486int
1185xy_to_index (CFPlus::Layout self, int x, int y) 1487xy_to_index (DC::Layout self, int x, int y)
1186 CODE: 1488 CODE:
1187{ 1489{
1188 int index, trailing; 1490 int index, trailing;
1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1491 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1190 RETVAL = index + trailing; 1492 RETVAL = index + trailing;
1191} 1493}
1192 OUTPUT: 1494 OUTPUT:
1193 RETVAL 1495 RETVAL
1194 1496
1195void 1497void
1196cursor_pos (CFPlus::Layout self, int index) 1498cursor_pos (DC::Layout self, int index)
1197 PPCODE: 1499 PPCODE:
1198{ 1500{
1199 PangoRectangle strong_pos; 1501 PangoRectangle pos;
1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1502 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1201 1503
1202 EXTEND (SP, 3); 1504 EXTEND (SP, 3);
1203 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1505 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1506 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1507 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1206} 1508}
1207 1509
1208void 1510void
1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1511index_to_line_x (DC::Layout self, int index, int trailing = 0)
1210 PPCODE: 1512 PPCODE:
1211{ 1513{
1212 int line, x; 1514 int line, x;
1213 1515
1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1516 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1517#if !PANGO_VERSION_CHECK (1, 17, 3)
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1518 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1216 1519 --line;
1520#endif
1217 EXTEND (SP, 2); 1521 EXTEND (SP, 2);
1218 PUSHs (sv_2mortal (newSViv (line - 1))); 1522 PUSHs (sv_2mortal (newSViv (line)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1523 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220} 1524}
1221 1525
1222void 1526void
1223line_x_to_index (CFPlus::Layout self, int line, int x) 1527line_x_to_index (DC::Layout self, int line, int x)
1224 PPCODE: 1528 PPCODE:
1225{ 1529{
1226 PangoLayoutLine *lp; 1530 PangoLayoutLine *lp;
1227 int index, trailing; 1531 int index, trailing;
1228 1532
1229 if (line < 0) 1533 if (line < 0)
1230 XSRETURN_EMPTY; 1534 XSRETURN_EMPTY;
1231 1535
1232 if (!(lp = pango_layout_get_line (self->pl, line))) 1536 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */ 1537 XSRETURN_EMPTY; /* do better */
1234 1538
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1539 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236 1540
1237 EXTEND (SP, 2); 1541 EXTEND (SP, 2);
… …
1243 PUSHs (sv_2mortal (newSViv (trailing))); 1547 PUSHs (sv_2mortal (newSViv (trailing)));
1244 } 1548 }
1245} 1549}
1246 1550
1247void 1551void
1248render (CFPlus::Layout self, float x, float y, int flags = 0) 1552render (DC::Layout self, float x, float y, int flags = 0)
1249 PPCODE: 1553 CODE:
1554 rc_clear (self->rc);
1250 pango_opengl_render_layout_subpixel ( 1555 pango_opengl_render_layout_subpixel (
1251 self->pl, 1556 self->pl,
1557 self->rc,
1252 x * PANGO_SCALE, y * PANGO_SCALE, 1558 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a, 1559 self->r, self->g, self->b, self->a,
1254 flags 1560 flags
1255 ); 1561 );
1562 // we assume that context_change actually clears/frees stuff
1563 // and does not do any recomputation...
1564 pango_layout_context_changed (self->pl);
1256 1565
1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1260
1261void 1566void
1262pad2pot (SV *data_, SV *w_, SV *h_) 1567draw (DC::Layout self)
1263 CODE: 1568 CODE:
1264{ 1569{
1265 int ow = SvIV (w_); 1570 glEnable (GL_TEXTURE_2D);
1266 int oh = SvIV (h_); 1571 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1572 glEnable (GL_BLEND);
1573 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1574 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1575 glEnable (GL_ALPHA_TEST);
1576 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1267 1577
1268 if (ow && oh) 1578 rc_draw (self->rc);
1579
1580 glDisable (GL_ALPHA_TEST);
1581 glDisable (GL_BLEND);
1582 glDisable (GL_TEXTURE_2D);
1583}
1584
1585MODULE = Deliantra::Client PACKAGE = DC::Texture
1586
1587PROTOTYPES: ENABLE
1588
1589void
1590pad (SV *data_, int ow, int oh, int nw, int nh)
1591 CODE:
1592{
1593 if ((nw != ow || nh != oh) && SvOK (data_))
1269 { 1594 {
1270 int nw = minpot (ow);
1271 int nh = minpot (oh);
1272
1273 if (nw != ow || nh != oh)
1274 {
1275 if (SvOK (data_))
1276 {
1277 STRLEN datalen; 1595 STRLEN datalen;
1278 char *data = SvPVbyte (data_, datalen); 1596 char *data = SvPVbyte (data_, datalen);
1279 int bpp = datalen / (ow * oh); 1597 int bpp = datalen / (ow * oh);
1280 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1598 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1281 1599
1282 SvPOK_only (result_); 1600 SvPOK_only (result_);
1283 SvCUR_set (result_, nw * nh * bpp); 1601 SvCUR_set (result_, nw * nh * bpp);
1284 1602
1285 memset (SvPVX (result_), 0, nw * nh * bpp); 1603 memset (SvPVX (result_), 0, nw * nh * bpp);
1286 while (oh--) 1604 while (oh--)
1287 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1605 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1288 1606
1289 sv_setsv (data_, result_); 1607 sv_setsv (data_, result_);
1290 }
1291
1292 sv_setiv (w_, nw);
1293 sv_setiv (h_, nh);
1294 }
1295 } 1608 }
1296} 1609}
1297 1610
1298void 1611void
1299draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1612draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1305{ 1618{
1306 HV *hv = (HV *)SvRV (self); 1619 HV *hv = (HV *)SvRV (self);
1307 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1620 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1308 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1621 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1309 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1622 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1623
1624 if (name <= 0)
1625 XSRETURN_EMPTY;
1310 1626
1311 if (items < 5) 1627 if (items < 5)
1312 { 1628 {
1313 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1629 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1314 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1630 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1353 RETVAL = width > 0; 1669 RETVAL = width > 0;
1354} 1670}
1355 OUTPUT: 1671 OUTPUT:
1356 RETVAL 1672 RETVAL
1357 1673
1358MODULE = CFPlus PACKAGE = CFPlus::Map 1674MODULE = Deliantra::Client PACKAGE = DC::Map
1359 1675
1360CFPlus::Map 1676PROTOTYPES: DISABLE
1677
1678DC::Map
1361new (SV *class) 1679new (SV *class)
1362 CODE: 1680 CODE:
1363 New (0, RETVAL, 1, struct map); 1681 New (0, RETVAL, 1, struct map);
1364 RETVAL->x = 0; 1682 RETVAL->x = 0;
1365 RETVAL->y = 0; 1683 RETVAL->y = 0;
… …
1373 RETVAL->row = 0; 1691 RETVAL->row = 0;
1374 OUTPUT: 1692 OUTPUT:
1375 RETVAL 1693 RETVAL
1376 1694
1377void 1695void
1378DESTROY (CFPlus::Map self) 1696DESTROY (DC::Map self)
1379 CODE: 1697 CODE:
1380{ 1698{
1381 map_clear (self); 1699 map_clear (self);
1382 Safefree (self->face2tile); 1700 Safefree (self->face2tile);
1383 Safefree (self->tex); 1701 Safefree (self->tex);
1384 Safefree (self); 1702 Safefree (self);
1385} 1703}
1386 1704
1387void 1705void
1388resize (CFPlus::Map self, int map_width, int map_height) 1706resize (DC::Map self, int map_width, int map_height)
1389 CODE: 1707 CODE:
1390 self->w = map_width; 1708 self->w = map_width;
1391 self->h = map_height; 1709 self->h = map_height;
1392 1710
1393void 1711void
1394clear (CFPlus::Map self) 1712clear (DC::Map self)
1395 CODE: 1713 CODE:
1396 map_clear (self); 1714 map_clear (self);
1397 1715
1398void 1716void
1399set_tileid (CFPlus::Map self, int face, int tile) 1717set_tileid (DC::Map self, int face, int tile)
1400 CODE: 1718 CODE:
1401{ 1719{
1402 need_facenum (self, face); self->face2tile [face] = tile; 1720 need_facenum (self, face); self->face2tile [face] = tile;
1403 need_texid (self, tile); 1721 need_texid (self, tile);
1404} 1722}
1405 1723
1406void 1724void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level) 1725set_smooth (DC::Map self, int face, int smooth, int level)
1408 CODE: 1726 CODE:
1409{ 1727{
1410 tileid texid; 1728 tileid texid;
1411 maptex *tex; 1729 maptex *tex;
1412 1730
… …
1425 tex->smoothtile = self->face2tile [smooth]; 1743 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level; 1744 tex->smoothlevel = level;
1427} 1745}
1428 1746
1429void 1747void
1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1748set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1431 CODE: 1749 CODE:
1432{ 1750{
1433 need_texid (self, texid); 1751 need_texid (self, texid);
1434 1752
1435 { 1753 {
… …
1454 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1455 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1457} 1775}
1458 1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1796
1459int 1797int
1460ox (CFPlus::Map self) 1798ox (DC::Map self)
1461 ALIAS: 1799 ALIAS:
1462 oy = 1 1800 oy = 1
1463 x = 2 1801 x = 2
1464 y = 3 1802 y = 3
1465 w = 4 1803 w = 4
… …
1476 } 1814 }
1477 OUTPUT: 1815 OUTPUT:
1478 RETVAL 1816 RETVAL
1479 1817
1480void 1818void
1481scroll (CFPlus::Map self, int dx, int dy) 1819scroll (DC::Map self, int dx, int dy)
1482 CODE: 1820 CODE:
1483{ 1821{
1484 if (dx > 0) 1822 if (dx > 0)
1485 map_blank (self, self->x, self->y, dx, self->h); 1823 map_blank (self, self->x, self->y, dx, self->h);
1486 else if (dx < 0) 1824 else if (dx < 0)
… …
1501 self->rows += MAP_EXTEND_Y; 1839 self->rows += MAP_EXTEND_Y;
1502 self->y += MAP_EXTEND_Y; 1840 self->y += MAP_EXTEND_Y;
1503 } 1841 }
1504} 1842}
1505 1843
1506void 1844SV *
1507map1a_update (CFPlus::Map self, SV *data_, int extmap) 1845map1a_update (DC::Map self, SV *data_, int extmap)
1508 CODE: 1846 CODE:
1509{ 1847{
1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1511 uint8_t *data_end = (uint8_t *)SvEND (data_); 1849 uint8_t *data_end = (uint8_t *)SvEND (data_);
1512 mapcell *cell; 1850 mapcell *cell;
1513 int x, y, flags; 1851 int x, y, z, flags;
1852 AV *missing = newAV ();
1853 RETVAL = newRV_noinc ((SV *)missing);
1514 1854
1515 while (data < data_end - 1) 1855 while (data < data_end - 1)
1516 { 1856 {
1517 flags = (data [0] << 8) + data [1]; data += 2; 1857 flags = (data [0] << 8) + data [1]; data += 2;
1518 1858
… …
1538 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1539 1879
1540 do 1880 do
1541 { 1881 {
1542 ext = *data++; 1882 ext = *data++;
1543 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1544 1884
1545 if (cmd < 4) 1885 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1548 { 1888 {
… …
1551 } 1891 }
1552 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1555 { 1895 {
1556 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1557 ; // decode player count 1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1558 1900
1559 data += *data + 1; 1901 data += *data + 1;
1560 } 1902 }
1561 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1562 cell->flags = *data++; 1904 cell->flags = *data++;
… …
1569 } 1911 }
1570 else 1912 else
1571 cell->darkness = *data++ + 1; 1913 cell->darkness = *data++ + 1;
1572 } 1914 }
1573 1915
1916 for (z = 0; z <= 2; ++z)
1574 if (flags & 4) 1917 if (flags & (4 >> z))
1575 { 1918 {
1576 faceid face = (data [0] << 8) + data [1]; data += 2; 1919 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face); 1920 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1922
1923 if (cell->tile [z])
1924 {
1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1927 if (!tex->name)
1928 av_push (missing, newSViv (cell->tile [z]));
1929
1930 if (tex->smoothtile)
1931 {
1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1934 if (!smooth->name)
1935 av_push (missing, newSViv (tex->smoothtile));
1936 }
1937 }
1579 } 1938 }
1580
1581 if (flags & 2)
1582 {
1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1586 }
1587
1588 if (flags & 1)
1589 {
1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1593 }
1594 } 1939 }
1595 else 1940 else
1596 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1597 } 1942 }
1598} 1943}
1944 OUTPUT:
1945 RETVAL
1599 1946
1600SV * 1947SV *
1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1948mapmap (DC::Map self, int x0, int y0, int w, int h)
1602 CODE: 1949 CODE:
1603{ 1950{
1604 int x1, x; 1951 int x1, x;
1605 int y1, y; 1952 int y1, y;
1606 int z; 1953 int z;
… …
1651} 1998}
1652 OUTPUT: 1999 OUTPUT:
1653 RETVAL 2000 RETVAL
1654 2001
1655void 2002void
1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1657 CODE: 2004 CODE:
1658{ 2005{
2006 int x, y, z;
2007
1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1662 smooth_key skey; 2011 smooth_key skey;
1663 int x, y, z; 2012 int pl_x, pl_y;
1664 int last_name; 2013 maptex pl_tex;
2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden;
1665 2018
2019 pl_tex.name = 0;
2020
1666 // thats current max. sorry. 2021 // that's current max. sorry.
1667 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1669 2024
1670 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1671 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
1672 2027
1673 glColor4ub (255, 255, 255, 255); 2028 memset (&key, 0, sizeof (key));
1674 2029 key.r = 255;
1675 glEnable (GL_BLEND); 2030 key.g = 255;
1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2031 key.b = 255;
1677 glEnable (GL_TEXTURE_2D); 2032 key.a = 255;
1678 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2033 key.mode = GL_QUADS;
1679 2034 key.format = GL_T2F_V3F;
1680 glBegin (GL_QUADS);
1681
1682 last_name = 0;
1683 2035
1684 mx += self->x; 2036 mx += self->x;
1685 my += self->y; 2037 my += self->y;
1686 2038
1687 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1704 MAX (self->tex [cell->tile [1]].smoothlevel, 2056 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel)); 2057 self->tex [cell->tile [2]].smoothlevel));
1706 } 2058 }
1707 } 2059 }
1708 2060
2061 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1709 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1710 { 2069 {
1711 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1712 2072
1713 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1714 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1715 { 2075 {
1716 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1722 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1723 2083
1724 if (tile) 2084 if (tile)
1725 { 2085 {
1726 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w; 2087 int px, py;
1728 int py = (y + 1) * T - tex.h;
1729 2088
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name) 2089 if (key.texname != tex.name)
1733 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1734 if (!tex.name) 2093 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1736 2095
1737 glEnd (); 2096 key.texname = tex.name;
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2097 arr = rc_array (rc, &key);
1739 glBegin (GL_QUADS);
1740 } 2098 }
1741 2099
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2100 px = (x + 1) * T - tex.w;
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2101 py = (y + 1) * T - tex.h;
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746 2102
1747 if (cell->flags && z == 2) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1748 { 2104 {
1749 if (cell->flags & 1) 2105 pl_x = px;
2106 pl_y = py;
2107 pl_tex = tex;
1750 { 2108 continue;
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 } 2109 }
2110
2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2112 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2113 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1765 2115
1766 // update smooth hash 2116 // update smooth hash
1767 if (tex.smoothtile) 2117 if (tex.smoothtile)
1768 { 2118 {
1769 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
… …
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 } 2153 }
1804 } 2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
2190 }
2191 }
1805 } 2192 }
1806 } 2193 }
2194
2195 rc_draw (rc);
2196 rc_clear (rc);
1807 2197
1808 // go through all smoothlevels, lowest to highest, then draw. 2198 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort 2199 // this is basically counting sort
1810 { 2200 {
1811 int w, b; 2201 int w, b;
1812 2202
2203 glEnable (GL_TEXTURE_2D);
2204 glBegin (GL_QUADS);
1813 for (w = 0; w < 256 / 32; ++w) 2205 for (w = 0; w < 256 / 32; ++w)
1814 { 2206 {
1815 uint32_t smask = smooth_level [w]; 2207 uint32_t smask = smooth_level [w];
1816 if (smask) 2208 if (smask)
1817 for (b = 0; b < 32; ++b) 2209 for (b = 0; b < 32; ++b)
… …
1836 int border = bits & 15; 2228 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2229 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row 2230 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column 2231 float dy = tex.t * .5f ; // 2 images/column
1840 2232
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name) 2233 if (tex.name)
1844 { 2234 {
2235 // this time avoiding texture state changes
2236 // save gobs of state changes.
1845 if (!tex.name) 2237 if (key.texname != tex.name)
1846 continue; // smoothing not yet available 2238 {
2239 self->tex [skey->tile].unused = 0;
1847 2240
1848 glEnd (); 2241 glEnd ();
1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1850 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
1851 } 2244 }
1852 2245
1853 if (border) 2246 if (border)
1854 { 2247 {
1855 float ox = border * dx; 2248 float ox = border * dx;
1856 2249
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2250 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2251 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2252 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2253 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1861 } 2254 }
1862 2255
1863 if (corner) 2256 if (corner)
1864 { 2257 {
1865 float ox = corner * dx; 2258 float ox = corner * dx;
1866 2259
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2260 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2261 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2262 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2263 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2264 }
1871 } 2265 }
1872 } 2266 }
1873 } 2267 }
1874 } 2268 }
1875 } 2269 }
2270
2271 glEnd ();
2272 glDisable (GL_TEXTURE_2D);
2273 key.texname = -1;
1876 } 2274 }
1877 2275
1878 hv_clear (smooth); 2276 hv_clear (smooth);
1879 } 2277 }
1880 2278
1881 glEnd (); 2279 if (pl_tex.name)
2280 {
2281 maptex tex = pl_tex;
2282 int px = pl_x + sdx;
2283 int py = pl_y + sdy;
1882 2284
1883 glDisable (GL_TEXTURE_2D); 2285 key.texname = tex.name;
2286 arr = rc_array (rc, &key);
2287
2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2289 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2290 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2292
2293 rc_draw (rc);
2294 }
2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
1884 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2300 rc_free (rc);
2301 rc_free (rc_ov);
1885 2302
1886 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
1889 { 2306 {
… …
1894 { 2311 {
1895 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
1896 2313
1897 int px = x * T; 2314 int px = x * T;
1898 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
1899 2322
1900 if (cell->stat_hp) 2323 if (cell->stat_hp)
1901 { 2324 {
1902 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
1914 } 2337 }
1915 } 2338 }
1916} 2339}
1917 2340
1918void 2341void
1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2342draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1920 CODE: 2343 CODE:
1921{ 2344{
1922 static float color[16][3] = { 2345 static float color[16][3] = {
1923 { 0.00F, 0.00F, 0.00F }, 2346 { 0.00F, 0.00F, 0.00F },
1924 { 1.00F, 1.00F, 1.00F }, 2347 { 1.00F, 1.00F, 1.00F },
… …
1943 }; 2366 };
1944 2367
1945 int x, y; 2368 int x, y;
1946 2369
1947 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
1948 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1949 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
1950 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1951 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
1952 2381
1953 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
1960 float *c = color [m & 15]; 2389 float *c = color [m & 15];
1961 2390
1962 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
1963 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
1964 2393
1965 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
1966 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1967 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1968 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1969 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1970 } 2399 }
… …
1974 glDisable (GL_BLEND); 2403 glDisable (GL_BLEND);
1975 glDisable (GL_TEXTURE_2D); 2404 glDisable (GL_TEXTURE_2D);
1976} 2405}
1977 2406
1978void 2407void
1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix) 2408fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1980 PPCODE: 2409 PPCODE:
1981{ 2410{
1982 int x, y; 2411 int x, y;
2412 int sw1 = sw + 2;
2413 int sh1 = sh + 2;
2414 int sh3 = sh * 3;
1983 int sw4 = (sw + 3) & ~3; 2415 int sw34 = (sw * 3 + 3) & ~3;
2416 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2417 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2418 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1986 2419
1987 memset (darkness, 255, sw4 * sh);
1988 SvPOK_only (darkness_sv); 2420 SvPOK_only (darkness3_sv);
1989 SvCUR_set (darkness_sv, sw4 * sh); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
1990 2422
1991 mx += self->x; 2423 mx += self->x - 1;
1992 my += self->y; 2424 my += self->y - 1;
1993 2425
2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427
1994 for (y = 0; y < sh; y++) 2428 for (y = 0; y < sh1; y++)
1995 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
1996 { 2430 {
1997 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
1998 2432
1999 for (x = 0; x < sw; x++) 2433 for (x = 0; x < sw1; x++)
2000 if (row->c0 <= x + mx && x + mx < row->c1) 2434 if (row->c0 <= x + mx && x + mx < row->c1)
2001 { 2435 {
2002 mapcell *cell = row->col + (x + mx - row->c0); 2436 mapcell *cell = row->col + (x + mx - row->c0);
2003 2437
2004 darkness[y * sw4 + x] = cell->darkness 2438 darkness1 [y * sw1 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1) 2439 ? 255 - (cell->darkness - 1)
2006 : 255 - FOW_DARKNESS; 2440 : 255 - FOW_DARKNESS;
2007 } 2441 }
2008 } 2442 }
2009 2443
2010 if (smoothing)
2011 {
2012 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2013 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2014
2015 SvPOK_only (darkness2_sv);
2016 SvCUR_set (darkness2_sv, sw4 * sh);
2017
2018 for (y = 0; y < sh; ++y) 2444 for (y = 0; y < sh; ++y)
2019 for (x = 0; x < sw4; ++x) 2445 for (x = 0; x < sw; ++x)
2020 { 2446 {
2021 float *f = (float *)matrix; 2447 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2022 int dx, dy; 2448 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2023 float sum = 0.f; 2449 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2450 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2451 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2452 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2453 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2454 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2455 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2024 2456
2025 for (dy = -1; dy <= 1; ++dy) 2457 uint8_t r11 = (d11 + d21 + d12) / 3;
2026 for (dx = -1; dx <= 1; ++dx) 2458 uint8_t r21 = d21;
2027 { 2459 uint8_t r31 = (d21 + d31 + d32) / 3;
2028 unsigned int x2 = x + dx;
2029 unsigned int y2 = y + dy;
2030 2460
2031 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++; 2461 uint8_t r12 = d12;
2032 } 2462 uint8_t r22 = d22;
2463 uint8_t r32 = d32;
2033 2464
2034 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum; 2465 uint8_t r13 = (d13 + d23 + d12) / 3;
2035 } 2466 uint8_t r23 = d23;
2467 uint8_t r33 = (d23 + d33 + d32) / 3;
2036 2468
2037 darkness_sv = darkness2_sv; 2469 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2470 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2471 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2472 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2473 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2474 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2475 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2476 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2477 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2038 } 2478 }
2479
2480 free (darkness1);
2039 2481
2040 EXTEND (SP, 3); 2482 EXTEND (SP, 3);
2041 PUSHs (sv_2mortal (newSViv (sw4))); 2483 PUSHs (sv_2mortal (newSViv (sw34)));
2042 PUSHs (sv_2mortal (newSViv (sh))); 2484 PUSHs (sv_2mortal (newSViv (sh3)));
2043 PUSHs (darkness_sv); 2485 PUSHs (darkness3_sv);
2044} 2486}
2045 2487
2046SV * 2488SV *
2047get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2489get_rect (DC::Map self, int x0, int y0, int w, int h)
2048 CODE: 2490 CODE:
2049{ 2491{
2050 int x, y, x1, y1; 2492 int x, y, x1, y1;
2051 SV *data_sv = newSV (w * h * 7 + 5); 2493 SV *data_sv = newSV (w * h * 7 + 5);
2052 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2494 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
2109 else 2551 else
2110 *data++ = 0; 2552 *data++ = 0;
2111 } 2553 }
2112 } 2554 }
2113 2555
2556 /* if size is w*h + 5 then no data has been found */
2557 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2558 {
2114 SvPOK_only (data_sv); 2559 SvPOK_only (data_sv);
2115 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2560 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2561 }
2562
2116 RETVAL = data_sv; 2563 RETVAL = data_sv;
2117} 2564}
2118 OUTPUT: 2565 OUTPUT:
2119 RETVAL 2566 RETVAL
2120 2567
2121void 2568void
2122set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2569set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2123 PPCODE: 2570 PPCODE:
2124{ 2571{
2125 int x, y, z; 2572 int x, y, z;
2126 int w, h; 2573 int w, h;
2127 int x1, y1; 2574 int x1, y1;
2575 STRLEN len;
2576 uint8_t *data, *end;
2577
2578 len = SvLEN (data_sv);
2579 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580 data = SvPVbyte_nolen (data_sv);
2581 end = data + len + 8;
2582
2583 if (len < 5)
2584 XSRETURN_EMPTY;
2128 2585
2129 if (*data++ != 0) 2586 if (*data++ != 0)
2130 return; /* version mismatch */ 2587 XSRETURN_EMPTY; /* version mismatch */
2131 2588
2132 w = *data++ << 8; w |= *data++; 2589 w = *data++ << 8; w |= *data++;
2133 h = *data++ << 8; h |= *data++; 2590 h = *data++ << 8; h |= *data++;
2134 2591
2135 // we need to do this 'cause we don't keep an absolute coord system for rows 2592 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
2147 { 2604 {
2148 maprow *row = map_get_row (self, y); 2605 maprow *row = map_get_row (self, y);
2149 2606
2150 for (x = x0; x < x1; x++) 2607 for (x = x0; x < x1; x++)
2151 { 2608 {
2609 uint8_t flags;
2610
2611 if (data + 7 >= end)
2612 XSRETURN_EMPTY;
2613
2152 uint8_t flags = *data++; 2614 flags = *data++;
2153 2615
2154 if (flags) 2616 if (flags)
2155 { 2617 {
2156 mapcell *cell = row_get_cell (row, x); 2618 mapcell *cell = row_get_cell (row, x);
2157 tileid tile[3] = { 0, 0, 0 }; 2619 tileid tile[3] = { 0, 0, 0 };
… …
2160 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2622 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2161 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2623 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2162 2624
2163 if (cell->darkness == 0) 2625 if (cell->darkness == 0)
2164 { 2626 {
2165 cell->darkness = 0; 2627 /*cell->darkness = 0;*/
2628 EXTEND (SP, 3);
2166 2629
2167 for (z = 0; z <= 2; z++) 2630 for (z = 0; z <= 2; z++)
2168 { 2631 {
2169 tileid t = tile [z]; 2632 tileid t = tile [z];
2170 2633
2171 if (t >= self->texs || (t && !self->tex [t].name)) 2634 if (t >= self->texs || (t && !self->tex [t].name))
2172 { 2635 {
2173 XPUSHs (sv_2mortal (newSViv (t))); 2636 PUSHs (sv_2mortal (newSViv (t)));
2174 need_texid (self, t); 2637 need_texid (self, t);
2175 } 2638 }
2176 2639
2177 cell->tile [z] = t; 2640 cell->tile [z] = t;
2178 } 2641 }
… …
2180 } 2643 }
2181 } 2644 }
2182 } 2645 }
2183} 2646}
2184 2647
2185MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2648MODULE = Deliantra::Client PACKAGE = DC::RW
2186 2649
2187CFPlus::MixChunk 2650DC::RW
2188new_from_file (SV *class, char *path) 2651new (SV *class, SV *data_sv)
2189 CODE: 2652 CODE:
2190 RETVAL = Mix_LoadWAV (path); 2653{
2654 STRLEN datalen;
2655 char *data = SvPVbyte (data_sv, datalen);
2656
2657 RETVAL = SDL_RWFromConstMem (data, datalen);
2658}
2191 OUTPUT: 2659 OUTPUT:
2192 RETVAL 2660 RETVAL
2193 2661
2662DC::RW
2663new_from_file (SV *class, const char *path, const char *mode = "rb")
2664 CODE:
2665 RETVAL = SDL_RWFromFile (path, mode);
2666 OUTPUT:
2667 RETVAL
2668
2669# fails on win32:
2670# dc.xs(2268) : error C2059: syntax error : '('
2194void 2671#void
2672#close (DC::RW self)
2673# CODE:
2674# (self->(close)) (self);
2675
2676MODULE = Deliantra::Client PACKAGE = DC::Channel
2677
2678PROTOTYPES: DISABLE
2679
2680DC::Channel
2681find ()
2682 CODE:
2683{
2684 RETVAL = Mix_GroupAvailable (-1);
2685
2686 if (RETVAL < 0)
2687 {
2688 RETVAL = Mix_GroupOldest (-1);
2689
2690 if (RETVAL < 0)
2691 XSRETURN_UNDEF;
2692
2693 Mix_HaltChannel (RETVAL);
2694 }
2695
2696 Mix_UnregisterAllEffects (RETVAL);
2697 Mix_Volume (RETVAL, 128);
2698}
2699 OUTPUT:
2700 RETVAL
2701
2702void
2703halt (DC::Channel self)
2704 CODE:
2705 Mix_HaltChannel (self);
2706
2707void
2708expire (DC::Channel self, int ticks = -1)
2709 CODE:
2710 Mix_ExpireChannel (self, ticks);
2711
2712void
2713fade_out (DC::Channel self, int ticks = -1)
2714 CODE:
2715 Mix_FadeOutChannel (self, ticks);
2716
2717int
2718volume (DC::Channel self, int volume)
2719 CODE:
2720 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2721 OUTPUT:
2722 RETVAL
2723
2724void
2725unregister_all_effects (DC::Channel self)
2726 CODE:
2727 Mix_UnregisterAllEffects (self);
2728
2729void
2730set_panning (DC::Channel self, int left, int right)
2731 CODE:
2732 left = CLAMP (left , 0, 255);
2733 right = CLAMP (right, 0, 255);
2734 Mix_SetPanning (self, left, right);
2735
2736void
2737set_distance (DC::Channel self, int distance)
2738 CODE:
2739 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2740
2741void
2742set_position (DC::Channel self, int angle, int distance)
2743 CODE:
2744
2745void
2746set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747 CODE:
2748{
2749 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2751 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752}
2753
2754void
2755set_reverse_stereo (DC::Channel self, int flip)
2756 CODE:
2757 Mix_SetReverseStereo (self, flip);
2758
2759MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760
2761PROTOTYPES: DISABLE
2762
2763DC::MixChunk
2764new (SV *class, DC::RW rwops)
2765 CODE:
2766 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2767 OUTPUT:
2768 RETVAL
2769
2770void
2195DESTROY (CFPlus::MixChunk self) 2771DESTROY (DC::MixChunk self)
2196 CODE: 2772 CODE:
2197 Mix_FreeChunk (self); 2773 Mix_FreeChunk (self);
2198 2774
2199int 2775int
2200volume (CFPlus::MixChunk self, int volume = -1) 2776volume (DC::MixChunk self, int volume = -1)
2201 CODE: 2777 CODE:
2778 if (items > 1)
2779 volume = CLAMP (volume, 0, 128);
2202 RETVAL = Mix_VolumeChunk (self, volume); 2780 RETVAL = Mix_VolumeChunk (self, volume);
2203 OUTPUT: 2781 OUTPUT:
2204 RETVAL 2782 RETVAL
2205 2783
2206int 2784DC::Channel
2207play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2785play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2208 CODE: 2786 CODE:
2787{
2209 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2788 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2789
2790 if (RETVAL < 0)
2791 XSRETURN_UNDEF;
2792
2793 if (channel < 0)
2794 {
2795 Mix_UnregisterAllEffects (RETVAL);
2796 Mix_Volume (RETVAL, 128);
2797 }
2798}
2210 OUTPUT: 2799 OUTPUT:
2211 RETVAL 2800 RETVAL
2212 2801
2213MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2802MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2214 2803
2215int 2804int
2216volume (int volume = -1) 2805volume (int volume = -1)
2806 PROTOTYPE: ;$
2217 CODE: 2807 CODE:
2808 if (items > 0)
2809 volume = CLAMP (volume, 0, 128);
2218 RETVAL = Mix_VolumeMusic (volume); 2810 RETVAL = Mix_VolumeMusic (volume);
2219 OUTPUT: 2811 OUTPUT:
2220 RETVAL 2812 RETVAL
2221 2813
2222int 2814void
2223fade_out (int ms) 2815fade_out (int ms)
2224 CODE: 2816 CODE:
2225 RETVAL = Mix_FadeOutMusic (ms); 2817 Mix_FadeOutMusic (ms);
2818
2819void
2820halt ()
2821 CODE:
2822 Mix_HaltMusic ();
2823
2824DC::MixMusic
2825new (SV *class, DC::RW rwops)
2826 CODE:
2827 RETVAL = Mix_LoadMUS_RW (rwops);
2226 OUTPUT: 2828 OUTPUT:
2227 RETVAL 2829 RETVAL
2228 2830
2229CFPlus::MixMusic
2230new_from_file (SV *class, char *path)
2231 CODE:
2232 RETVAL = Mix_LoadMUS (path);
2233 OUTPUT:
2234 RETVAL
2235
2236void 2831void
2237DESTROY (CFPlus::MixMusic self) 2832DESTROY (DC::MixMusic self)
2238 CODE: 2833 CODE:
2239 Mix_FreeMusic (self); 2834 Mix_FreeMusic (self);
2240 2835
2241int 2836int
2242play (CFPlus::MixMusic self, int loops = -1) 2837play (DC::MixMusic self, int loops = -1)
2243 CODE: 2838 CODE:
2244 RETVAL = Mix_PlayMusic (self, loops); 2839 RETVAL = Mix_PlayMusic (self, loops);
2245 OUTPUT: 2840 OUTPUT:
2246 RETVAL 2841 RETVAL
2247 2842
2248int 2843void
2249fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2844fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2250 CODE: 2845 CODE:
2251 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2846 Mix_FadeInMusicPos (self, loops, ms, position);
2252 OUTPUT:
2253 RETVAL
2254 2847
2255MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2848MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2849
2850PROTOTYPES: ENABLE
2256 2851
2257BOOT: 2852BOOT:
2258{ 2853{
2259 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2854 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2260 static const struct { 2855 static const struct {
2261 const char *name; 2856 const char *name;
2262 IV iv; 2857 IV iv;
2263 } *civ, const_iv[] = { 2858 } *civ, const_iv[] = {
2264# define const_iv(name) { # name, (IV)name } 2859# define const_iv(name) { # name, (IV)name }
… …
2276 const_iv (GL_ALPHA_TEST), 2871 const_iv (GL_ALPHA_TEST),
2277 const_iv (GL_NORMALIZE), 2872 const_iv (GL_NORMALIZE),
2278 const_iv (GL_RESCALE_NORMAL), 2873 const_iv (GL_RESCALE_NORMAL),
2279 const_iv (GL_FRONT), 2874 const_iv (GL_FRONT),
2280 const_iv (GL_BACK), 2875 const_iv (GL_BACK),
2876 const_iv (GL_AUX0),
2281 const_iv (GL_AND), 2877 const_iv (GL_AND),
2282 const_iv (GL_ONE), 2878 const_iv (GL_ONE),
2283 const_iv (GL_ZERO), 2879 const_iv (GL_ZERO),
2284 const_iv (GL_SRC_ALPHA), 2880 const_iv (GL_SRC_ALPHA),
2285 const_iv (GL_DST_ALPHA), 2881 const_iv (GL_DST_ALPHA),
… …
2298 const_iv (GL_INTENSITY), 2894 const_iv (GL_INTENSITY),
2299 const_iv (GL_LUMINANCE), 2895 const_iv (GL_LUMINANCE),
2300 const_iv (GL_LUMINANCE_ALPHA), 2896 const_iv (GL_LUMINANCE_ALPHA),
2301 const_iv (GL_FLOAT), 2897 const_iv (GL_FLOAT),
2302 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2898 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2899 const_iv (GL_COMPRESSED_ALPHA_ARB),
2900 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2901 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2902 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2903 const_iv (GL_COMPRESSED_RGB_ARB),
2904 const_iv (GL_COMPRESSED_RGBA_ARB),
2303 const_iv (GL_COMPILE), 2905 const_iv (GL_COMPILE),
2304 const_iv (GL_PROXY_TEXTURE_1D), 2906 const_iv (GL_PROXY_TEXTURE_1D),
2305 const_iv (GL_PROXY_TEXTURE_2D), 2907 const_iv (GL_PROXY_TEXTURE_2D),
2306 const_iv (GL_TEXTURE_1D), 2908 const_iv (GL_TEXTURE_1D),
2307 const_iv (GL_TEXTURE_2D), 2909 const_iv (GL_TEXTURE_2D),
… …
2331 const_iv (GL_COLOR_LOGIC_OP), 2933 const_iv (GL_COLOR_LOGIC_OP),
2332 const_iv (GL_SEPARABLE_2D), 2934 const_iv (GL_SEPARABLE_2D),
2333 const_iv (GL_CONVOLUTION_2D), 2935 const_iv (GL_CONVOLUTION_2D),
2334 const_iv (GL_CONVOLUTION_BORDER_MODE), 2936 const_iv (GL_CONVOLUTION_BORDER_MODE),
2335 const_iv (GL_CONSTANT_BORDER), 2937 const_iv (GL_CONSTANT_BORDER),
2938 const_iv (GL_POINTS),
2336 const_iv (GL_LINES), 2939 const_iv (GL_LINES),
2337 const_iv (GL_LINE_STRIP), 2940 const_iv (GL_LINE_STRIP),
2338 const_iv (GL_LINE_LOOP), 2941 const_iv (GL_LINE_LOOP),
2339 const_iv (GL_QUADS), 2942 const_iv (GL_QUADS),
2340 const_iv (GL_QUAD_STRIP), 2943 const_iv (GL_QUAD_STRIP),
2341 const_iv (GL_TRIANGLES), 2944 const_iv (GL_TRIANGLES),
2342 const_iv (GL_TRIANGLE_STRIP), 2945 const_iv (GL_TRIANGLE_STRIP),
2343 const_iv (GL_TRIANGLE_FAN), 2946 const_iv (GL_TRIANGLE_FAN),
2947 const_iv (GL_POLYGON),
2344 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2948 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2949 const_iv (GL_POINT_SMOOTH_HINT),
2950 const_iv (GL_LINE_SMOOTH_HINT),
2951 const_iv (GL_POLYGON_SMOOTH_HINT),
2952 const_iv (GL_GENERATE_MIPMAP_HINT),
2953 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2345 const_iv (GL_FASTEST), 2954 const_iv (GL_FASTEST),
2955 const_iv (GL_DONT_CARE),
2956 const_iv (GL_NICEST),
2346 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2347 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2348 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2349 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2350# undef const_iv 2964# undef const_iv
2351 }; 2965 };
2352 2966
2353 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2355 2969
2356 texture_av = newAV (); 2970 texture_av = newAV ();
2357 AvREAL_off (texture_av); 2971 AvREAL_off (texture_av);
2358} 2972}
2359 2973
2974void
2975disable_GL_EXT_blend_func_separate ()
2976 CODE:
2977 gl.BlendFuncSeparate = 0;
2978 gl.BlendFuncSeparateEXT = 0;
2979
2980void
2981apple_nvidia_bug (int enable)
2982
2360char * 2983char *
2361gl_vendor () 2984gl_vendor ()
2362 CODE: 2985 CODE:
2363 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2364 OUTPUT: 2987 OUTPUT:
… …
2413 3036
2414void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2415 CODE: 3038 CODE:
2416 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2417 3040
3041void glBlendEquation (int se)
3042
2418void glDepthMask (int flag) 3043void glDepthMask (int flag)
2419 3044
2420void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2421 3046
2422void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2436# near_ and far_ are due to microsofts buggy "c" compiler 3061# near_ and far_ are due to microsofts buggy "c" compiler
2437void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 3062void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2438 3063
2439# near_ and far_ are due to microsofts buggy "c" compiler 3064# near_ and far_ are due to microsofts buggy "c" compiler
2440void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 3065void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
3066
3067PROTOTYPES: DISABLE
2441 3068
2442void glViewport (int x, int y, int width, int height) 3069void glViewport (int x, int y, int width, int height)
2443 3070
2444void glScissor (int x, int y, int width, int height) 3071void glScissor (int x, int y, int width, int height)
2445 3072
… …
2453 3080
2454void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2455 CODE: 3082 CODE:
2456 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2457 3084
2458void glBegin (int mode)
2459
2460void glEnd ()
2461
2462void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
2463 PROTOTYPE: @ 3086 PROTOTYPE: @
2464 ALIAS: 3087 ALIAS:
2465 glColor_premultiply = 1 3088 glColor_premultiply = 1
2466 CODE: 3089 CODE:
2467 if (ix) 3090 if (ix)
2468 { 3091 {
… …
2471 b *= a; 3094 b *= a;
2472 } 3095 }
2473 // microsoft visual "c" rounds instead of truncating... 3096 // microsoft visual "c" rounds instead of truncating...
2474 glColor4f (r, g, b, a); 3097 glColor4f (r, g, b, a);
2475 3098
2476void glInterleavedArrays (int format, int stride, char *data)
2477
2478void glDrawElements (int mode, int count, int type, char *indices)
2479
2480# 1.2 void glDrawRangeElements (int mode, int start, int end
2481
2482void glRasterPos (float x, float y, float z = 0.) 3099void glRasterPos (float x, float y, float z = 0.)
2483 CODE: 3100 CODE:
2484 glRasterPos3f (0, 0, z); 3101 glRasterPos3f (0, 0, z);
2485 glBitmap (0, 0, 0, 0, x, y, 0); 3102 glBitmap (0, 0, 0, 0, x, y, 0);
2486 3103
… …
2490 3107
2491void glTexCoord (float s, float t) 3108void glTexCoord (float s, float t)
2492 CODE: 3109 CODE:
2493 glTexCoord2f (s, t); 3110 glTexCoord2f (s, t);
2494 3111
3112void glRect (float x1, float y1, float x2, float y2)
3113 CODE:
3114 glRectf (x1, y1, x2, y2);
3115
3116void glRect_lineloop (float x1, float y1, float x2, float y2)
3117 CODE:
3118 glBegin (GL_LINE_LOOP);
3119 glVertex2f (x1, y1);
3120 glVertex2f (x2, y1);
3121 glVertex2f (x2, y2);
3122 glVertex2f (x1, y2);
3123 glEnd ();
3124
3125PROTOTYPES: ENABLE
3126
3127void glBegin (int mode)
3128
3129void glEnd ()
3130
3131void glPointSize (GLfloat size)
3132
3133void glLineWidth (GLfloat width)
3134
3135void glInterleavedArrays (int format, int stride, char *data)
3136
3137void glDrawElements (int mode, int count, int type, char *indices)
3138
3139# 1.2 void glDrawRangeElements (int mode, int start, int end
3140
2495void glTexEnv (int target, int pname, float param) 3141void glTexEnv (int target, int pname, float param)
2496 CODE: 3142 CODE:
2497 glTexEnvf (target, pname, param); 3143 glTexEnvf (target, pname, param);
2498 3144
2499void glTexParameter (int target, int pname, float param) 3145void glTexParameter (int target, int pname, float param)
… …
2515void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3161void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2516 CODE: 3162 CODE:
2517 if (gl.SeparableFilter2D) 3163 if (gl.SeparableFilter2D)
2518 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3164 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2519 3165
2520void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3166void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2521 3167
2522void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3168void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2523 3169
2524void glDrawPixels (int width, int height, int format, int type, char *pixels) 3170void glDrawPixels (int width, int height, int format, int type, char *pixels)
2525 3171
… …
2551 3197
2552void glEndList () 3198void glEndList ()
2553 3199
2554void glCallList (int list) 3200void glCallList (int list)
2555 3201
3202MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203
3204PROTOTYPES: DISABLE
3205
3206void
3207find_widget (SV *self, NV x, NV y)
3208 PPCODE:
3209{
3210 if (within_widget (self, x, y))
3211 XPUSHs (self);
3212}
3213
3214BOOT:
3215{
3216 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3217
3218 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3219 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3220 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3221 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3222}
3223
3224void
3225draw (SV *self)
3226 CODE:
3227{
3228 HV *hv;
3229 SV **svp;
3230 NV x, y, w, h;
3231 SV *draw_x_sv = GvSV (draw_x_gv);
3232 SV *draw_y_sv = GvSV (draw_y_gv);
3233 SV *draw_w_sv = GvSV (draw_w_gv);
3234 SV *draw_h_sv = GvSV (draw_h_gv);
3235 double draw_x, draw_y;
3236
3237 if (!SvROK (self))
3238 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3239
3240 hv = (HV *)SvRV (self);
3241
3242 if (SvTYPE (hv) != SVt_PVHV)
3243 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3244
3245 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3246 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3247
3248 if (!h || !w)
3249 XSRETURN_EMPTY;
3250
3251 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3252 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3253
3254 draw_x = SvNV (draw_x_sv) + x;
3255 draw_y = SvNV (draw_y_sv) + y;
3256
3257 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3258 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3259 XSRETURN_EMPTY;
3260
3261 sv_setnv (draw_x_sv, draw_x);
3262 sv_setnv (draw_y_sv, draw_y);
3263
3264 glPushMatrix ();
3265 glTranslated (x, y, 0);
3266
3267 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3268 {
3269 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3270
3271 if (svp && SvTRUE (*svp))
3272 {
3273 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3274 glEnable (GL_BLEND);
3275 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3276 glBegin (GL_QUADS);
3277 glVertex2f (0, 0);
3278 glVertex2f (w, 0);
3279 glVertex2f (w, h);
3280 glVertex2f (0, h);
3281 glEnd ();
3282 glDisable (GL_BLEND);
3283 }
3284 }
3285#if 0
3286 // draw borders, for debugging
3287 glPushMatrix ();
3288 glColor4f (1., 1., 0., 1.);
3289 glTranslatef (.5, .5, 0.);
3290 glBegin (GL_LINE_LOOP);
3291 glVertex2f (0 , 0);
3292 glVertex2f (w - 1, 0);
3293 glVertex2f (w - 1, h - 1);
3294 glVertex2f (0 , h - 1);
3295 glEnd ();
3296 glPopMatrix ();
3297#endif
3298 PUSHMARK (SP);
3299 XPUSHs (self);
3300 PUTBACK;
3301 call_method ("_draw", G_VOID | G_DISCARD);
3302 SPAGAIN;
3303
3304 glPopMatrix ();
3305
3306 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3307 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3308}
3309

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines