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.202 by root, Tue Jul 17 18:34:24 2007 UTC vs.
Revision 1.290 by root, Wed Nov 4 14:40:51 2009 UTC

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

Diff Legend

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