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.210 by root, Tue Jul 24 18:24:03 2007 UTC vs.
Revision 1.295 by root, Mon Dec 21 03:30:22 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 atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f
22#endif 26#endif
23 27
24#include <assert.h> 28#include <assert.h>
25#include <math.h> 29#include <math.h>
26#include <string.h> 30#include <string.h>
27#include <stdio.h> 31#include <stdio.h>
28#include <stdlib.h> 32#include <stdlib.h>
33
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29 35
30#include <SDL.h> 36#include <SDL.h>
31#include <SDL_thread.h> 37#include <SDL_thread.h>
32#include <SDL_endian.h> 38#include <SDL_endian.h>
33#include <SDL_image.h> 39#include <SDL_image.h>
34#include <SDL_mixer.h> 40#include <SDL_mixer.h>
35#include <SDL_opengl.h> 41#include <SDL_opengl.h>
36 42
43/* work around os x broken headers */
44#ifdef __MACOSX__
45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46#endif
47
37#define PANGO_ENABLE_BACKEND 48#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS 49#define G_DISABLE_CAST_CHECKS
39 50
40#include <glib/gmacros.h> 51#include <glib/gmacros.h>
41 52
42#include <pango/pango.h> 53#include <pango/pango.h>
54
55#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0
57#endif
58
59#if !PANGO_VERSION_CHECK (1, 15, 2)
60# define pango_layout_get_line_readonly pango_layout_get_line
61# define pango_layout_get_lines_readonly pango_layout_get_lines
62# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
63# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
64#endif
43 65
44#ifndef _WIN32 66#ifndef _WIN32
45# include <sys/types.h> 67# include <sys/types.h>
46# include <sys/socket.h> 68# include <sys/socket.h>
47# include <netinet/in.h> 69# include <netinet/in.h>
48# include <netinet/tcp.h> 70# include <netinet/tcp.h>
49# include <inttypes.h> 71# include <inttypes.h>
50#endif 72#endif
51 73
74#if __GNUC__ >= 4
75# define expect(expr,value) __builtin_expect ((expr),(value))
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82
52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53 84
54#define FOW_DARKNESS 32 85#define FOW_DARKNESS 64
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
55 87
56#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
57#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
58 90
59#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
60 92
61#if 0 93/* mask out modifiers we are not interested in */
62# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
63#else 95
64# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
65#endif 97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
66 101
67static AV *texture_av; 102static AV *texture_av;
68 103
69static struct 104static struct
70{ 105{
107 av_push (texture_av, (SV *)(size_t)name); 142 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name); 143 glDeleteTextures (1, &name);
109} 144}
110 145
111#include "texcache.c" 146#include "texcache.c"
147#include "rendercache.c"
112 148
113#include "pango-font.c" 149#include "pango-font.c"
114#include "pango-fontmap.c" 150#include "pango-fontmap.c"
115#include "pango-render.c" 151#include "pango-render.c"
116 152
153typedef IV DC__Channel;
154typedef SDL_RWops *DC__RW;
117typedef Mix_Chunk *CFPlus__MixChunk; 155typedef Mix_Chunk *DC__MixChunk;
118typedef Mix_Music *CFPlus__MixMusic; 156typedef Mix_Music *DC__MixMusic;
119 157
120typedef PangoFontDescription *CFPlus__Font; 158typedef PangoFontDescription *DC__Font;
121 159
122static int 160static int
123shape_attr_p (PangoLayoutRun *run) 161shape_attr_p (PangoLayoutRun *run)
124{ 162{
125 GSList *attrs = run->item->analysis.extra_attrs; 163 GSList *attrs = run->item->analysis.extra_attrs;
139 177
140typedef struct cf_layout { 178typedef struct cf_layout {
141 PangoLayout *pl; 179 PangoLayout *pl;
142 float r, g, b, a; // default color for rgba mode 180 float r, g, b, a; // default color for rgba mode
143 int base_height; 181 int base_height;
144 CFPlus__Font font; 182 DC__Font font;
183 rc_t *rc;
145} *CFPlus__Layout; 184} *DC__Layout;
146 185
147static CFPlus__Font default_font; 186static DC__Font default_font;
148static PangoContext *opengl_context; 187static PangoContext *opengl_context;
149static PangoFontMap *opengl_fontmap; 188static PangoFontMap *opengl_fontmap;
150 189
151static void 190static void
152substitute_func (FcPattern *pattern, gpointer data) 191substitute_func (FcPattern *pattern, gpointer data)
157#endif 196#endif
158 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 197 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159} 198}
160 199
161static void 200static void
162layout_update_font (CFPlus__Layout self) 201layout_update_font (DC__Layout self)
163{ 202{
164 /* 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
165 * reasonably well with bitstream vera 204 * reasonably well with dejavu/bistream fonts
166 */ 205 */
167 PangoFontDescription *font = self->font ? self->font : default_font; 206 PangoFontDescription *font = self->font ? self->font : default_font;
168 207
169 pango_font_description_set_absolute_size (font, 208 pango_font_description_set_absolute_size (font,
170 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 209 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171 210
172 pango_layout_set_font_description (self->pl, font); 211 pango_layout_set_font_description (self->pl, font);
173} 212}
174 213
175static void 214static void
176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 215layout_get_pixel_size (DC__Layout self, int *w, int *h)
177{ 216{
178 PangoRectangle rect; 217 PangoRectangle rect;
179 218
180 // get_pixel_* wrongly rounds down 219 // get_pixel_* wrongly rounds down
181 pango_layout_get_extents (self->pl, 0, &rect); 220 pango_layout_get_extents (self->pl, 0, &rect);
192 231
193typedef uint16_t tileid; 232typedef uint16_t tileid;
194typedef uint16_t faceid; 233typedef uint16_t faceid;
195 234
196typedef struct { 235typedef struct {
197 int name; 236 GLuint name;
198 int w, h; 237 int w, h;
199 float s, t; 238 float s, t;
200 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
201 tileid smoothtile; 240 tileid smoothtile;
202 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
203} maptex; 243} maptex;
204 244
205typedef struct { 245typedef struct {
206 uint32_t player; 246 uint32_t player;
207 tileid tile[3]; 247 tileid tile[3];
220 int faces; tileid *face2tile; // [faceid] 260 int faces; tileid *face2tile; // [faceid]
221 int texs; maptex *tex; // [tileid] 261 int texs; maptex *tex; // [tileid]
222 262
223 int32_t rows; 263 int32_t rows;
224 maprow *row; 264 maprow *row;
225} *CFPlus__Map; 265} *DC__Map;
226 266
227static char * 267static char *
228prepend (char *ptr, int sze, int inc) 268prepend (char *ptr, int sze, int inc)
229{ 269{
230 char *p; 270 char *p;
268 self->texs *= 2; 308 self->texs *= 2;
269 } 309 }
270} 310}
271 311
272static maprow * 312static maprow *
273map_get_row (CFPlus__Map self, int y) 313map_get_row (DC__Map self, int y)
274{ 314{
275 if (0 > y) 315 if (0 > y)
276 { 316 {
277 int extend = - y + MAP_EXTEND_Y; 317 int extend = - y + MAP_EXTEND_Y;
278 Prepend (maprow, self->row, self->rows, extend); 318 Prepend (maprow, self->row, self->rows, extend);
316 356
317 return row->col + (x - row->c0); 357 return row->col + (x - row->c0);
318} 358}
319 359
320static mapcell * 360static mapcell *
321map_get_cell (CFPlus__Map self, int x, int y) 361map_get_cell (DC__Map self, int x, int y)
322{ 362{
323 return row_get_cell (map_get_row (self, y), x); 363 return row_get_cell (map_get_row (self, y), x);
324} 364}
325 365
326static void 366static void
327map_clear (CFPlus__Map self) 367map_clear (DC__Map self)
328{ 368{
329 int r; 369 int r;
330 370
331 for (r = 0; r < self->rows; r++) 371 for (r = 0; r < self->rows; r++)
332 Safefree (self->row[r].col); 372 Safefree (self->row[r].col);
339 self->oy = 0; 379 self->oy = 0;
340 self->row = 0; 380 self->row = 0;
341 self->rows = 0; 381 self->rows = 0;
342} 382}
343 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
344static void 394static void
345map_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)
346{ 396{
347 int x, y; 397 int x, y;
348 maprow *row; 398 maprow *row;
349 mapcell *cell; 399 mapcell *cell;
350 400
362 if (x >= row->c1) 412 if (x >= row->c1)
363 break; 413 break;
364 414
365 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
366 416
367 cell->darkness = 0; 417 CELL_CLEAR (cell);
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
371 } 418 }
372 } 419 }
373} 420}
374 421
375typedef struct { 422typedef struct {
429 n |= n >> 16; 476 n |= n >> 16;
430 477
431 return n + 1; 478 return n + 1;
432} 479}
433 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
434/* SDL should provide this, really. */ 492/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300 493#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314 494#define SDLK_MODIFIER_MAX 314
437 495
438/******************************************************************************/ 496/******************************************************************************/
476 return 0; 534 return 0;
477 535
478 return 1; 536 return 1;
479} 537}
480 538
481MODULE = CFPlus PACKAGE = CFPlus 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
482 592
483PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
484 594
485BOOT: 595BOOT:
486{ 596{
487 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
488 static const struct { 598 static const struct {
489 const char *name; 599 const char *name;
490 IV iv; 600 IV iv;
491 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
492# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
514 624
515 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
518 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),
519 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
520 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
521 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
522 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
523 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
595 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
596 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
597 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
598 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
599 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)
600# undef const_iv 795# undef const_iv
601 }; 796 };
602 797
603 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; )
604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
622 817
623NV floor (NV x) 818NV floor (NV x)
624 819
625NV ceil (NV x) 820NV ceil (NV x)
626 821
822IV minpot (UV n)
823
824IV popcount (UV n)
825
826NV distance (NV dx, NV dy)
827 CODE:
828 RETVAL = pow (dx * dx + dy * dy, 0.5);
829 OUTPUT:
830 RETVAL
831
627void 832void
628pango_init () 833pango_init ()
629 CODE: 834 CODE:
630{ 835{
631 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 837 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 838 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
839 /*pango_context_set_font_description (opengl_context, default_font);*/
840#if PANGO_VERSION_CHECK (1, 15, 2)
841 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
842 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
843#endif
634} 844}
635 845
636char *
637SDL_GetError () 846char *SDL_GetError ()
638 847
639int 848void SDL_braino ()
640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
641 849
642void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
643SDL_Quit () 856void SDL_Quit ()
857
858int SDL_GL_SetAttribute (int attr, int value)
859
860int SDL_GL_GetAttribute (int attr)
861 CODE:
862 if (SDL_GL_GetAttribute (attr, &RETVAL))
863 XSRETURN_UNDEF;
864 OUTPUT:
865 RETVAL
644 866
645void 867void
646SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
647 PPCODE: 869 PPCODE:
648{ 870{
660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
663 885
664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
665#if SDL_VERSION_ATLEAST(1,2,10)
666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
669 888
670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671 890
672 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
673 while (*m) 892 while (*m)
674 { 893 {
675 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
676 { 895 {
677 AV *av = newAV (); 896 AV *av = newAV ();
678 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
679 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
704 923
705 if (RETVAL) 924 if (RETVAL)
706 { 925 {
707 av_clear (texture_av); 926 av_clear (texture_av);
708 927
709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 929#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711#include "glfunc.h" 930#include "glfunc.h"
712#undef GL_FUNC 931#undef GL_FUNC
713 } 932 }
714} 933}
721char * 940char *
722SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
723 942
724int 943int
725SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
726 948
727void 949void
728poll_events () 950poll_events ()
729 PPCODE: 951 PPCODE:
730{ 952{
740 { 962 {
741 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
742 case SDL_KEYUP: 964 case SDL_KEYUP:
743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 967 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 968 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748 break; 970 break;
749 971
750 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
769 x = ev.motion.x; 991 x = ev.motion.x;
770 y = ev.motion.y; 992 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 } 994 }
773 995
774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
775 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
776 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
777 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
778 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 } 1002 }
781 break; 1003 break;
782 1004
783 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
784 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786 1008
787 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797 break; 1019 break;
798 } 1020 }
799 1021
800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1022 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801 } 1023 }
802} 1024}
803 1025
804int 1026int
805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1027Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806 POSTCALL: 1028 POSTCALL:
807 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
808 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
809 1031
810void 1032void
1033Mix_QuerySpec ()
1034 PPCODE:
1035{
1036 int freq, channels;
1037 Uint16 format;
1038
1039 if (Mix_QuerySpec (&freq, &format, &channels))
1040 {
1041 EXTEND (SP, 3);
1042 PUSHs (sv_2mortal (newSViv (freq)));
1043 PUSHs (sv_2mortal (newSViv (format)));
1044 PUSHs (sv_2mortal (newSViv (channels)));
1045 }
1046}
1047
1048void
811Mix_CloseAudio () 1049Mix_CloseAudio ()
812 1050
813int 1051int
814Mix_AllocateChannels (int numchans = -1) 1052Mix_AllocateChannels (int numchans = -1)
1053
1054const char *
1055Mix_GetError ()
815 1056
816void 1057void
817lowdelay (int fd, int val = 1) 1058lowdelay (int fd, int val = 1)
818 CODE: 1059 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1060 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
845 } 1086 }
846 } 1087 }
847#endif 1088#endif
848} 1089}
849 1090
850void 1091int
851add_font (char *file) 1092add_font (char *file)
852 CODE: 1093 CODE:
853 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
854 1097
855void 1098void
856load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
857 ALIAS: 1100 ALIAS:
858 load_image_file = 1 1101 load_image_file = 1
861 STRLEN image_len; 1104 STRLEN image_len;
862 char *image = (char *)SvPVbyte (image_, image_len); 1105 char *image = (char *)SvPVbyte (image_, image_len);
863 SDL_Surface *surface, *surface2; 1106 SDL_Surface *surface, *surface2;
864 SDL_PixelFormat fmt; 1107 SDL_PixelFormat fmt;
865 SDL_RWops *rw = ix 1108 SDL_RWops *rw = ix
866 ? SDL_RWFromFile (image, "r") 1109 ? SDL_RWFromFile (image, "rb")
867 : SDL_RWFromConstMem (image, image_len); 1110 : SDL_RWFromConstMem (image, image_len);
868 1111
869 if (!rw) 1112 if (!rw)
870 croak ("load_image: %s", SDL_GetError ()); 1113 croak ("load_image: %s", SDL_GetError ());
871 1114
944void 1187void
945error (char *message) 1188error (char *message)
946 CODE: 1189 CODE:
947 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
948#ifdef _WIN32 1191#ifdef _WIN32
949 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950#endif 1193#endif
951 1194
952void 1195void
953fatal (char *message) 1196fatal (char *message)
954 CODE: 1197 CODE:
955 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
956#ifdef _WIN32 1199#ifdef _WIN32
957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958#endif 1201#endif
959 _exit (1); 1202 _exit (1);
960 1203
961void 1204void
962_exit (int retval = 0) 1205_exit (int retval = 0)
974#if DEBUG 1217#if DEBUG
975 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
976#endif 1219#endif
977} 1220}
978 1221
979MODULE = CFPlus PACKAGE = CFPlus::Font 1222int
1223SvREFCNT (SV *sv)
1224 CODE:
1225 RETVAL = SvREFCNT (sv);
1226 OUTPUT:
1227 RETVAL
1228
1229MODULE = Deliantra::Client PACKAGE = DC::Font
980 1230
981PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
982 1232
983CFPlus::Font 1233DC::Font
984new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
985 CODE: 1235 CODE:
986{ 1236{
987 int count; 1237 int count;
988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
991} 1241}
992 OUTPUT: 1242 OUTPUT:
993 RETVAL 1243 RETVAL
994 1244
995void 1245void
996DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
997 CODE: 1247 CODE:
998 pango_font_description_free (self); 1248 pango_font_description_free (self);
999 1249
1000void 1250void
1001make_default (CFPlus::Font self) 1251make_default (DC::Font self)
1002 PROTOTYPE: $ 1252 PROTOTYPE: $
1003 CODE: 1253 CODE:
1004 default_font = self; 1254 default_font = self;
1005 1255
1006MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1007 1257
1008PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1009 1259
1010void 1260void
1011reset_glyph_cache () 1261glyph_cache_backup ()
1012 PROTOTYPE: 1262 PROTOTYPE:
1013 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1014 tc_clear (); 1270 tc_restore ();
1015 1271
1016CFPlus::Layout 1272DC::Layout
1017new (SV *class) 1273new (SV *class)
1018 CODE: 1274 CODE:
1019 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1020 1276
1021 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
1023 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
1024 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
1025 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
1026 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
1027 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1028 1285
1029 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1031 OUTPUT: 1288 OUTPUT:
1032 RETVAL 1289 RETVAL
1033 1290
1034void 1291void
1035DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1036 CODE: 1293 CODE:
1037 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
1038 Safefree (self); 1296 Safefree (self);
1039 1297
1040void 1298void
1041set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1042 CODE: 1300 CODE:
1043{ 1301{
1044 STRLEN textlen; 1302 STRLEN textlen;
1045 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1046 1304
1047 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1048} 1306}
1049 1307
1050void 1308void
1051set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1052 CODE: 1310 CODE:
1053{ 1311{
1054 STRLEN textlen; 1312 STRLEN textlen;
1055 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1056 1314
1057 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1058} 1316}
1059 1317
1060void 1318void
1061set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1062 CODE: 1320 CODE:
1063{ 1321{
1064 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text; 1324 const char *pos = text;
1101 if (attrs) 1359 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1103} 1361}
1104 1362
1105void 1363void
1106get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1107 PPCODE: 1365 PPCODE:
1108{ 1366{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110 1368
1111 do 1369 do
1112 { 1370 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114 1372
1115 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1116 { 1374 {
1117 PangoRectangle extents; 1375 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
1126 1384
1127 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1128} 1386}
1129 1387
1130int 1388int
1131has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1132 CODE: 1390 CODE:
1133{ 1391{
1134 int lines = 1; 1392 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1136 1394
1141} 1399}
1142 OUTPUT: 1400 OUTPUT:
1143 RETVAL 1401 RETVAL
1144 1402
1145SV * 1403SV *
1146get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1147 CODE: 1405 CODE:
1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1150 OUTPUT: 1408 OUTPUT:
1151 RETVAL 1409 RETVAL
1152 1410
1153void 1411void
1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1412set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155 CODE: 1413 CODE:
1156 self->r = r; 1414 self->r = r;
1157 self->g = g; 1415 self->g = g;
1158 self->b = b; 1416 self->b = b;
1159 self->a = a; 1417 self->a = a;
1160 1418
1161void 1419void
1162set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1163 CODE: 1421 CODE:
1164 if (self->font != font) 1422 if (self->font != font)
1165 { 1423 {
1166 self->font = font; 1424 self->font = font;
1167 layout_update_font (self); 1425 layout_update_font (self);
1168 } 1426 }
1169 1427
1170void 1428void
1171set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1172 CODE: 1430 CODE:
1173 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1174 { 1432 {
1175 self->base_height = base_height; 1433 self->base_height = base_height;
1176 layout_update_font (self); 1434 layout_update_font (self);
1177 } 1435 }
1178 1436
1179void 1437void
1180set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1181 CODE: 1439 CODE:
1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1440 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183 1441
1184void 1442void
1185set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1186 CODE: 1444 CODE:
1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188 1446
1189void 1447void
1190set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1191 CODE: 1449 CODE:
1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193 1451
1194void 1452void
1195set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1196 CODE: 1454 CODE:
1197 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1202 ); 1460 );
1203 1461
1204void 1462void
1205set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1206 CODE: 1464 CODE:
1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208 1466
1209void 1467void
1210size (CFPlus::Layout self) 1468size (DC::Layout self)
1211 PPCODE: 1469 PPCODE:
1212{ 1470{
1213 int w, h; 1471 int w, h;
1214 1472
1215 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
1218 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1219 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1220} 1478}
1221 1479
1222int 1480int
1223descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1224 CODE: 1482 CODE:
1225{ 1483{
1226 PangoRectangle rect; 1484 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1230} 1488}
1231 OUTPUT: 1489 OUTPUT:
1232 RETVAL 1490 RETVAL
1233 1491
1234int 1492int
1235xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1236 CODE: 1494 CODE:
1237{ 1495{
1238 int index, trailing; 1496 int index, trailing;
1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1497 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1241} 1499}
1242 OUTPUT: 1500 OUTPUT:
1243 RETVAL 1501 RETVAL
1244 1502
1245void 1503void
1246cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1247 PPCODE: 1505 PPCODE:
1248{ 1506{
1249 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251 1509
1252 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1253 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256} 1514}
1257 1515
1258void 1516void
1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260 PPCODE: 1518 PPCODE:
1261{ 1519{
1262 int line, x; 1520 int line, x;
1263 1521
1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1522 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1523#if !PANGO_VERSION_CHECK (1, 17, 3)
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266 1525 --line;
1526#endif
1267 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1268 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270} 1530}
1271 1531
1272void 1532void
1273line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1274 PPCODE: 1534 PPCODE:
1275{ 1535{
1276 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1277 int index, trailing; 1537 int index, trailing;
1278 1538
1279 if (line < 0) 1539 if (line < 0)
1280 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1281 1541
1282 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1284 1544
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1545 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286 1546
1287 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
1293 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1294 } 1554 }
1295} 1555}
1296 1556
1297void 1557void
1298render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1299 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1300 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1301 self->pl, 1562 self->pl,
1563 self->rc,
1302 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1304 flags 1566 flags
1305 ); 1567 );
1568 // we assume that context_change actually clears/frees stuff
1569 // and does not do any recomputation...
1570 pango_layout_context_changed (self->pl);
1306 1571
1307MODULE = CFPlus PACKAGE = CFPlus::Texture 1572void
1573draw (DC::Layout self)
1574 CODE:
1575{
1576 glEnable (GL_TEXTURE_2D);
1577 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1578 glEnable (GL_BLEND);
1579 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581 glEnable (GL_ALPHA_TEST);
1582 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583
1584 rc_draw (self->rc);
1585
1586 glDisable (GL_ALPHA_TEST);
1587 glDisable (GL_BLEND);
1588 glDisable (GL_TEXTURE_2D);
1589}
1590
1591MODULE = Deliantra::Client PACKAGE = DC::Texture
1308 1592
1309PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312 1594
1313void 1595void
1314pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE: 1597 CODE:
1316{ 1598{
1343 HV *hv = (HV *)SvRV (self); 1625 HV *hv = (HV *)SvRV (self);
1344 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1626 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1627 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1628 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347 1629
1630 if (name <= 0)
1631 XSRETURN_EMPTY;
1632
1348 if (items < 5) 1633 if (items < 5)
1349 { 1634 {
1350 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1635 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1636 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352 } 1637 }
1379 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1380 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1381 } 1666 }
1382} 1667}
1383 1668
1669void
1670draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
1671 PROTOTYPE: @
1672 CODE:
1673{
1674 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1);
1678
1679 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.);
1682
1683 if (blend > 0.f)
1684 {
1685 float S2, T2; /* 0. 0. for texture 2 */
1686 float w = w1 > w2 ? w1 : w2;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend };
1689
1690 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1693
1694 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1695 gl.ActiveTexture (GL_TEXTURE1);
1696 glEnable (GL_TEXTURE_2D);
1697 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699
1700 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704
1705 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707
1708 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1709 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1710 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1711
1712 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS);
1730 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
1731 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
1732 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
1733 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
1734 glEnd ();
1735
1736 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0);
1738 }
1739 else
1740 {
1741 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743
1744 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0);
1749 glEnd ();
1750 }
1751
1752 glPopMatrix ();
1753
1754 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND);
1756}
1757
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1758IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE: 1759 CODE:
1386{ 1760{
1387 GLint width; 1761 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1762 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1390 RETVAL = width > 0; 1764 RETVAL = width > 0;
1391} 1765}
1392 OUTPUT: 1766 OUTPUT:
1393 RETVAL 1767 RETVAL
1394 1768
1395MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1396 1770
1397PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1398 1772
1399CFPlus::Map 1773DC::Map
1400new (SV *class) 1774new (SV *class)
1401 CODE: 1775 CODE:
1402 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1403 RETVAL->x = 0; 1777 RETVAL->x = 0;
1404 RETVAL->y = 0; 1778 RETVAL->y = 0;
1412 RETVAL->row = 0; 1786 RETVAL->row = 0;
1413 OUTPUT: 1787 OUTPUT:
1414 RETVAL 1788 RETVAL
1415 1789
1416void 1790void
1417DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1418 CODE: 1792 CODE:
1419{ 1793{
1420 map_clear (self); 1794 map_clear (self);
1421 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1422 Safefree (self->tex); 1796 Safefree (self->tex);
1423 Safefree (self); 1797 Safefree (self);
1424} 1798}
1425 1799
1426void 1800void
1427resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1428 CODE: 1802 CODE:
1429 self->w = map_width; 1803 self->w = map_width;
1430 self->h = map_height; 1804 self->h = map_height;
1431 1805
1432void 1806void
1433clear (CFPlus::Map self) 1807clear (DC::Map self)
1434 CODE: 1808 CODE:
1435 map_clear (self); 1809 map_clear (self);
1436 1810
1437void 1811void
1438set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1439 CODE: 1813 CODE:
1440{ 1814{
1441 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1442 need_texid (self, tile); 1816 need_texid (self, tile);
1443} 1817}
1444 1818
1445void 1819void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1447 CODE: 1821 CODE:
1448{ 1822{
1449 tileid texid; 1823 tileid texid;
1450 maptex *tex; 1824 maptex *tex;
1451 1825
1464 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1466} 1840}
1467 1841
1468void 1842void
1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1843set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470 CODE: 1844 CODE:
1471{ 1845{
1472 need_texid (self, texid); 1846 need_texid (self, texid);
1473 1847
1474 { 1848 {
1493 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1494 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496} 1870}
1497 1871
1872void
1873expire_textures (DC::Map self, int texid, int count)
1874 PPCODE:
1875 for (; texid < self->texs && count; ++texid, --count)
1876 {
1877 maptex *tex = self->tex + texid;
1878
1879 if (tex->name)
1880 {
1881 if (tex->unused)
1882 {
1883 tex->name = 0;
1884 tex->unused = 0;
1885 XPUSHs (sv_2mortal (newSViv (texid)));
1886 }
1887 else
1888 tex->unused = 1;
1889 }
1890 }
1891
1498int 1892int
1499ox (CFPlus::Map self) 1893ox (DC::Map self)
1500 ALIAS: 1894 ALIAS:
1501 oy = 1 1895 oy = 1
1502 x = 2 1896 x = 2
1503 y = 3 1897 y = 3
1504 w = 4 1898 w = 4
1515 } 1909 }
1516 OUTPUT: 1910 OUTPUT:
1517 RETVAL 1911 RETVAL
1518 1912
1519void 1913void
1520scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1521 CODE: 1915 CODE:
1522{ 1916{
1523 if (dx > 0) 1917 if (dx > 0)
1524 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1525 else if (dx < 0) 1919 else if (dx < 0)
1540 self->rows += MAP_EXTEND_Y; 1934 self->rows += MAP_EXTEND_Y;
1541 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1542 } 1936 }
1543} 1937}
1544 1938
1545void 1939SV *
1546map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1547 CODE: 1941 CODE:
1548{ 1942{
1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1551 mapcell *cell; 1945 mapcell *cell;
1552 int x, y, flags; 1946 int x, y, z, flags;
1947 AV *missing = newAV ();
1948 RETVAL = newRV_noinc ((SV *)missing);
1553 1949
1554 while (data < data_end - 1) 1950 while (data < data_end - 1)
1555 { 1951 {
1556 flags = (data [0] << 8) + data [1]; data += 2; 1952 flags = (data [0] << 8) + data [1]; data += 2;
1557 1953
1577 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1578 1974
1579 do 1975 do
1580 { 1976 {
1581 ext = *data++; 1977 ext = *data++;
1582 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1583 1979
1584 if (cmd < 4) 1980 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1587 { 1983 {
1590 } 1986 }
1591 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1594 { 1990 {
1595 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1596 ; // decode player count 1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597 1995
1598 data += *data + 1; 1996 data += *data + 1;
1599 } 1997 }
1600 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1601 cell->flags = *data++; 1999 cell->flags = *data++;
1608 } 2006 }
1609 else 2007 else
1610 cell->darkness = *data++ + 1; 2008 cell->darkness = *data++ + 1;
1611 } 2009 }
1612 2010
2011 for (z = 0; z <= 2; ++z)
1613 if (flags & 4) 2012 if (flags & (4 >> z))
1614 { 2013 {
1615 faceid face = (data [0] << 8) + data [1]; data += 2; 2014 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face); 2015 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face]; 2016 cell->tile [z] = self->face2tile [face];
2017
2018 if (cell->tile [z])
2019 {
2020 maptex *tex = self->tex + cell->tile [z];
2021 tex->unused = 0;
2022 if (!tex->name)
2023 av_push (missing, newSViv (cell->tile [z]));
2024
2025 if (tex->smoothtile)
2026 {
2027 maptex *smooth = self->tex + tex->smoothtile;
2028 smooth->unused = 0;
2029 if (!smooth->name)
2030 av_push (missing, newSViv (tex->smoothtile));
2031 }
2032 }
1618 } 2033 }
1619
1620 if (flags & 2)
1621 {
1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1625 }
1626
1627 if (flags & 1)
1628 {
1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1632 }
1633 } 2034 }
1634 else 2035 else
1635 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1636 } 2037 }
1637} 2038}
2039 OUTPUT:
2040 RETVAL
1638 2041
1639SV * 2042SV *
1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1641 CODE: 2044 CODE:
1642{ 2045{
1643 int x1, x; 2046 int x1, x;
1644 int y1, y; 2047 int y1, y;
1645 int z; 2048 int z;
1690} 2093}
1691 OUTPUT: 2094 OUTPUT:
1692 RETVAL 2095 RETVAL
1693 2096
1694void 2097void
1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T) 2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1696 CODE: 2099 CODE:
1697{ 2100{
2101 int x, y, z;
2102
1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2104 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k) 2105 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701 smooth_key skey; 2106 smooth_key skey;
1702 int x, y, z; 2107 int pl_x, pl_y;
1703 int last_name; 2108 maptex pl_tex;
2109 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden;
1704 2113
2114 pl_tex.name = 0;
2115
1705 // thats current max. sorry. 2116 // that's current max. sorry.
1706 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1708 2119
1709 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1710 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1711 2122
1712 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1713 2124 key.r = 255;
1714 glEnable (GL_BLEND); 2125 key.g = 255;
1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1716 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1718 2129 key.format = GL_T2F_V3F;
1719 glBegin (GL_QUADS);
1720
1721 last_name = 0;
1722 2130
1723 mx += self->x; 2131 mx += self->x;
1724 my += self->y; 2132 my += self->y;
1725 2133
1726 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
1743 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1745 } 2153 }
1746 } 2154 }
1747 2155
2156 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162
1748 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1749 { 2164 {
1750 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1751 2167
1752 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1753 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1754 { 2170 {
1755 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
1761 tileid tile = cell->tile [z]; 2177 tileid tile = cell->tile [z];
1762 2178
1763 if (tile) 2179 if (tile)
1764 { 2180 {
1765 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w; 2182 int px, py;
1767 int py = (y + 1) * T - tex.h;
1768 2183
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1772 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1773 if (!tex.name) 2188 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1775 2190
1776 glEnd (); 2191 key.texname = tex.name;
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1778 glBegin (GL_QUADS);
1779 } 2193 }
1780 2194
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2195 px = (x + 1) * T - tex.w;
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2196 py = (y + 1) * T - tex.h;
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785 2197
1786 if (cell->flags && z == 2) 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1787 { 2199 {
1788 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1789 { 2203 continue;
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 } 2204 }
2205
2206 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2207 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2208 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2209 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1804 2210
1805 // update smooth hash 2211 // update smooth hash
1806 if (tex.smoothtile) 2212 if (tex.smoothtile)
1807 { 2213 {
1808 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2245 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 } 2248 }
1843 } 2249 }
2250
2251 if (expect_false (z == 2))
2252 {
2253 /* draw question marks on top of hidden spaces */
2254 if (!cell->darkness)
2255 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32;
2275 int py = y * T - T * 6 / 32;
2276
2277 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov);
2279
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284 }
2285 }
2286 }
1844 } 2287 }
1845 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1846 2292
1847 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort 2294 // this is basically counting sort
1849 { 2295 {
1850 int w, b; 2296 int w, b;
1851 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1852 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1853 { 2301 {
1854 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1855 if (smask) 2303 if (smask)
1856 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
1875 int border = bits & 15; 2323 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1879 2327
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name) 2328 if (tex.name)
1883 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1884 if (!tex.name) 2332 if (key.texname != tex.name)
1885 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1886 2335
1887 glEnd (); 2336 glEnd ();
1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1890 } 2339 }
1891 2340
1892 if (border) 2341 if (border)
1893 { 2342 {
1894 float ox = border * dx; 2343 float ox = border * dx;
1895 2344
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900 } 2349 }
1901 2350
1902 if (corner) 2351 if (corner)
1903 { 2352 {
1904 float ox = corner * dx; 2353 float ox = corner * dx;
1905 2354
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1910 } 2360 }
1911 } 2361 }
1912 } 2362 }
1913 } 2363 }
1914 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1915 } 2369 }
1916 2370
1917 hv_clear (smooth); 2371 hv_clear (smooth);
1918 } 2372 }
1919 2373
1920 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1921 2379
1922 glDisable (GL_TEXTURE_2D); 2380 key.texname = tex.name;
2381 arr = rc_array (rc, &key);
2382
2383 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2384 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2385 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2386 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2387
2388 rc_draw (rc);
2389 }
2390
2391 rc_draw (rc_ov);
2392 rc_clear (rc_ov);
2393
1923 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1924 2397
1925 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1928 { 2401 {
1933 { 2406 {
1934 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1935 2408
1936 int px = x * T; 2409 int px = x * T;
1937 int py = y * T; 2410 int py = y * T;
2411
2412 if (expect_false (cell->player == player))
2413 {
2414 px += sdx;
2415 py += sdy;
2416 }
1938 2417
1939 if (cell->stat_hp) 2418 if (cell->stat_hp)
1940 { 2419 {
1941 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1953 } 2432 }
1954 } 2433 }
1955} 2434}
1956 2435
1957void 2436void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2437draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
1959 CODE: 2438 CODE:
1960{ 2439{
1961 static float color[16][3] = { 2440 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1963 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1964 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1965 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1966 2445
1967 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1968 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1969 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1970 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1971 2450
1972 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1973 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1974 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1975 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1976 2455
1977 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
1978 2457
1979 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
1980 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
1981 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
1982 }; 2461 };
1983 2462
1984 int x, y; 2463 int x, y;
1985 2464
1986 glEnable (GL_TEXTURE_2D); 2465 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia.
2471 */
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1988 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
1991 2476
1992 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
1996 2481
1997 if (m) 2482 if (m)
1998 { 2483 {
1999 float *c = color [m & 15]; 2484 float *c = color [m & 15];
2000 2485
2001 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
2002 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2003 2488
2004 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 } 2494 }
2013 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2015} 2500}
2016 2501
2017void 2502void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2503fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019 PPCODE: 2504 PPCODE:
2020{ 2505{
2021 int x, y; 2506 int x, y;
2022 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2023 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
2031 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2032 2517
2033 mx += self->x - 1; 2518 mx += self->x - 1;
2034 my += self->y - 1; 2519 my += self->y - 1;
2035 2520
2036 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2037 2522
2038 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2040 { 2525 {
2041 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
2044 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2045 { 2530 {
2046 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2047 2532
2048 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2050 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2051 } 2536 }
2052 } 2537 }
2053 2538
2054 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
2094 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2095 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2096} 2581}
2097 2582
2098SV * 2583SV *
2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2584get_rect (DC::Map self, int x0, int y0, int w, int h)
2100 CODE: 2585 CODE:
2101{ 2586{
2102 int x, y, x1, y1; 2587 int x, y, x1, y1;
2103 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2104 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2161 else 2646 else
2162 *data++ = 0; 2647 *data++ = 0;
2163 } 2648 }
2164 } 2649 }
2165 2650
2651 /* if size is w*h + 5 then no data has been found */
2652 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653 {
2166 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2167 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2168 RETVAL = data_sv; 2658 RETVAL = data_sv;
2169} 2659}
2170 OUTPUT: 2660 OUTPUT:
2171 RETVAL 2661 RETVAL
2172 2662
2173void 2663void
2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175 PPCODE: 2665 PPCODE:
2176{ 2666{
2177 int x, y, z; 2667 int x, y, z;
2178 int w, h; 2668 int w, h;
2179 int x1, y1; 2669 int x1, y1;
2670 STRLEN len;
2671 uint8_t *data, *end;
2672
2673 len = SvLEN (data_sv);
2674 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675 data = SvPVbyte_nolen (data_sv);
2676 end = data + len + 8;
2677
2678 if (len < 5)
2679 XSRETURN_EMPTY;
2180 2680
2181 if (*data++ != 0) 2681 if (*data++ != 0)
2182 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2183 2683
2184 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2185 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2186 2686
2187 // we need to do this 'cause we don't keep an absolute coord system for rows 2687 // we need to do this 'cause we don't keep an absolute coord system for rows
2199 { 2699 {
2200 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2201 2701
2202 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2203 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2204 uint8_t flags = *data++; 2709 flags = *data++;
2205 2710
2206 if (flags) 2711 if (flags)
2207 { 2712 {
2208 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214 2719
2215 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2216 { 2721 {
2217 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2218 2724
2219 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2220 { 2726 {
2221 tileid t = tile [z]; 2727 tileid t = tile [z];
2222 2728
2223 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2224 { 2730 {
2225 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t); 2732 need_texid (self, t);
2227 } 2733 }
2228 2734
2229 cell->tile [z] = t; 2735 cell->tile [z] = t;
2230 } 2736 }
2232 } 2738 }
2233 } 2739 }
2234 } 2740 }
2235} 2741}
2236 2742
2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2238 2744
2239PROTOTYPES: DISABLE 2745DC::RW
2240 2746new (SV *class, SV *data_sv)
2241CFPlus::MixChunk
2242new_from_file (SV *class, char *path)
2243 CODE: 2747 CODE:
2244 RETVAL = Mix_LoadWAV (path); 2748{
2749 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen);
2751
2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2753}
2245 OUTPUT: 2754 OUTPUT:
2246 RETVAL 2755 RETVAL
2247 2756
2757DC::RW
2758new_from_file (SV *class, const char *path, const char *mode = "rb")
2759 CODE:
2760 RETVAL = SDL_RWFromFile (path, mode);
2761 OUTPUT:
2762 RETVAL
2763
2764# fails on win32:
2765# dc.xs(2268) : error C2059: syntax error : '('
2248void 2766#void
2767#close (DC::RW self)
2768# CODE:
2769# (self->(close)) (self);
2770
2771MODULE = Deliantra::Client PACKAGE = DC::Channel
2772
2773PROTOTYPES: DISABLE
2774
2775DC::Channel
2776find ()
2777 CODE:
2778{
2779 RETVAL = Mix_GroupAvailable (-1);
2780
2781 if (RETVAL < 0)
2782 {
2783 RETVAL = Mix_GroupOldest (-1);
2784
2785 if (RETVAL < 0)
2786 XSRETURN_UNDEF;
2787
2788 Mix_HaltChannel (RETVAL);
2789 }
2790
2791 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128);
2793}
2794 OUTPUT:
2795 RETVAL
2796
2797void
2798halt (DC::Channel self)
2799 CODE:
2800 Mix_HaltChannel (self);
2801
2802void
2803expire (DC::Channel self, int ticks = -1)
2804 CODE:
2805 Mix_ExpireChannel (self, ticks);
2806
2807void
2808fade_out (DC::Channel self, int ticks = -1)
2809 CODE:
2810 Mix_FadeOutChannel (self, ticks);
2811
2812int
2813volume (DC::Channel self, int volume)
2814 CODE:
2815 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2816 OUTPUT:
2817 RETVAL
2818
2819void
2820unregister_all_effects (DC::Channel self)
2821 CODE:
2822 Mix_UnregisterAllEffects (self);
2823
2824void
2825set_panning (DC::Channel self, int left, int right)
2826 CODE:
2827 left = CLAMP (left , 0, 255);
2828 right = CLAMP (right, 0, 255);
2829 Mix_SetPanning (self, left, right);
2830
2831void
2832set_distance (DC::Channel self, int distance)
2833 CODE:
2834 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2835
2836void
2837set_position (DC::Channel self, int angle, int distance)
2838 CODE:
2839
2840void
2841set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2842 CODE:
2843{
2844 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2845 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2846 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2847}
2848
2849void
2850set_reverse_stereo (DC::Channel self, int flip)
2851 CODE:
2852 Mix_SetReverseStereo (self, flip);
2853
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855
2856PROTOTYPES: DISABLE
2857
2858DC::MixChunk
2859new (SV *class, DC::RW rwops)
2860 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862 OUTPUT:
2863 RETVAL
2864
2865void
2249DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2250 CODE: 2867 CODE:
2251 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2252 2869
2253int 2870int
2254volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2255 CODE: 2872 CODE:
2873 if (items > 1)
2874 volume = CLAMP (volume, 0, 128);
2256 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2257 OUTPUT: 2876 OUTPUT:
2258 RETVAL 2877 RETVAL
2259 2878
2260int 2879DC::Channel
2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2880play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262 CODE: 2881 CODE:
2882{
2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2884
2885 if (RETVAL < 0)
2886 XSRETURN_UNDEF;
2887
2888 if (channel < 0)
2889 {
2890 Mix_UnregisterAllEffects (RETVAL);
2891 Mix_Volume (RETVAL, 128);
2892 }
2893}
2264 OUTPUT: 2894 OUTPUT:
2265 RETVAL 2895 RETVAL
2266 2896
2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268 2898
2269int 2899int
2270volume (int volume = -1) 2900volume (int volume = -1)
2271 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2272 CODE: 2902 CODE:
2903 if (items > 0)
2904 volume = CLAMP (volume, 0, 128);
2273 RETVAL = Mix_VolumeMusic (volume); 2905 RETVAL = Mix_VolumeMusic (volume);
2274 OUTPUT: 2906 OUTPUT:
2275 RETVAL 2907 RETVAL
2276 2908
2277int 2909void
2278fade_out (int ms) 2910fade_out (int ms)
2279 CODE: 2911 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms); 2912 Mix_FadeOutMusic (ms);
2913
2914void
2915halt ()
2916 CODE:
2917 Mix_HaltMusic ();
2918
2919DC::MixMusic
2920new (SV *class, DC::RW rwops)
2921 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops);
2281 OUTPUT: 2923 OUTPUT:
2282 RETVAL 2924 RETVAL
2283 2925
2284CFPlus::MixMusic
2285new_from_file (SV *class, char *path)
2286 CODE:
2287 RETVAL = Mix_LoadMUS (path);
2288 OUTPUT:
2289 RETVAL
2290
2291void 2926void
2292DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2293 CODE: 2928 CODE:
2294 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2295 2930
2296int 2931int
2297play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2298 CODE: 2933 CODE:
2299 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2300 OUTPUT: 2935 OUTPUT:
2301 RETVAL 2936 RETVAL
2302 2937
2303int 2938void
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305 CODE: 2940 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309 2942
2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311 2944
2312PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2313 2946
2314BOOT: 2947BOOT:
2315{ 2948{
2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317 static const struct { 2950 static const struct {
2318 const char *name; 2951 const char *name;
2319 IV iv; 2952 IV iv;
2320 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2321# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2325 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2326 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2327 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2328 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2329 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
2341 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2342 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2343 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2344 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2345 const_iv (GL_ONE_MINUS_DST_ALPHA), 2979 const_iv (GL_ONE_MINUS_DST_ALPHA),
2980 const_iv (GL_SRC_COLOR),
2981 const_iv (GL_DST_COLOR),
2982 const_iv (GL_ONE_MINUS_SRC_COLOR),
2983 const_iv (GL_ONE_MINUS_DST_COLOR),
2346 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2347 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2348 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2349 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2350 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
2356 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2357 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2358 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2359 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2998 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2999 const_iv (GL_COMPRESSED_ALPHA_ARB),
3000 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
3001 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
3002 const_iv (GL_COMPRESSED_INTENSITY_ARB),
3003 const_iv (GL_COMPRESSED_RGB_ARB),
3004 const_iv (GL_COMPRESSED_RGBA_ARB),
2361 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2364 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2365 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2412 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2413 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2414 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2415 const_iv (GL_T2F_N3F_V3F), 3060 const_iv (GL_T2F_N3F_V3F),
3061 const_iv (GL_FUNC_ADD),
3062 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2416# undef const_iv 3064# undef const_iv
2417 }; 3065 };
2418 3066
2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2421 3069
2422 texture_av = newAV (); 3070 texture_av = newAV ();
2423 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2424} 3072}
2425 3073
3074void
3075disable_GL_EXT_blend_func_separate ()
3076 CODE:
3077 gl.BlendFuncSeparate = 0;
3078 gl.BlendFuncSeparateEXT = 0;
3079
3080void
3081apple_nvidia_bug (int enable)
3082
2426char * 3083char *
2427gl_vendor () 3084gl_vendor ()
2428 CODE: 3085 CODE:
2429 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2430 OUTPUT: 3087 OUTPUT:
2479 3136
2480void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2481 CODE: 3138 CODE:
2482 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2483 3140
3141# void glBlendEquation (int se)
3142
2484void glDepthMask (int flag) 3143void glDepthMask (int flag)
2485 3144
2486void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2487 3146
2488void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
2522void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2523 CODE: 3182 CODE:
2524 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2525 3184
2526void glColor (float r, float g, float b, float a = 1.0) 3185void glColor (float r, float g, float b, float a = 1.0)
3186 PROTOTYPE: @
2527 ALIAS: 3187 ALIAS:
2528 glColor_premultiply = 1 3188 glColor_premultiply = 1
2529 CODE: 3189 CODE:
2530 if (ix) 3190 if (ix)
2531 { 3191 {
2551 3211
2552void glRect (float x1, float y1, float x2, float y2) 3212void glRect (float x1, float y1, float x2, float y2)
2553 CODE: 3213 CODE:
2554 glRectf (x1, y1, x2, y2); 3214 glRectf (x1, y1, x2, y2);
2555 3215
3216void glRect_lineloop (float x1, float y1, float x2, float y2)
3217 CODE:
3218 glBegin (GL_LINE_LOOP);
3219 glVertex2f (x1, y1);
3220 glVertex2f (x2, y1);
3221 glVertex2f (x2, y2);
3222 glVertex2f (x1, y2);
3223 glEnd ();
3224
2556PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2557 3226
2558void glBegin (int mode) 3227void glBegin (int mode)
2559 3228
2560void glEnd () 3229void glEnd ()
2592void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3261void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2593 CODE: 3262 CODE:
2594 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2595 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2596 3265
2597void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3266void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2598 3267
2599void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3268void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2600 3269
2601void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2602 3271
2628 3297
2629void glEndList () 3298void glEndList ()
2630 3299
2631void glCallList (int list) 3300void glCallList (int list)
2632 3301
2633MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2634 3303
2635PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2636 3305
2637void 3306void
2638find_widget (SV *self, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
2642 XPUSHs (self); 3311 XPUSHs (self);
2643} 3312}
2644 3313
2645BOOT: 3314BOOT:
2646{ 3315{
2647 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV); 3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2648 3317
2649 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV); 3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2650 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV); 3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2651 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV); 3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2652 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV); 3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2653} 3322}
2654 3323
2655void 3324void
2656draw (SV *self) 3325draw (SV *self)
2657 CODE: 3326 CODE:
2661 NV x, y, w, h; 3330 NV x, y, w, h;
2662 SV *draw_x_sv = GvSV (draw_x_gv); 3331 SV *draw_x_sv = GvSV (draw_x_gv);
2663 SV *draw_y_sv = GvSV (draw_y_gv); 3332 SV *draw_y_sv = GvSV (draw_y_gv);
2664 SV *draw_w_sv = GvSV (draw_w_gv); 3333 SV *draw_w_sv = GvSV (draw_w_gv);
2665 SV *draw_h_sv = GvSV (draw_h_gv); 3334 SV *draw_h_sv = GvSV (draw_h_gv);
2666 SV *hover;
2667 double draw_x, draw_y, draw_w, draw_h; 3335 double draw_x, draw_y;
2668 3336
2669 if (!SvROK (self)) 3337 if (!SvROK (self))
2670 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self)); 3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2671 3339
2672 hv = (HV *)SvRV (self); 3340 hv = (HV *)SvRV (self);
2673 3341
2674 if (SvTYPE (hv) != SVt_PVHV) 3342 if (SvTYPE (hv) != SVt_PVHV)
2675 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self)); 3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2676 3344
2677 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.; 3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2678 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.; 3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2679 3347
2680 if (!h || !w) 3348 if (!h || !w)
2700 { 3368 {
2701 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0); 3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702 3370
2703 if (svp && SvTRUE (*svp)) 3371 if (svp && SvTRUE (*svp))
2704 { 3372 {
2705 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f); 3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2706 glEnable (GL_BLEND); 3374 glEnable (GL_BLEND);
2707 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708 glBegin (GL_QUADS); 3376 glBegin (GL_QUADS);
2709 glVertex2f (0, 0); 3377 glVertex2f (0, 0);
2710 glVertex2f (w, 0); 3378 glVertex2f (w, 0);
2713 glEnd (); 3381 glEnd ();
2714 glDisable (GL_BLEND); 3382 glDisable (GL_BLEND);
2715 } 3383 }
2716 } 3384 }
2717#if 0 3385#if 0
2718 if ($ENV{CFPLUS_DEBUG} & 1) { 3386 // draw borders, for debugging
2719 glPushMatrix; 3387 glPushMatrix ();
2720 glColor 1, 1, 0, 1; 3388 glColor4f (1., 1., 0., 1.);
2721 glTranslate 0.375, 0.375; 3389 glTranslatef (.5, .5, 0.);
2722 glBegin GL_LINE_LOOP; 3390 glBegin (GL_LINE_LOOP);
2723 glVertex 0 , 0; 3391 glVertex2f (0 , 0);
2724 glVertex $self->{w} - 1, 0; 3392 glVertex2f (w - 1, 0);
2725 glVertex $self->{w} - 1, $self->{h} - 1; 3393 glVertex2f (w - 1, h - 1);
2726 glVertex 0 , $self->{h} - 1; 3394 glVertex2f (0 , h - 1);
2727 glEnd; 3395 glEnd ();
2728 glPopMatrix; 3396 glPopMatrix ();
2729 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730 }
2731#endif 3397#endif
2732 PUSHMARK (SP); 3398 PUSHMARK (SP);
2733 XPUSHs (self); 3399 XPUSHs (self);
2734 PUTBACK; 3400 PUTBACK;
2735 call_method ("_draw", G_VOID | G_DISCARD); 3401 call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines