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.208 by root, Sat Jul 21 16:07:53 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/******************************************************************************/
439 497
498static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
499static GV *hover_gv;
500
440static int 501static int
441within_widget (SV *widget, NV x, NV y) 502within_widget (SV *widget, NV x, NV y)
442{ 503{
443 HV *self; 504 HV *self;
444 SV **svp; 505 SV **svp;
473 return 0; 534 return 0;
474 535
475 return 1; 536 return 1;
476} 537}
477 538
478MODULE = 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
479 592
480PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
481 594
482BOOT: 595BOOT:
483{ 596{
484 HV *stash = gv_stashpv ("CFPlus", 1); 597 HV *stash = gv_stashpv ("DC", 1);
485 static const struct { 598 static const struct {
486 const char *name; 599 const char *name;
487 IV iv; 600 IV iv;
488 } *civ, const_iv[] = { 601 } *civ, const_iv[] = {
489# define const_iv(name) { # name, (IV)name } 602# define const_iv(name) { # name, (IV)name }
511 624
512 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
515 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),
516 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
517 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
518 const_iv (SDLK_KP2), 683 const_iv (SDLK_KP2),
519 const_iv (SDLK_KP3), 684 const_iv (SDLK_KP3),
520 const_iv (SDLK_KP4), 685 const_iv (SDLK_KP4),
592 const_iv (KMOD_LMETA), 757 const_iv (KMOD_LMETA),
593 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
594 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
595 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
596 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)
597# undef const_iv 795# undef const_iv
598 }; 796 };
599 797
600 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; )
601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
619 817
620NV floor (NV x) 818NV floor (NV x)
621 819
622NV ceil (NV x) 820NV ceil (NV x)
623 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
624void 832void
625pango_init () 833pango_init ()
626 CODE: 834 CODE:
627{ 835{
628 opengl_fontmap = pango_opengl_font_map_new (); 836 opengl_fontmap = pango_opengl_font_map_new ();
629 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);
630 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
631} 844}
632 845
633char *
634SDL_GetError () 846char *SDL_GetError ()
635 847
636int 848void SDL_braino ()
637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
638 849
639void 850int SDL_Init (U32 flags)
851
852int SDL_InitSubSystem (U32 flags)
853
854void SDL_QuitSubSystem (U32 flags)
855
640SDL_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
641 866
642void 867void
643SDL_ListModes (int rgb, int alpha) 868SDL_ListModes (int rgb, int alpha)
644 PPCODE: 869 PPCODE:
645{ 870{
657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 882 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 883 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 884 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
660 885
661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 886 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
662#if SDL_VERSION_ATLEAST(1,2,10)
663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 887 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
666 888
667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 889 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
668 890
669 if (m && m != (SDL_Rect **)-1) 891 if (m && m != (SDL_Rect **)-1)
670 while (*m) 892 while (*m)
671 { 893 {
672 if ((*m)->w >= 640 && (*m)->h >= 480) 894 if ((*m)->w >= 400 && (*m)->h >= 300)
673 { 895 {
674 AV *av = newAV (); 896 AV *av = newAV ();
675 av_push (av, newSViv ((*m)->w)); 897 av_push (av, newSViv ((*m)->w));
676 av_push (av, newSViv ((*m)->h)); 898 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb)); 899 av_push (av, newSViv (rgb));
701 923
702 if (RETVAL) 924 if (RETVAL)
703 { 925 {
704 av_clear (texture_av); 926 av_clear (texture_av);
705 927
706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
707#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);
708#include "glfunc.h" 930#include "glfunc.h"
709#undef GL_FUNC 931#undef GL_FUNC
710 } 932 }
711} 933}
718char * 940char *
719SDL_GetKeyName (int sym) 941SDL_GetKeyName (int sym)
720 942
721int 943int
722SDL_GetAppState () 944SDL_GetAppState ()
945
946int
947SDL_GetModState ()
723 948
724void 949void
725poll_events () 950poll_events ()
726 PPCODE: 951 PPCODE:
727{ 952{
737 { 962 {
738 case SDL_KEYDOWN: 963 case SDL_KEYDOWN:
739 case SDL_KEYUP: 964 case SDL_KEYUP:
740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 965 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 966 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
742 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);
743 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 */
744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 969 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
745 break; 970 break;
746 971
747 case SDL_ACTIVEEVENT: 972 case SDL_ACTIVEEVENT:
748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 973 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
766 x = ev.motion.x; 991 x = ev.motion.x;
767 y = ev.motion.y; 992 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 993 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 } 994 }
770 995
771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
772 hv_store (hv, "state", 5, newSViv (state), 0); 997 hv_store (hv, "state", 5, newSViv (state), 0);
773 hv_store (hv, "x", 1, newSViv (x), 0); 998 hv_store (hv, "x", 1, newSViv (x), 0);
774 hv_store (hv, "y", 1, newSViv (y), 0); 999 hv_store (hv, "y", 1, newSViv (y), 0);
775 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1000 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
776 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1001 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 } 1002 }
778 break; 1003 break;
779 1004
780 case SDL_MOUSEBUTTONDOWN: 1005 case SDL_MOUSEBUTTONDOWN:
781 case SDL_MOUSEBUTTONUP: 1006 case SDL_MOUSEBUTTONUP:
782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 1007 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
783 1008
784 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 1009 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
785 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 1010 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
786 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1011 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
787 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1012 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1017 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1018 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
794 break; 1019 break;
795 } 1020 }
796 1021
797 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))));
798 } 1023 }
799} 1024}
800 1025
801int 1026int
802Mix_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)
803 POSTCALL: 1028 POSTCALL:
804 Mix_HookMusicFinished (music_finished); 1029 Mix_HookMusicFinished (music_finished);
805 Mix_ChannelFinished (channel_finished); 1030 Mix_ChannelFinished (channel_finished);
806 1031
807void 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
808Mix_CloseAudio () 1049Mix_CloseAudio ()
809 1050
810int 1051int
811Mix_AllocateChannels (int numchans = -1) 1052Mix_AllocateChannels (int numchans = -1)
1053
1054const char *
1055Mix_GetError ()
812 1056
813void 1057void
814lowdelay (int fd, int val = 1) 1058lowdelay (int fd, int val = 1)
815 CODE: 1059 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val)); 1060 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
842 } 1086 }
843 } 1087 }
844#endif 1088#endif
845} 1089}
846 1090
847void 1091int
848add_font (char *file) 1092add_font (char *file)
849 CODE: 1093 CODE:
850 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT:
1096 RETVAL
851 1097
852void 1098void
853load_image_inline (SV *image_) 1099load_image_inline (SV *image_)
854 ALIAS: 1100 ALIAS:
855 load_image_file = 1 1101 load_image_file = 1
858 STRLEN image_len; 1104 STRLEN image_len;
859 char *image = (char *)SvPVbyte (image_, image_len); 1105 char *image = (char *)SvPVbyte (image_, image_len);
860 SDL_Surface *surface, *surface2; 1106 SDL_Surface *surface, *surface2;
861 SDL_PixelFormat fmt; 1107 SDL_PixelFormat fmt;
862 SDL_RWops *rw = ix 1108 SDL_RWops *rw = ix
863 ? SDL_RWFromFile (image, "r") 1109 ? SDL_RWFromFile (image, "rb")
864 : SDL_RWFromConstMem (image, image_len); 1110 : SDL_RWFromConstMem (image, image_len);
865 1111
866 if (!rw) 1112 if (!rw)
867 croak ("load_image: %s", SDL_GetError ()); 1113 croak ("load_image: %s", SDL_GetError ());
868 1114
941void 1187void
942error (char *message) 1188error (char *message)
943 CODE: 1189 CODE:
944 fprintf (stderr, "ERROR: %s\n", message); 1190 fprintf (stderr, "ERROR: %s\n", message);
945#ifdef _WIN32 1191#ifdef _WIN32
946 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1192 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
947#endif 1193#endif
948 1194
949void 1195void
950fatal (char *message) 1196fatal (char *message)
951 CODE: 1197 CODE:
952 fprintf (stderr, "FATAL: %s\n", message); 1198 fprintf (stderr, "FATAL: %s\n", message);
953#ifdef _WIN32 1199#ifdef _WIN32
954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1200 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
955#endif 1201#endif
956 _exit (1); 1202 _exit (1);
957 1203
958void 1204void
959_exit (int retval = 0) 1205_exit (int retval = 0)
971#if DEBUG 1217#if DEBUG
972 VALGRIND_DO_LEAK_CHECK; 1218 VALGRIND_DO_LEAK_CHECK;
973#endif 1219#endif
974} 1220}
975 1221
976MODULE = 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
977 1230
978PROTOTYPES: DISABLE 1231PROTOTYPES: DISABLE
979 1232
980CFPlus::Font 1233DC::Font
981new_from_file (SV *class, char *path, int id = 0) 1234new_from_file (SV *class, char *path, int id = 0)
982 CODE: 1235 CODE:
983{ 1236{
984 int count; 1237 int count;
985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1238 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
988} 1241}
989 OUTPUT: 1242 OUTPUT:
990 RETVAL 1243 RETVAL
991 1244
992void 1245void
993DESTROY (CFPlus::Font self) 1246DESTROY (DC::Font self)
994 CODE: 1247 CODE:
995 pango_font_description_free (self); 1248 pango_font_description_free (self);
996 1249
997void 1250void
998make_default (CFPlus::Font self) 1251make_default (DC::Font self)
999 PROTOTYPE: $ 1252 PROTOTYPE: $
1000 CODE: 1253 CODE:
1001 default_font = self; 1254 default_font = self;
1002 1255
1003MODULE = CFPlus PACKAGE = CFPlus::Layout 1256MODULE = Deliantra::Client PACKAGE = DC::Layout
1004 1257
1005PROTOTYPES: DISABLE 1258PROTOTYPES: DISABLE
1006 1259
1007void 1260void
1008reset_glyph_cache () 1261glyph_cache_backup ()
1009 PROTOTYPE: 1262 PROTOTYPE:
1010 CODE: 1263 CODE:
1264 tc_backup ();
1265
1266void
1267glyph_cache_restore ()
1268 PROTOTYPE:
1269 CODE:
1011 tc_clear (); 1270 tc_restore ();
1012 1271
1013CFPlus::Layout 1272DC::Layout
1014new (SV *class) 1273new (SV *class)
1015 CODE: 1274 CODE:
1016 New (0, RETVAL, 1, struct cf_layout); 1275 New (0, RETVAL, 1, struct cf_layout);
1017 1276
1018 RETVAL->pl = pango_layout_new (opengl_context); 1277 RETVAL->pl = pango_layout_new (opengl_context);
1020 RETVAL->g = 1.; 1279 RETVAL->g = 1.;
1021 RETVAL->b = 1.; 1280 RETVAL->b = 1.;
1022 RETVAL->a = 1.; 1281 RETVAL->a = 1.;
1023 RETVAL->base_height = MIN_FONT_HEIGHT; 1282 RETVAL->base_height = MIN_FONT_HEIGHT;
1024 RETVAL->font = 0; 1283 RETVAL->font = 0;
1284 RETVAL->rc = rc_alloc ();
1025 1285
1026 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1286 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1027 layout_update_font (RETVAL); 1287 layout_update_font (RETVAL);
1028 OUTPUT: 1288 OUTPUT:
1029 RETVAL 1289 RETVAL
1030 1290
1031void 1291void
1032DESTROY (CFPlus::Layout self) 1292DESTROY (DC::Layout self)
1033 CODE: 1293 CODE:
1034 g_object_unref (self->pl); 1294 g_object_unref (self->pl);
1295 rc_free (self->rc);
1035 Safefree (self); 1296 Safefree (self);
1036 1297
1037void 1298void
1038set_text (CFPlus::Layout self, SV *text_) 1299set_text (DC::Layout self, SV *text_)
1039 CODE: 1300 CODE:
1040{ 1301{
1041 STRLEN textlen; 1302 STRLEN textlen;
1042 char *text = SvPVutf8 (text_, textlen); 1303 char *text = SvPVutf8 (text_, textlen);
1043 1304
1044 pango_layout_set_text (self->pl, text, textlen); 1305 pango_layout_set_text (self->pl, text, textlen);
1045} 1306}
1046 1307
1047void 1308void
1048set_markup (CFPlus::Layout self, SV *text_) 1309set_markup (DC::Layout self, SV *text_)
1049 CODE: 1310 CODE:
1050{ 1311{
1051 STRLEN textlen; 1312 STRLEN textlen;
1052 char *text = SvPVutf8 (text_, textlen); 1313 char *text = SvPVutf8 (text_, textlen);
1053 1314
1054 pango_layout_set_markup (self->pl, text, textlen); 1315 pango_layout_set_markup (self->pl, text, textlen);
1055} 1316}
1056 1317
1057void 1318void
1058set_shapes (CFPlus::Layout self, ...) 1319set_shapes (DC::Layout self, ...)
1059 CODE: 1320 CODE:
1060{ 1321{
1061 PangoAttrList *attrs = 0; 1322 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl); 1323 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text; 1324 const char *pos = text;
1098 if (attrs) 1359 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs); 1360 pango_layout_set_attributes (self->pl, attrs);
1100} 1361}
1101 1362
1102void 1363void
1103get_shapes (CFPlus::Layout self) 1364get_shapes (DC::Layout self)
1104 PPCODE: 1365 PPCODE:
1105{ 1366{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1367 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107 1368
1108 do 1369 do
1109 { 1370 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1371 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1111 1372
1112 if (run && shape_attr_p (run)) 1373 if (run && shape_attr_p (run))
1113 { 1374 {
1114 PangoRectangle extents; 1375 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents); 1376 pango_layout_iter_get_run_extents (iter, 0, &extents);
1123 1384
1124 pango_layout_iter_free (iter); 1385 pango_layout_iter_free (iter);
1125} 1386}
1126 1387
1127int 1388int
1128has_wrapped (CFPlus::Layout self) 1389has_wrapped (DC::Layout self)
1129 CODE: 1390 CODE:
1130{ 1391{
1131 int lines = 1; 1392 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl); 1393 const char *text = pango_layout_get_text (self->pl);
1133 1394
1138} 1399}
1139 OUTPUT: 1400 OUTPUT:
1140 RETVAL 1401 RETVAL
1141 1402
1142SV * 1403SV *
1143get_text (CFPlus::Layout self) 1404get_text (DC::Layout self)
1144 CODE: 1405 CODE:
1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1406 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1146 sv_utf8_decode (RETVAL); 1407 sv_utf8_decode (RETVAL);
1147 OUTPUT: 1408 OUTPUT:
1148 RETVAL 1409 RETVAL
1149 1410
1150void 1411void
1151set_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.)
1152 CODE: 1413 CODE:
1153 self->r = r; 1414 self->r = r;
1154 self->g = g; 1415 self->g = g;
1155 self->b = b; 1416 self->b = b;
1156 self->a = a; 1417 self->a = a;
1157 1418
1158void 1419void
1159set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1420set_font (DC::Layout self, DC::Font font = 0)
1160 CODE: 1421 CODE:
1161 if (self->font != font) 1422 if (self->font != font)
1162 { 1423 {
1163 self->font = font; 1424 self->font = font;
1164 layout_update_font (self); 1425 layout_update_font (self);
1165 } 1426 }
1166 1427
1167void 1428void
1168set_height (CFPlus::Layout self, int base_height) 1429set_height (DC::Layout self, int base_height)
1169 CODE: 1430 CODE:
1170 if (self->base_height != base_height) 1431 if (self->base_height != base_height)
1171 { 1432 {
1172 self->base_height = base_height; 1433 self->base_height = base_height;
1173 layout_update_font (self); 1434 layout_update_font (self);
1174 } 1435 }
1175 1436
1176void 1437void
1177set_width (CFPlus::Layout self, int max_width = -1) 1438set_width (DC::Layout self, int max_width = -1)
1178 CODE: 1439 CODE:
1179 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);
1180 1441
1181void 1442void
1182set_indent (CFPlus::Layout self, int indent) 1443set_indent (DC::Layout self, int indent)
1183 CODE: 1444 CODE:
1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1445 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1185 1446
1186void 1447void
1187set_spacing (CFPlus::Layout self, int spacing) 1448set_spacing (DC::Layout self, int spacing)
1188 CODE: 1449 CODE:
1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1450 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1190 1451
1191void 1452void
1192set_ellipsise (CFPlus::Layout self, int ellipsise) 1453set_ellipsise (DC::Layout self, int ellipsise)
1193 CODE: 1454 CODE:
1194 pango_layout_set_ellipsize (self->pl, 1455 pango_layout_set_ellipsize (self->pl,
1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1456 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1457 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1458 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1198 : PANGO_ELLIPSIZE_NONE 1459 : PANGO_ELLIPSIZE_NONE
1199 ); 1460 );
1200 1461
1201void 1462void
1202set_single_paragraph_mode (CFPlus::Layout self, int spm) 1463set_single_paragraph_mode (DC::Layout self, int spm)
1203 CODE: 1464 CODE:
1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1465 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1205 1466
1206void 1467void
1207size (CFPlus::Layout self) 1468size (DC::Layout self)
1208 PPCODE: 1469 PPCODE:
1209{ 1470{
1210 int w, h; 1471 int w, h;
1211 1472
1212 layout_get_pixel_size (self, &w, &h); 1473 layout_get_pixel_size (self, &w, &h);
1215 PUSHs (sv_2mortal (newSViv (w))); 1476 PUSHs (sv_2mortal (newSViv (w)));
1216 PUSHs (sv_2mortal (newSViv (h))); 1477 PUSHs (sv_2mortal (newSViv (h)));
1217} 1478}
1218 1479
1219int 1480int
1220descent (CFPlus::Layout self) 1481descent (DC::Layout self)
1221 CODE: 1482 CODE:
1222{ 1483{
1223 PangoRectangle rect; 1484 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1485 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect); 1486 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect); 1487 RETVAL = PANGO_DESCENT (rect);
1227} 1488}
1228 OUTPUT: 1489 OUTPUT:
1229 RETVAL 1490 RETVAL
1230 1491
1231int 1492int
1232xy_to_index (CFPlus::Layout self, int x, int y) 1493xy_to_index (DC::Layout self, int x, int y)
1233 CODE: 1494 CODE:
1234{ 1495{
1235 int index, trailing; 1496 int index, trailing;
1236 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);
1237 RETVAL = index + trailing; 1498 RETVAL = index + trailing;
1238} 1499}
1239 OUTPUT: 1500 OUTPUT:
1240 RETVAL 1501 RETVAL
1241 1502
1242void 1503void
1243cursor_pos (CFPlus::Layout self, int index) 1504cursor_pos (DC::Layout self, int index)
1244 PPCODE: 1505 PPCODE:
1245{ 1506{
1246 PangoRectangle strong_pos; 1507 PangoRectangle pos;
1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1508 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1248 1509
1249 EXTEND (SP, 3); 1510 EXTEND (SP, 3);
1250 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1512 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1513 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1253} 1514}
1254 1515
1255void 1516void
1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1517index_to_line_x (DC::Layout self, int index, int trailing = 0)
1257 PPCODE: 1518 PPCODE:
1258{ 1519{
1259 int line, x; 1520 int line, x;
1260 1521
1261 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)
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1524 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1263 1525 --line;
1526#endif
1264 EXTEND (SP, 2); 1527 EXTEND (SP, 2);
1265 PUSHs (sv_2mortal (newSViv (line - 1))); 1528 PUSHs (sv_2mortal (newSViv (line)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1529 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267} 1530}
1268 1531
1269void 1532void
1270line_x_to_index (CFPlus::Layout self, int line, int x) 1533line_x_to_index (DC::Layout self, int line, int x)
1271 PPCODE: 1534 PPCODE:
1272{ 1535{
1273 PangoLayoutLine *lp; 1536 PangoLayoutLine *lp;
1274 int index, trailing; 1537 int index, trailing;
1275 1538
1276 if (line < 0) 1539 if (line < 0)
1277 XSRETURN_EMPTY; 1540 XSRETURN_EMPTY;
1278 1541
1279 if (!(lp = pango_layout_get_line (self->pl, line))) 1542 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */ 1543 XSRETURN_EMPTY; /* do better */
1281 1544
1282 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);
1283 1546
1284 EXTEND (SP, 2); 1547 EXTEND (SP, 2);
1290 PUSHs (sv_2mortal (newSViv (trailing))); 1553 PUSHs (sv_2mortal (newSViv (trailing)));
1291 } 1554 }
1292} 1555}
1293 1556
1294void 1557void
1295render (CFPlus::Layout self, float x, float y, int flags = 0) 1558render (DC::Layout self, float x, float y, int flags = 0)
1296 PPCODE: 1559 CODE:
1560 rc_clear (self->rc);
1297 pango_opengl_render_layout_subpixel ( 1561 pango_opengl_render_layout_subpixel (
1298 self->pl, 1562 self->pl,
1563 self->rc,
1299 x * PANGO_SCALE, y * PANGO_SCALE, 1564 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a, 1565 self->r, self->g, self->b, self->a,
1301 flags 1566 flags
1302 ); 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);
1303 1571
1304MODULE = 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
1305 1592
1306PROTOTYPES: ENABLE 1593PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309 1594
1310void 1595void
1311pad (SV *data_, int ow, int oh, int nw, int nh) 1596pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE: 1597 CODE:
1313{ 1598{
1340 HV *hv = (HV *)SvRV (self); 1625 HV *hv = (HV *)SvRV (self);
1341 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1626 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1342 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1627 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1343 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1628 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1344 1629
1630 if (name <= 0)
1631 XSRETURN_EMPTY;
1632
1345 if (items < 5) 1633 if (items < 5)
1346 { 1634 {
1347 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1635 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1348 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1636 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1349 } 1637 }
1376 glDisable (GL_ALPHA_TEST); 1664 glDisable (GL_ALPHA_TEST);
1377 glDisable (GL_BLEND); 1665 glDisable (GL_BLEND);
1378 } 1666 }
1379} 1667}
1380 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
1381IV 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)
1382 CODE: 1759 CODE:
1383{ 1760{
1384 GLint width; 1761 GLint width;
1385 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);
1387 RETVAL = width > 0; 1764 RETVAL = width > 0;
1388} 1765}
1389 OUTPUT: 1766 OUTPUT:
1390 RETVAL 1767 RETVAL
1391 1768
1392MODULE = CFPlus PACKAGE = CFPlus::Map 1769MODULE = Deliantra::Client PACKAGE = DC::Map
1393 1770
1394PROTOTYPES: DISABLE 1771PROTOTYPES: DISABLE
1395 1772
1396CFPlus::Map 1773DC::Map
1397new (SV *class) 1774new (SV *class)
1398 CODE: 1775 CODE:
1399 New (0, RETVAL, 1, struct map); 1776 New (0, RETVAL, 1, struct map);
1400 RETVAL->x = 0; 1777 RETVAL->x = 0;
1401 RETVAL->y = 0; 1778 RETVAL->y = 0;
1409 RETVAL->row = 0; 1786 RETVAL->row = 0;
1410 OUTPUT: 1787 OUTPUT:
1411 RETVAL 1788 RETVAL
1412 1789
1413void 1790void
1414DESTROY (CFPlus::Map self) 1791DESTROY (DC::Map self)
1415 CODE: 1792 CODE:
1416{ 1793{
1417 map_clear (self); 1794 map_clear (self);
1418 Safefree (self->face2tile); 1795 Safefree (self->face2tile);
1419 Safefree (self->tex); 1796 Safefree (self->tex);
1420 Safefree (self); 1797 Safefree (self);
1421} 1798}
1422 1799
1423void 1800void
1424resize (CFPlus::Map self, int map_width, int map_height) 1801resize (DC::Map self, int map_width, int map_height)
1425 CODE: 1802 CODE:
1426 self->w = map_width; 1803 self->w = map_width;
1427 self->h = map_height; 1804 self->h = map_height;
1428 1805
1429void 1806void
1430clear (CFPlus::Map self) 1807clear (DC::Map self)
1431 CODE: 1808 CODE:
1432 map_clear (self); 1809 map_clear (self);
1433 1810
1434void 1811void
1435set_tileid (CFPlus::Map self, int face, int tile) 1812set_tileid (DC::Map self, int face, int tile)
1436 CODE: 1813 CODE:
1437{ 1814{
1438 need_facenum (self, face); self->face2tile [face] = tile; 1815 need_facenum (self, face); self->face2tile [face] = tile;
1439 need_texid (self, tile); 1816 need_texid (self, tile);
1440} 1817}
1441 1818
1442void 1819void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level) 1820set_smooth (DC::Map self, int face, int smooth, int level)
1444 CODE: 1821 CODE:
1445{ 1822{
1446 tileid texid; 1823 tileid texid;
1447 maptex *tex; 1824 maptex *tex;
1448 1825
1461 tex->smoothtile = self->face2tile [smooth]; 1838 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level; 1839 tex->smoothlevel = level;
1463} 1840}
1464 1841
1465void 1842void
1466set_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)
1467 CODE: 1844 CODE:
1468{ 1845{
1469 need_texid (self, texid); 1846 need_texid (self, texid);
1470 1847
1471 { 1848 {
1490 // use uglier nearest interpolation because linear suffers 1867 // use uglier nearest interpolation because linear suffers
1491 // from transparent color bleeding and ugly wrapping effects. 1868 // from transparent color bleeding and ugly wrapping effects.
1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1869 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1493} 1870}
1494 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
1495int 1892int
1496ox (CFPlus::Map self) 1893ox (DC::Map self)
1497 ALIAS: 1894 ALIAS:
1498 oy = 1 1895 oy = 1
1499 x = 2 1896 x = 2
1500 y = 3 1897 y = 3
1501 w = 4 1898 w = 4
1512 } 1909 }
1513 OUTPUT: 1910 OUTPUT:
1514 RETVAL 1911 RETVAL
1515 1912
1516void 1913void
1517scroll (CFPlus::Map self, int dx, int dy) 1914scroll (DC::Map self, int dx, int dy)
1518 CODE: 1915 CODE:
1519{ 1916{
1520 if (dx > 0) 1917 if (dx > 0)
1521 map_blank (self, self->x, self->y, dx, self->h); 1918 map_blank (self, self->x, self->y, dx, self->h);
1522 else if (dx < 0) 1919 else if (dx < 0)
1537 self->rows += MAP_EXTEND_Y; 1934 self->rows += MAP_EXTEND_Y;
1538 self->y += MAP_EXTEND_Y; 1935 self->y += MAP_EXTEND_Y;
1539 } 1936 }
1540} 1937}
1541 1938
1542void 1939SV *
1543map1a_update (CFPlus::Map self, SV *data_, int extmap) 1940map1a_update (DC::Map self, SV *data_, int extmap)
1544 CODE: 1941 CODE:
1545{ 1942{
1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1547 uint8_t *data_end = (uint8_t *)SvEND (data_); 1944 uint8_t *data_end = (uint8_t *)SvEND (data_);
1548 mapcell *cell; 1945 mapcell *cell;
1549 int x, y, flags; 1946 int x, y, z, flags;
1947 AV *missing = newAV ();
1948 RETVAL = newRV_noinc ((SV *)missing);
1550 1949
1551 while (data < data_end - 1) 1950 while (data < data_end - 1)
1552 { 1951 {
1553 flags = (data [0] << 8) + data [1]; data += 2; 1952 flags = (data [0] << 8) + data [1]; data += 2;
1554 1953
1574 uint8_t ext, cmd; 1973 uint8_t ext, cmd;
1575 1974
1576 do 1975 do
1577 { 1976 {
1578 ext = *data++; 1977 ext = *data++;
1579 cmd = ext & 0x3f; 1978 cmd = ext & 0x7f;
1580 1979
1581 if (cmd < 4) 1980 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1; 1981 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health 1982 else if (cmd == 5) // health
1584 { 1983 {
1587 } 1986 }
1588 else if (cmd == 6) // monster width 1987 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1; 1988 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47) 1989 else if (cmd == 0x47)
1591 { 1990 {
1592 if (*data == 4) 1991 if (*data == 1) cell->player = data [1];
1593 ; // 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);
1594 1995
1595 data += *data + 1; 1996 data += *data + 1;
1596 } 1997 }
1597 else if (cmd == 8) // cell flags 1998 else if (cmd == 8) // cell flags
1598 cell->flags = *data++; 1999 cell->flags = *data++;
1605 } 2006 }
1606 else 2007 else
1607 cell->darkness = *data++ + 1; 2008 cell->darkness = *data++ + 1;
1608 } 2009 }
1609 2010
2011 for (z = 0; z <= 2; ++z)
1610 if (flags & 4) 2012 if (flags & (4 >> z))
1611 { 2013 {
1612 faceid face = (data [0] << 8) + data [1]; data += 2; 2014 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face); 2015 need_facenum (self, face);
1614 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 }
1615 } 2033 }
1616
1617 if (flags & 2)
1618 {
1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1622 }
1623
1624 if (flags & 1)
1625 {
1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1629 }
1630 } 2034 }
1631 else 2035 else
1632 cell->darkness = 0; 2036 CELL_CLEAR (cell);
1633 } 2037 }
1634} 2038}
2039 OUTPUT:
2040 RETVAL
1635 2041
1636SV * 2042SV *
1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 2043mapmap (DC::Map self, int x0, int y0, int w, int h)
1638 CODE: 2044 CODE:
1639{ 2045{
1640 int x1, x; 2046 int x1, x;
1641 int y1, y; 2047 int y1, y;
1642 int z; 2048 int z;
1687} 2093}
1688 OUTPUT: 2094 OUTPUT:
1689 RETVAL 2095 RETVAL
1690 2096
1691void 2097void
1692draw (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)
1693 CODE: 2099 CODE:
1694{ 2100{
2101 int x, y, z;
2102
1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 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
1697 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)
1698 smooth_key skey; 2106 smooth_key skey;
1699 int x, y, z; 2107 int pl_x, pl_y;
1700 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;
1701 2113
2114 pl_tex.name = 0;
2115
1702 // thats current max. sorry. 2116 // that's current max. sorry.
1703 if (sw > 255) sw = 255; 2117 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255; 2118 if (sh > 255) sh = 255;
1705 2119
1706 // clear key, in case of extra padding 2120 // clear key, in case of extra padding
1707 memset (&skey, 0, sizeof (skey)); 2121 memset (&skey, 0, sizeof (skey));
1708 2122
1709 glColor4ub (255, 255, 255, 255); 2123 memset (&key, 0, sizeof (key));
1710 2124 key.r = 255;
1711 glEnable (GL_BLEND); 2125 key.g = 255;
1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2126 key.b = 255;
1713 glEnable (GL_TEXTURE_2D); 2127 key.a = 255;
1714 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2128 key.mode = GL_QUADS;
1715 2129 key.format = GL_T2F_V3F;
1716 glBegin (GL_QUADS);
1717
1718 last_name = 0;
1719 2130
1720 mx += self->x; 2131 mx += self->x;
1721 my += self->y; 2132 my += self->y;
1722 2133
1723 // first pass: determine smooth_max 2134 // first pass: determine smooth_max
1740 MAX (self->tex [cell->tile [1]].smoothlevel, 2151 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel)); 2152 self->tex [cell->tile [2]].smoothlevel));
1742 } 2153 }
1743 } 2154 }
1744 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
1745 for (z = 0; z <= 2; z++) 2163 for (z = 0; z <= 2; z++)
1746 { 2164 {
1747 memset (smooth_level, 0, sizeof (smooth_level)); 2165 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1;
1748 2167
1749 for (y = 0; y < sh; y++) 2168 for (y = 0; y < sh; y++)
1750 if (0 <= y + my && y + my < self->rows) 2169 if (0 <= y + my && y + my < self->rows)
1751 { 2170 {
1752 maprow *row = self->row + (y + my); 2171 maprow *row = self->row + (y + my);
1758 tileid tile = cell->tile [z]; 2177 tileid tile = cell->tile [z];
1759 2178
1760 if (tile) 2179 if (tile)
1761 { 2180 {
1762 maptex tex = self->tex [tile]; 2181 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w; 2182 int px, py;
1764 int py = (y + 1) * T - tex.h;
1765 2183
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name) 2184 if (key.texname != tex.name)
1769 { 2185 {
2186 self->tex [tile].unused = 0;
2187
1770 if (!tex.name) 2188 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */ 2189 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1772 2190
1773 glEnd (); 2191 key.texname = tex.name;
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2192 arr = rc_array (rc, &key);
1775 glBegin (GL_QUADS);
1776 } 2193 }
1777 2194
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2195 px = (x + 1) * T - tex.w;
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2196 py = (y + 1) * T - tex.h;
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782 2197
1783 if (cell->flags && z == 2) 2198 if (expect_false (cell->player == player) && expect_false (z == 2))
1784 { 2199 {
1785 if (cell->flags & 1) 2200 pl_x = px;
2201 pl_y = py;
2202 pl_tex = tex;
1786 { 2203 continue;
1787 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32;
1790
1791 glEnd ();
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1793 glBegin (GL_QUADS);
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 }
1800 } 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);
1801 2210
1802 // update smooth hash 2211 // update smooth hash
1803 if (tex.smoothtile) 2212 if (tex.smoothtile)
1804 { 2213 {
1805 skey.tile = tex.smoothtile; 2214 skey.tile = tex.smoothtile;
1836 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);
1837 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);
1838 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);
1839 } 2248 }
1840 } 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 }
1841 } 2287 }
1842 } 2288 }
2289
2290 rc_draw (rc);
2291 rc_clear (rc);
1843 2292
1844 // go through all smoothlevels, lowest to highest, then draw. 2293 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort 2294 // this is basically counting sort
1846 { 2295 {
1847 int w, b; 2296 int w, b;
1848 2297
2298 glEnable (GL_TEXTURE_2D);
2299 glBegin (GL_QUADS);
1849 for (w = 0; w < 256 / 32; ++w) 2300 for (w = 0; w < 256 / 32; ++w)
1850 { 2301 {
1851 uint32_t smask = smooth_level [w]; 2302 uint32_t smask = smooth_level [w];
1852 if (smask) 2303 if (smask)
1853 for (b = 0; b < 32; ++b) 2304 for (b = 0; b < 32; ++b)
1872 int border = bits & 15; 2323 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2324 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row 2325 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column 2326 float dy = tex.t * .5f ; // 2 images/column
1876 2327
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name) 2328 if (tex.name)
1880 { 2329 {
2330 // this time avoiding texture state changes
2331 // save gobs of state changes.
1881 if (!tex.name) 2332 if (key.texname != tex.name)
1882 continue; // smoothing not yet available 2333 {
2334 self->tex [skey->tile].unused = 0;
1883 2335
1884 glEnd (); 2336 glEnd ();
1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2337 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1886 glBegin (GL_QUADS); 2338 glBegin (GL_QUADS);
1887 } 2339 }
1888 2340
1889 if (border) 2341 if (border)
1890 { 2342 {
1891 float ox = border * dx; 2343 float ox = border * dx;
1892 2344
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py ); 2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T); 2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T); 2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py ); 2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1897 } 2349 }
1898 2350
1899 if (corner) 2351 if (corner)
1900 { 2352 {
1901 float ox = corner * dx; 2353 float ox = corner * dx;
1902 2354
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py ); 2355 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T); 2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T); 2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py ); 2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2359 }
1907 } 2360 }
1908 } 2361 }
1909 } 2362 }
1910 } 2363 }
1911 } 2364 }
2365
2366 glEnd ();
2367 glDisable (GL_TEXTURE_2D);
2368 key.texname = -1;
1912 } 2369 }
1913 2370
1914 hv_clear (smooth); 2371 hv_clear (smooth);
1915 } 2372 }
1916 2373
1917 glEnd (); 2374 if (pl_tex.name)
2375 {
2376 maptex tex = pl_tex;
2377 int px = pl_x + sdx;
2378 int py = pl_y + sdy;
1918 2379
1919 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
1920 glDisable (GL_BLEND); 2394 glDisable (GL_BLEND);
2395 rc_free (rc);
2396 rc_free (rc_ov);
1921 2397
1922 // top layer: overlays such as the health bar 2398 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++) 2399 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows) 2400 if (0 <= y + my && y + my < self->rows)
1925 { 2401 {
1930 { 2406 {
1931 mapcell *cell = row->col + (x + mx - row->c0); 2407 mapcell *cell = row->col + (x + mx - row->c0);
1932 2408
1933 int px = x * T; 2409 int px = x * T;
1934 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 }
1935 2417
1936 if (cell->stat_hp) 2418 if (cell->stat_hp)
1937 { 2419 {
1938 int width = cell->stat_width * T; 2420 int width = cell->stat_width * T;
1939 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1950 } 2432 }
1951 } 2433 }
1952} 2434}
1953 2435
1954void 2436void
1955draw_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)
1956 CODE: 2438 CODE:
1957{ 2439{
1958 static float color[16][3] = { 2440 static float color[16][3] = {
1959 { 0.00F, 0.00F, 0.00F }, 2441 { 0.00f, 0.00f, 0.00f },
1960 { 1.00F, 1.00F, 1.00F }, 2442 { 1.00f, 1.00f, 1.00f },
1961 { 0.00F, 0.00F, 0.55F }, 2443 { 0.00f, 0.00f, 0.55f },
1962 { 1.00F, 0.00F, 0.00F }, 2444 { 1.00f, 0.00f, 0.00f },
1963 2445
1964 { 1.00F, 0.54F, 0.00F }, 2446 { 1.00f, 0.54f, 0.00f },
1965 { 0.11F, 0.56F, 1.00F }, 2447 { 0.11f, 0.56f, 1.00f },
1966 { 0.93F, 0.46F, 0.00F }, 2448 { 0.93f, 0.46f, 0.00f },
1967 { 0.18F, 0.54F, 0.34F }, 2449 { 0.18f, 0.54f, 0.34f },
1968 2450
1969 { 0.56F, 0.73F, 0.56F }, 2451 { 0.56f, 0.73f, 0.56f },
1970 { 0.80F, 0.80F, 0.80F }, 2452 { 0.80f, 0.80f, 0.80f },
1971 { 0.55F, 0.41F, 0.13F }, 2453 { 0.55f, 0.41f, 0.13f },
1972 { 0.99F, 0.77F, 0.26F }, 2454 { 0.99f, 0.77f, 0.26f },
1973 2455
1974 { 0.74F, 0.65F, 0.41F }, 2456 { 0.74f, 0.65f, 0.41f },
1975 2457
1976 { 0.00F, 1.00F, 1.00F }, 2458 { 0.00f, 1.00f, 1.00f },
1977 { 1.00F, 0.00F, 1.00F }, 2459 { 1.00f, 0.00f, 1.00f },
1978 { 1.00F, 1.00F, 0.00F }, 2460 { 1.00f, 1.00f, 0.00f },
1979 }; 2461 };
1980 2462
1981 int x, y; 2463 int x, y;
1982 2464
1983 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 */
1984 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1985 glEnable (GL_BLEND); 2473 glEnable (GL_BLEND);
1986 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2474 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1987 glBegin (GL_QUADS); 2475 glBegin (GL_QUADS);
1988 2476
1989 for (y = 0; y < h; y++) 2477 for (y = 0; y < h; y++)
1993 2481
1994 if (m) 2482 if (m)
1995 { 2483 {
1996 float *c = color [m & 15]; 2484 float *c = color [m & 15];
1997 2485
1998 float tx1 = m & 0x40 ? 0.5 : 0.; 2486 float tx1 = m & 0x40 ? 0.5f : 0.f;
1999 float tx2 = tx1 + 0.5; 2487 float tx2 = tx1 + 0.5f;
2000 2488
2001 glColor4f (c[0], c[1], c[2], 0.75); 2489 glColor4f (c[0], c[1], c[2], 1);
2002 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2490 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2003 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2491 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2004 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2492 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2005 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2493 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2006 } 2494 }
2010 glDisable (GL_BLEND); 2498 glDisable (GL_BLEND);
2011 glDisable (GL_TEXTURE_2D); 2499 glDisable (GL_TEXTURE_2D);
2012} 2500}
2013 2501
2014void 2502void
2015fow_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)
2016 PPCODE: 2504 PPCODE:
2017{ 2505{
2018 int x, y; 2506 int x, y;
2019 int sw1 = sw + 2; 2507 int sw1 = sw + 2;
2020 int sh1 = sh + 2; 2508 int sh1 = sh + 2;
2028 SvCUR_set (darkness3_sv, sw34 * sh3); 2516 SvCUR_set (darkness3_sv, sw34 * sh3);
2029 2517
2030 mx += self->x - 1; 2518 mx += self->x - 1;
2031 my += self->y - 1; 2519 my += self->y - 1;
2032 2520
2033 memset (darkness1, 255, sw1 * sh1); 2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2034 2522
2035 for (y = 0; y < sh1; y++) 2523 for (y = 0; y < sh1; y++)
2036 if (0 <= y + my && y + my < self->rows) 2524 if (0 <= y + my && y + my < self->rows)
2037 { 2525 {
2038 maprow *row = self->row + (y + my); 2526 maprow *row = self->row + (y + my);
2041 if (row->c0 <= x + mx && x + mx < row->c1) 2529 if (row->c0 <= x + mx && x + mx < row->c1)
2042 { 2530 {
2043 mapcell *cell = row->col + (x + mx - row->c0); 2531 mapcell *cell = row->col + (x + mx - row->c0);
2044 2532
2045 darkness1 [y * sw1 + x] = cell->darkness 2533 darkness1 [y * sw1 + x] = cell->darkness
2046 ? 255 - (cell->darkness - 1) 2534 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2047 : 255 - FOW_DARKNESS; 2535 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2048 } 2536 }
2049 } 2537 }
2050 2538
2051 for (y = 0; y < sh; ++y) 2539 for (y = 0; y < sh; ++y)
2052 for (x = 0; x < sw; ++x) 2540 for (x = 0; x < sw; ++x)
2091 PUSHs (sv_2mortal (newSViv (sh3))); 2579 PUSHs (sv_2mortal (newSViv (sh3)));
2092 PUSHs (darkness3_sv); 2580 PUSHs (darkness3_sv);
2093} 2581}
2094 2582
2095SV * 2583SV *
2096get_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)
2097 CODE: 2585 CODE:
2098{ 2586{
2099 int x, y, x1, y1; 2587 int x, y, x1, y1;
2100 SV *data_sv = newSV (w * h * 7 + 5); 2588 SV *data_sv = newSV (w * h * 7 + 5);
2101 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2589 uint8_t *data = (uint8_t *)SvPVX (data_sv);
2158 else 2646 else
2159 *data++ = 0; 2647 *data++ = 0;
2160 } 2648 }
2161 } 2649 }
2162 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 {
2163 SvPOK_only (data_sv); 2654 SvPOK_only (data_sv);
2164 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2655 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656 }
2657
2165 RETVAL = data_sv; 2658 RETVAL = data_sv;
2166} 2659}
2167 OUTPUT: 2660 OUTPUT:
2168 RETVAL 2661 RETVAL
2169 2662
2170void 2663void
2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2664set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2172 PPCODE: 2665 PPCODE:
2173{ 2666{
2174 int x, y, z; 2667 int x, y, z;
2175 int w, h; 2668 int w, h;
2176 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;
2177 2680
2178 if (*data++ != 0) 2681 if (*data++ != 0)
2179 return; /* version mismatch */ 2682 XSRETURN_EMPTY; /* version mismatch */
2180 2683
2181 w = *data++ << 8; w |= *data++; 2684 w = *data++ << 8; w |= *data++;
2182 h = *data++ << 8; h |= *data++; 2685 h = *data++ << 8; h |= *data++;
2183 2686
2184 // 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
2196 { 2699 {
2197 maprow *row = map_get_row (self, y); 2700 maprow *row = map_get_row (self, y);
2198 2701
2199 for (x = x0; x < x1; x++) 2702 for (x = x0; x < x1; x++)
2200 { 2703 {
2704 uint8_t flags;
2705
2706 if (data + 7 >= end)
2707 XSRETURN_EMPTY;
2708
2201 uint8_t flags = *data++; 2709 flags = *data++;
2202 2710
2203 if (flags) 2711 if (flags)
2204 { 2712 {
2205 mapcell *cell = row_get_cell (row, x); 2713 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 }; 2714 tileid tile[3] = { 0, 0, 0 };
2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2717 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2718 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2211 2719
2212 if (cell->darkness == 0) 2720 if (cell->darkness == 0)
2213 { 2721 {
2214 cell->darkness = 0; 2722 /*cell->darkness = 0;*/
2723 EXTEND (SP, 3);
2215 2724
2216 for (z = 0; z <= 2; z++) 2725 for (z = 0; z <= 2; z++)
2217 { 2726 {
2218 tileid t = tile [z]; 2727 tileid t = tile [z];
2219 2728
2220 if (t >= self->texs || (t && !self->tex [t].name)) 2729 if (t >= self->texs || (t && !self->tex [t].name))
2221 { 2730 {
2222 XPUSHs (sv_2mortal (newSViv (t))); 2731 PUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t); 2732 need_texid (self, t);
2224 } 2733 }
2225 2734
2226 cell->tile [z] = t; 2735 cell->tile [z] = t;
2227 } 2736 }
2229 } 2738 }
2230 } 2739 }
2231 } 2740 }
2232} 2741}
2233 2742
2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2743MODULE = Deliantra::Client PACKAGE = DC::RW
2235 2744
2236PROTOTYPES: DISABLE 2745DC::RW
2237 2746new (SV *class, SV *data_sv)
2238CFPlus::MixChunk
2239new_from_file (SV *class, char *path)
2240 CODE: 2747 CODE:
2241 RETVAL = Mix_LoadWAV (path); 2748{
2749 STRLEN datalen;
2750 char *data = SvPVbyte (data_sv, datalen);
2751
2752 RETVAL = SDL_RWFromConstMem (data, datalen);
2753}
2242 OUTPUT: 2754 OUTPUT:
2243 RETVAL 2755 RETVAL
2244 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 : '('
2245void 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
2246DESTROY (CFPlus::MixChunk self) 2866DESTROY (DC::MixChunk self)
2247 CODE: 2867 CODE:
2248 Mix_FreeChunk (self); 2868 Mix_FreeChunk (self);
2249 2869
2250int 2870int
2251volume (CFPlus::MixChunk self, int volume = -1) 2871volume (DC::MixChunk self, int volume = -1)
2252 CODE: 2872 CODE:
2873 if (items > 1)
2874 volume = CLAMP (volume, 0, 128);
2253 RETVAL = Mix_VolumeChunk (self, volume); 2875 RETVAL = Mix_VolumeChunk (self, volume);
2254 OUTPUT: 2876 OUTPUT:
2255 RETVAL 2877 RETVAL
2256 2878
2257int 2879DC::Channel
2258play (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)
2259 CODE: 2881 CODE:
2882{
2260 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}
2261 OUTPUT: 2894 OUTPUT:
2262 RETVAL 2895 RETVAL
2263 2896
2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2265 2898
2266int 2899int
2267volume (int volume = -1) 2900volume (int volume = -1)
2268 PROTOTYPE: ;$ 2901 PROTOTYPE: ;$
2269 CODE: 2902 CODE:
2903 if (items > 0)
2904 volume = CLAMP (volume, 0, 128);
2270 RETVAL = Mix_VolumeMusic (volume); 2905 RETVAL = Mix_VolumeMusic (volume);
2271 OUTPUT: 2906 OUTPUT:
2272 RETVAL 2907 RETVAL
2273 2908
2274int 2909void
2275fade_out (int ms) 2910fade_out (int ms)
2276 CODE: 2911 CODE:
2277 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);
2278 OUTPUT: 2923 OUTPUT:
2279 RETVAL 2924 RETVAL
2280 2925
2281CFPlus::MixMusic
2282new_from_file (SV *class, char *path)
2283 CODE:
2284 RETVAL = Mix_LoadMUS (path);
2285 OUTPUT:
2286 RETVAL
2287
2288void 2926void
2289DESTROY (CFPlus::MixMusic self) 2927DESTROY (DC::MixMusic self)
2290 CODE: 2928 CODE:
2291 Mix_FreeMusic (self); 2929 Mix_FreeMusic (self);
2292 2930
2293int 2931int
2294play (CFPlus::MixMusic self, int loops = -1) 2932play (DC::MixMusic self, int loops = -1)
2295 CODE: 2933 CODE:
2296 RETVAL = Mix_PlayMusic (self, loops); 2934 RETVAL = Mix_PlayMusic (self, loops);
2297 OUTPUT: 2935 OUTPUT:
2298 RETVAL 2936 RETVAL
2299 2937
2300int 2938void
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position) 2939fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2302 CODE: 2940 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position); 2941 Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306 2942
2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2943MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2308 2944
2309PROTOTYPES: ENABLE 2945PROTOTYPES: ENABLE
2310 2946
2311BOOT: 2947BOOT:
2312{ 2948{
2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2949 HV *stash = gv_stashpv ("DC::OpenGL", 1);
2314 static const struct { 2950 static const struct {
2315 const char *name; 2951 const char *name;
2316 IV iv; 2952 IV iv;
2317 } *civ, const_iv[] = { 2953 } *civ, const_iv[] = {
2318# define const_iv(name) { # name, (IV)name } 2954# define const_iv(name) { # name, (IV)name }
2319 const_iv (GL_VENDOR), 2955 const_iv (GL_VENDOR),
2320 const_iv (GL_VERSION), 2956 const_iv (GL_VERSION),
2321 const_iv (GL_EXTENSIONS), 2957 const_iv (GL_EXTENSIONS),
2958 const_iv (GL_MAX_TEXTURE_UNITS),
2322 const_iv (GL_COLOR_MATERIAL), 2959 const_iv (GL_COLOR_MATERIAL),
2323 const_iv (GL_SMOOTH), 2960 const_iv (GL_SMOOTH),
2324 const_iv (GL_FLAT), 2961 const_iv (GL_FLAT),
2325 const_iv (GL_DITHER), 2962 const_iv (GL_DITHER),
2326 const_iv (GL_BLEND), 2963 const_iv (GL_BLEND),
2338 const_iv (GL_ZERO), 2975 const_iv (GL_ZERO),
2339 const_iv (GL_SRC_ALPHA), 2976 const_iv (GL_SRC_ALPHA),
2340 const_iv (GL_DST_ALPHA), 2977 const_iv (GL_DST_ALPHA),
2341 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2978 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2342 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),
2343 const_iv (GL_SRC_ALPHA_SATURATE), 2984 const_iv (GL_SRC_ALPHA_SATURATE),
2344 const_iv (GL_RGB), 2985 const_iv (GL_RGB),
2345 const_iv (GL_RGBA), 2986 const_iv (GL_RGBA),
2346 const_iv (GL_RGBA4), 2987 const_iv (GL_RGBA4),
2347 const_iv (GL_RGBA8), 2988 const_iv (GL_RGBA8),
2353 const_iv (GL_INTENSITY), 2994 const_iv (GL_INTENSITY),
2354 const_iv (GL_LUMINANCE), 2995 const_iv (GL_LUMINANCE),
2355 const_iv (GL_LUMINANCE_ALPHA), 2996 const_iv (GL_LUMINANCE_ALPHA),
2356 const_iv (GL_FLOAT), 2997 const_iv (GL_FLOAT),
2357 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),
2358 const_iv (GL_COMPILE), 3005 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D), 3006 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D), 3007 const_iv (GL_PROXY_TEXTURE_2D),
2361 const_iv (GL_TEXTURE_1D), 3008 const_iv (GL_TEXTURE_1D),
2362 const_iv (GL_TEXTURE_2D), 3009 const_iv (GL_TEXTURE_2D),
2401 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 3048 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2402 const_iv (GL_POINT_SMOOTH_HINT), 3049 const_iv (GL_POINT_SMOOTH_HINT),
2403 const_iv (GL_LINE_SMOOTH_HINT), 3050 const_iv (GL_LINE_SMOOTH_HINT),
2404 const_iv (GL_POLYGON_SMOOTH_HINT), 3051 const_iv (GL_POLYGON_SMOOTH_HINT),
2405 const_iv (GL_GENERATE_MIPMAP_HINT), 3052 const_iv (GL_GENERATE_MIPMAP_HINT),
3053 const_iv (GL_TEXTURE_COMPRESSION_HINT),
2406 const_iv (GL_FASTEST), 3054 const_iv (GL_FASTEST),
2407 const_iv (GL_DONT_CARE), 3055 const_iv (GL_DONT_CARE),
2408 const_iv (GL_NICEST), 3056 const_iv (GL_NICEST),
2409 const_iv (GL_V2F), 3057 const_iv (GL_V2F),
2410 const_iv (GL_V3F), 3058 const_iv (GL_V3F),
2411 const_iv (GL_T2F_V3F), 3059 const_iv (GL_T2F_V3F),
2412 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),
2413# undef const_iv 3064# undef const_iv
2414 }; 3065 };
2415 3066
2416 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; )
2417 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2418 3069
2419 texture_av = newAV (); 3070 texture_av = newAV ();
2420 AvREAL_off (texture_av); 3071 AvREAL_off (texture_av);
2421} 3072}
2422 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
2423char * 3083char *
2424gl_vendor () 3084gl_vendor ()
2425 CODE: 3085 CODE:
2426 RETVAL = (char *)glGetString (GL_VENDOR); 3086 RETVAL = (char *)glGetString (GL_VENDOR);
2427 OUTPUT: 3087 OUTPUT:
2476 3136
2477void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3137void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2478 CODE: 3138 CODE:
2479 gl_BlendFuncSeparate (sa, da, saa, daa); 3139 gl_BlendFuncSeparate (sa, da, saa, daa);
2480 3140
3141# void glBlendEquation (int se)
3142
2481void glDepthMask (int flag) 3143void glDepthMask (int flag)
2482 3144
2483void glLogicOp (int opcode) 3145void glLogicOp (int opcode)
2484 3146
2485void glColorMask (int red, int green, int blue, int alpha) 3147void glColorMask (int red, int green, int blue, int alpha)
2519void glRotate (float angle, float x, float y, float z) 3181void glRotate (float angle, float x, float y, float z)
2520 CODE: 3182 CODE:
2521 glRotatef (angle, x, y, z); 3183 glRotatef (angle, x, y, z);
2522 3184
2523void 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: @
2524 ALIAS: 3187 ALIAS:
2525 glColor_premultiply = 1 3188 glColor_premultiply = 1
2526 CODE: 3189 CODE:
2527 if (ix) 3190 if (ix)
2528 { 3191 {
2544 3207
2545void glTexCoord (float s, float t) 3208void glTexCoord (float s, float t)
2546 CODE: 3209 CODE:
2547 glTexCoord2f (s, t); 3210 glTexCoord2f (s, t);
2548 3211
3212void glRect (float x1, float y1, float x2, float y2)
3213 CODE:
3214 glRectf (x1, y1, x2, y2);
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
2549PROTOTYPES: ENABLE 3225PROTOTYPES: ENABLE
2550 3226
2551void glBegin (int mode) 3227void glBegin (int mode)
2552 3228
2553void glEnd () 3229void glEnd ()
2585void 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)
2586 CODE: 3262 CODE:
2587 if (gl.SeparableFilter2D) 3263 if (gl.SeparableFilter2D)
2588 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3264 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2589 3265
2590void 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)
2591 3267
2592void 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)
2593 3269
2594void glDrawPixels (int width, int height, int format, int type, char *pixels) 3270void glDrawPixels (int width, int height, int format, int type, char *pixels)
2595 3271
2621 3297
2622void glEndList () 3298void glEndList ()
2623 3299
2624void glCallList (int list) 3300void glCallList (int list)
2625 3301
2626MODULE = CFPlus PACKAGE = CFPlus::UI::Base 3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2627 3303
2628PROTOTYPES: DISABLE 3304PROTOTYPES: DISABLE
2629 3305
2630void 3306void
2631find_widget (SV *widget, NV x, NV y) 3307find_widget (SV *self, NV x, NV y)
2632 PPCODE: 3308 PPCODE:
2633{ 3309{
2634 if (within_widget (widget, x, y)) 3310 if (within_widget (self, x, y))
2635 XPUSHs (widget); 3311 XPUSHs (self);
2636} 3312}
2637 3313
3314BOOT:
3315{
3316 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3317
3318 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3319 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3320 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3321 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3322}
3323
3324void
3325draw (SV *self)
3326 CODE:
3327{
3328 HV *hv;
3329 SV **svp;
3330 NV x, y, w, h;
3331 SV *draw_x_sv = GvSV (draw_x_gv);
3332 SV *draw_y_sv = GvSV (draw_y_gv);
3333 SV *draw_w_sv = GvSV (draw_w_gv);
3334 SV *draw_h_sv = GvSV (draw_h_gv);
3335 double draw_x, draw_y;
3336
3337 if (!SvROK (self))
3338 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3339
3340 hv = (HV *)SvRV (self);
3341
3342 if (SvTYPE (hv) != SVt_PVHV)
3343 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3344
3345 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3346 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3347
3348 if (!h || !w)
3349 XSRETURN_EMPTY;
3350
3351 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3352 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3353
3354 draw_x = SvNV (draw_x_sv) + x;
3355 draw_y = SvNV (draw_y_sv) + y;
3356
3357 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3358 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3359 XSRETURN_EMPTY;
3360
3361 sv_setnv (draw_x_sv, draw_x);
3362 sv_setnv (draw_y_sv, draw_y);
3363
3364 glPushMatrix ();
3365 glTranslated (x, y, 0);
3366
3367 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3368 {
3369 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3370
3371 if (svp && SvTRUE (*svp))
3372 {
3373 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3374 glEnable (GL_BLEND);
3375 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3376 glBegin (GL_QUADS);
3377 glVertex2f (0, 0);
3378 glVertex2f (w, 0);
3379 glVertex2f (w, h);
3380 glVertex2f (0, h);
3381 glEnd ();
3382 glDisable (GL_BLEND);
3383 }
3384 }
3385#if 0
3386 // draw borders, for debugging
3387 glPushMatrix ();
3388 glColor4f (1., 1., 0., 1.);
3389 glTranslatef (.5, .5, 0.);
3390 glBegin (GL_LINE_LOOP);
3391 glVertex2f (0 , 0);
3392 glVertex2f (w - 1, 0);
3393 glVertex2f (w - 1, h - 1);
3394 glVertex2f (0 , h - 1);
3395 glEnd ();
3396 glPopMatrix ();
3397#endif
3398 PUSHMARK (SP);
3399 XPUSHs (self);
3400 PUTBACK;
3401 call_method ("_draw", G_VOID | G_DISCARD);
3402 SPAGAIN;
3403
3404 glPopMatrix ();
3405
3406 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3407 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3408}
3409

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines