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.135 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
30#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
31
22#include <SDL.h> 32#include <SDL.h>
33#include <SDL_thread.h>
23#include <SDL_endian.h> 34#include <SDL_endian.h>
24#include <SDL_image.h> 35#include <SDL_image.h>
25#include <SDL_mixer.h> 36#include <SDL_mixer.h>
26#include <SDL_opengl.h> 37#include <SDL_opengl.h>
27 38
36# include <sys/types.h> 47# include <sys/types.h>
37# include <sys/socket.h> 48# include <sys/socket.h>
38# include <netinet/in.h> 49# include <netinet/in.h>
39# include <netinet/tcp.h> 50# include <netinet/tcp.h>
40# include <inttypes.h> 51# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 52#endif
49 53
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 55
52#define FOW_DARKNESS 32 56#define FOW_DARKNESS 32
53 57
54#define MAP_EXTEND_X 32 58#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 59#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 64# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 65#else
62# define PARACHUTE 0 66# define PARACHUTE 0
63#endif 67#endif
64 68
69static AV *texture_av;
70
65static struct 71static struct
66{ 72{
67#define GL_FUNC(ptr,name) ptr name; 73#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 74#include "glfunc.h"
69#undef GL_FUNC 75#undef GL_FUNC
70} gl; 76} gl;
71 77
78static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 79gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 80{
74 if (gl.BlendFuncSeparate) 81 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 82 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 83 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 84 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 85 else
79 glBlendFunc (sa, da); 86 glBlendFunc (sa, da);
80} 87}
81 88
89static GLuint
90gen_texture ()
91{
92 GLuint name;
93
94 if (AvFILL (texture_av) >= 0)
95 name = (GLuint)(size_t)av_pop (texture_av);
96 else
97 glGenTextures (1, &name);
98
99 return name;
100}
101
102static void
103del_texture (GLuint name)
104{
105 /* make a half-assed attempt at returning the memory used by the texture */
106 /* textures are frequently being reused by cfplus anyway */
107 /*glBindTexture (GL_TEXTURE_2D, name);*/
108 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
109 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name);
111}
112
82#include "texcache.c" 113#include "texcache.c"
83 114
84#include "pango-font.c" 115#include "pango-font.c"
85#include "pango-fontmap.c" 116#include "pango-fontmap.c"
86#include "pango-render.c" 117#include "pango-render.c"
87 118
119typedef IV CFPlus__Channel;
120typedef SDL_RWops *CFPlus__RW;
88typedef Mix_Chunk *CFPlus__MixChunk; 121typedef Mix_Chunk *CFPlus__MixChunk;
89typedef Mix_Music *CFPlus__MixMusic; 122typedef Mix_Music *CFPlus__MixMusic;
90 123
91typedef PangoFontDescription *CFPlus__Font; 124typedef PangoFontDescription *CFPlus__Font;
92 125
144} 177}
145 178
146static void 179static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 181{
182 PangoRectangle rect;
183
184 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 185 pango_layout_get_extents (self->pl, 0, &rect);
150 186
151 if (!*w) *w = 1; 187 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 188 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 189
154 *w = (*w + 3) & ~3; 190 if (!rect.width) rect.width = 1;
155} 191 if (!rect.height) rect.height = 1;
156 192
193 *w = rect.width;
194 *h = rect.height;
195}
196
197typedef uint16_t tileid;
157typedef uint16_t mapface; 198typedef uint16_t faceid;
158 199
159typedef struct { 200typedef struct {
160 GLint name; 201 int name;
161 int w, h; 202 int w, h;
162 float s, t; 203 float s, t;
163 uint8_t r, g, b, a; 204 uint8_t r, g, b, a;
205 tileid smoothtile;
206 uint8_t smoothlevel;
164} maptex; 207} maptex;
165 208
166typedef struct { 209typedef struct {
210 uint32_t player;
211 tileid tile[3];
167 int16_t darkness; 212 uint16_t darkness;
168 mapface face[3]; 213 uint8_t stat_width, stat_hp, flags, smoothmax;
169} mapcell; 214} mapcell;
170 215
171typedef struct { 216typedef struct {
172 int32_t c0, c1; 217 int32_t c0, c1;
173 mapcell *col; 218 mapcell *col;
174} maprow; 219} maprow;
175 220
176typedef struct map { 221typedef struct map {
177 int x, y, w, h; 222 int x, y, w, h;
178 int ox, oy; /* offset to virtual global coordinate system */ 223 int ox, oy; /* offset to virtual global coordinate system */
179 int faces; 224 int faces; tileid *face2tile; // [faceid]
180 mapface *face; 225 int texs; maptex *tex; // [tileid]
181
182 int texs;
183 maptex *tex;
184 226
185 int32_t rows; 227 int32_t rows;
186 maprow *row; 228 maprow *row;
187} *CFPlus__Map; 229} *CFPlus__Map;
188 230
208 return ptr; 250 return ptr;
209} 251}
210 252
211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 253#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 254#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
255
256static void
257need_facenum (struct map *self, faceid face)
258{
259 while (self->faces <= face)
260 {
261 Append (tileid, self->face2tile, self->faces, self->faces);
262 self->faces *= 2;
263 }
264}
265
266static void
267need_texid (struct map *self, int texid)
268{
269 while (self->texs <= texid)
270 {
271 Append (maptex, self->tex, self->texs, self->texs);
272 self->texs *= 2;
273 }
274}
213 275
214static maprow * 276static maprow *
215map_get_row (CFPlus__Map self, int y) 277map_get_row (CFPlus__Map self, int y)
216{ 278{
217 if (0 > y) 279 if (0 > y)
286static void 348static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 349map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 350{
289 int x, y; 351 int x, y;
290 maprow *row; 352 maprow *row;
353 mapcell *cell;
291 354
292 for (y = y0; y < y0 + h; y++) 355 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 356 if (y >= 0)
294 { 357 {
295 if (y >= self->rows) 358 if (y >= self->rows)
301 if (x >= row->c0) 364 if (x >= row->c0)
302 { 365 {
303 if (x >= row->c1) 366 if (x >= row->c1)
304 break; 367 break;
305 368
306 row->col[x - row->c0].darkness = -1; 369 cell = row->col + x - row->c0;
370
371 cell->darkness = 0;
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
307 } 375 }
308 } 376 }
377}
378
379typedef struct {
380 tileid tile;
381 uint8_t x, y, level;
382} smooth_key;
383
384static void
385smooth_or_bits (HV *hv, smooth_key *key, IV bits)
386{
387 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
388
389 if (SvIOK (*sv))
390 SvIV_set (*sv, SvIVX (*sv) | bits);
391 else
392 sv_setiv (*sv, bits);
309} 393}
310 394
311static void 395static void
312music_finished (void) 396music_finished (void)
313{ 397{
347 n |= n >> 4; 431 n |= n >> 4;
348 n |= n >> 8; 432 n |= n >> 8;
349 n |= n >> 16; 433 n |= n >> 16;
350 434
351 return n + 1; 435 return n + 1;
436}
437
438/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314
441
442/******************************************************************************/
443
444static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
445static GV *hover_gv;
446
447static int
448within_widget (SV *widget, NV x, NV y)
449{
450 HV *self;
451 SV **svp;
452 NV wx, ww, wy, wh;
453
454 if (!SvROK (widget))
455 return 0;
456
457 self = (HV *)SvRV (widget);
458
459 if (SvTYPE (self) != SVt_PVHV)
460 return 0;
461
462 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
463 if (y < wy)
464 return 0;
465
466 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
467 if (y >= wy + wh)
468 return 0;
469
470 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
471 if (x < wx)
472 return 0;
473
474 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
475 if (x >= wx + ww)
476 return 0;
477
478 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
479 if (!svp || !SvTRUE (*svp))
480 return 0;
481
482 return 1;
352} 483}
353 484
354MODULE = CFPlus PACKAGE = CFPlus 485MODULE = CFPlus PACKAGE = CFPlus
355 486
356PROTOTYPES: ENABLE 487PROTOTYPES: ENABLE
361 static const struct { 492 static const struct {
362 const char *name; 493 const char *name;
363 IV iv; 494 IV iv;
364 } *civ, const_iv[] = { 495 } *civ, const_iv[] = {
365# define const_iv(name) { # name, (IV)name } 496# define const_iv(name) { # name, (IV)name }
497 const_iv (SDLK_MODIFIER_MIN),
498 const_iv (SDLK_MODIFIER_MAX),
499
366 const_iv (SDL_ACTIVEEVENT), 500 const_iv (SDL_ACTIVEEVENT),
367 const_iv (SDL_KEYDOWN), 501 const_iv (SDL_KEYDOWN),
368 const_iv (SDL_KEYUP), 502 const_iv (SDL_KEYUP),
369 const_iv (SDL_MOUSEMOTION), 503 const_iv (SDL_MOUSEMOTION),
370 const_iv (SDL_MOUSEBUTTONDOWN), 504 const_iv (SDL_MOUSEBUTTONDOWN),
379 const_iv (SDL_EVENT_RESERVEDA), 513 const_iv (SDL_EVENT_RESERVEDA),
380 const_iv (SDL_EVENT_RESERVEDB), 514 const_iv (SDL_EVENT_RESERVEDB),
381 const_iv (SDL_VIDEORESIZE), 515 const_iv (SDL_VIDEORESIZE),
382 const_iv (SDL_VIDEOEXPOSE), 516 const_iv (SDL_VIDEOEXPOSE),
383 const_iv (SDL_USEREVENT), 517 const_iv (SDL_USEREVENT),
518
519 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE),
522
384 const_iv (SDLK_KP0), 523 const_iv (SDLK_KP0),
385 const_iv (SDLK_KP1), 524 const_iv (SDLK_KP1),
386 const_iv (SDLK_KP2), 525 const_iv (SDLK_KP2),
387 const_iv (SDLK_KP3), 526 const_iv (SDLK_KP3),
388 const_iv (SDLK_KP4), 527 const_iv (SDLK_KP4),
443 const_iv (SDLK_BREAK), 582 const_iv (SDLK_BREAK),
444 const_iv (SDLK_MENU), 583 const_iv (SDLK_MENU),
445 const_iv (SDLK_POWER), 584 const_iv (SDLK_POWER),
446 const_iv (SDLK_EURO), 585 const_iv (SDLK_EURO),
447 const_iv (SDLK_UNDO), 586 const_iv (SDLK_UNDO),
587
448 const_iv (KMOD_NONE), 588 const_iv (KMOD_NONE),
589 const_iv (KMOD_SHIFT),
449 const_iv (KMOD_LSHIFT), 590 const_iv (KMOD_LSHIFT),
450 const_iv (KMOD_RSHIFT), 591 const_iv (KMOD_RSHIFT),
592 const_iv (KMOD_CTRL),
451 const_iv (KMOD_LCTRL), 593 const_iv (KMOD_LCTRL),
452 const_iv (KMOD_RCTRL), 594 const_iv (KMOD_RCTRL),
595 const_iv (KMOD_ALT),
453 const_iv (KMOD_LALT), 596 const_iv (KMOD_LALT),
454 const_iv (KMOD_RALT), 597 const_iv (KMOD_RALT),
598 const_iv (KMOD_META),
455 const_iv (KMOD_LMETA), 599 const_iv (KMOD_LMETA),
456 const_iv (KMOD_RMETA), 600 const_iv (KMOD_RMETA),
457 const_iv (KMOD_NUM), 601 const_iv (KMOD_NUM),
458 const_iv (KMOD_CAPS), 602 const_iv (KMOD_CAPS),
459 const_iv (KMOD_MODE), 603 const_iv (KMOD_MODE),
460 const_iv (KMOD_CTRL),
461 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_ALT),
463 const_iv (KMOD_META)
464# undef const_iv 604# undef const_iv
465 }; 605 };
466 606
467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
609
610 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
611 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469} 612}
613
614void
615weaken (SV *rv)
616 PROTOTYPE: $
617 CODE:
618 sv_rvweaken (rv);
470 619
471int 620int
472in_destruct () 621in_destruct ()
473 CODE: 622 CODE:
474 RETVAL = PL_main_cv == Nullcv; 623 RETVAL = PL_main_cv == Nullcv;
486 opengl_fontmap = pango_opengl_font_map_new (); 635 opengl_fontmap = pango_opengl_font_map_new ();
487 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
489} 638}
490 639
640char *
641SDL_GetError ()
642
491int 643int
492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
493 645
494void 646void
495SDL_Quit () 647SDL_Quit ()
496 648
497void 649void
498SDL_ListModes () 650SDL_ListModes (int rgb, int alpha)
499 PPCODE: 651 PPCODE:
500{ 652{
501 SDL_Rect **m; 653 SDL_Rect **m;
502 654
503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 655 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 656 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 657 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 658 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
507 659
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 660 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
510 662
511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 663 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515 667
516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10) 669#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif 672#endif
521 673
522 SDL_EnableUNICODE (1);
523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
524
525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
526 675
527 if (m && m != (SDL_Rect **)-1) 676 if (m && m != (SDL_Rect **)-1)
528 while (*m) 677 while (*m)
529 { 678 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
530 AV *av = newAV (); 681 AV *av = newAV ();
531 av_push (av, newSViv ((*m)->w)); 682 av_push (av, newSViv ((*m)->w));
532 av_push (av, newSViv ((*m)->h)); 683 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb));
685 av_push (av, newSViv (alpha));
533 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
534 688
535 ++m; 689 ++m;
536 } 690 }
537} 691}
538 692
539char *
540SDL_GetError ()
541
542int 693int
543SDL_SetVideoMode (int w, int h, int fullscreen) 694SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
544 CODE: 695 CODE:
696{
697 SDL_EnableUNICODE (1);
698 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
699
700 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
701 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
702 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
703 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
704
545 RETVAL = !!SDL_SetVideoMode ( 705 RETVAL = !!SDL_SetVideoMode (
546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 706 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
547 ); 707 );
708
548 if (RETVAL) 709 if (RETVAL)
549 { 710 {
711 av_clear (texture_av);
712
550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h" 715#include "glfunc.h"
553# undef GL_FUNC 716#undef GL_FUNC
554 } 717 }
718}
555 OUTPUT: 719 OUTPUT:
556 RETVAL 720 RETVAL
557 721
558void 722void
559SDL_GL_SwapBuffers () 723SDL_GL_SwapBuffers ()
560 724
561char * 725char *
562SDL_GetKeyName (int sym) 726SDL_GetKeyName (int sym)
563 727
728int
729SDL_GetAppState ()
730
564void 731void
565SDL_PollEvent () 732poll_events ()
566 PPCODE: 733 PPCODE:
567{ 734{
568 SDL_Event ev; 735 SDL_Event ev;
569 736
570 while (SDL_PollEvent (&ev)) 737 SDL_PumpEvents ();
738 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
571 { 739 {
572 HV *hv = newHV (); 740 HV *hv = newHV ();
573 hv_store (hv, "type", 4, newSViv (ev.type), 0); 741 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574 742
575 switch (ev.type) 743 switch (ev.type)
577 case SDL_KEYDOWN: 745 case SDL_KEYDOWN:
578 case SDL_KEYUP: 746 case SDL_KEYUP:
579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
580 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
581 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
582 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
583 break; 752 break;
584 753
585 case SDL_ACTIVEEVENT: 754 case SDL_ACTIVEEVENT:
586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 756 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
588 break; 757 break;
589 758
590 case SDL_MOUSEMOTION: 759 case SDL_MOUSEMOTION:
760 {
761 int state = ev.motion.state;
762 int x = ev.motion.x;
763 int y = ev.motion.y;
764 int xrel = ev.motion.xrel;
765 int yrel = ev.motion.yrel;
766
767 /* do simplistic event compression */
768 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
769 && state == ev.motion.state)
770 {
771 xrel += ev.motion.xrel;
772 yrel += ev.motion.yrel;
773 x = ev.motion.x;
774 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 }
777
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 779 hv_store (hv, "state", 5, newSViv (state), 0);
594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 780 hv_store (hv, "x", 1, newSViv (x), 0);
595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 781 hv_store (hv, "y", 1, newSViv (y), 0);
596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 782 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 783 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 }
598 break; 785 break;
599 786
600 case SDL_MOUSEBUTTONDOWN: 787 case SDL_MOUSEBUTTONDOWN:
601 case SDL_MOUSEBUTTONUP: 788 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
618 } 805 }
619} 806}
620 807
621int 808int
622Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
623 POSTCALL: 810 POSTCALL:
624 Mix_HookMusicFinished (music_finished); 811 Mix_HookMusicFinished (music_finished);
625 Mix_ChannelFinished (channel_finished); 812 Mix_ChannelFinished (channel_finished);
626 813
627void 814void
631Mix_AllocateChannels (int numchans = -1) 818Mix_AllocateChannels (int numchans = -1)
632 819
633void 820void
634lowdelay (int fd, int val = 1) 821lowdelay (int fd, int val = 1)
635 CODE: 822 CODE:
823 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
824
825void
826win32_proxy_info ()
827 PPCODE:
828{
636#ifndef _WIN32 829#ifdef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 830 char buffer[2048];
831 DWORD buflen;
832
833 EXTEND (SP, 3);
834
835 buflen = sizeof (buffer);
836 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
837 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
838 {
839 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
840
841 buflen = sizeof (buffer);
842 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
843 {
844 PUSHs (newSVpv (buffer, 0));
845
846 buflen = sizeof (buffer);
847 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
848 PUSHs (newSVpv (buffer, 0));
849 }
850 }
638#endif 851#endif
852}
639 853
640void 854void
641add_font (char *file) 855add_font (char *file)
642 CODE: 856 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 857 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
651 STRLEN image_len; 865 STRLEN image_len;
652 char *image = (char *)SvPVbyte (image_, image_len); 866 char *image = (char *)SvPVbyte (image_, image_len);
653 SDL_Surface *surface, *surface2; 867 SDL_Surface *surface, *surface2;
654 SDL_PixelFormat fmt; 868 SDL_PixelFormat fmt;
655 SDL_RWops *rw = ix 869 SDL_RWops *rw = ix
656 ? SDL_RWFromFile (image, "r") 870 ? SDL_RWFromFile (image, "rb")
657 : SDL_RWFromConstMem (image, image_len); 871 : SDL_RWFromConstMem (image, image_len);
658 872
659 if (!rw) 873 if (!rw)
660 croak ("load_image: %s", SDL_GetError ()); 874 croak ("load_image: %s", SDL_GetError ());
661 875
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 961 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 962#endif
749 _exit (1); 963 _exit (1);
750 964
751void 965void
752_exit (int retval) 966_exit (int retval = 0)
753 CODE: 967 CODE:
968#ifdef WIN32
969 ExitThread (retval); // unclean, please beam me up
970#else
754 _exit (retval); 971 _exit (retval);
972#endif
973
974void
975debug ()
976 CODE:
977{
978#if DEBUG
979 VALGRIND_DO_LEAK_CHECK;
980#endif
981}
755 982
756MODULE = CFPlus PACKAGE = CFPlus::Font 983MODULE = CFPlus PACKAGE = CFPlus::Font
984
985PROTOTYPES: DISABLE
757 986
758CFPlus::Font 987CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 988new_from_file (SV *class, char *path, int id = 0)
760 CODE: 989 CODE:
761{ 990{
772 CODE: 1001 CODE:
773 pango_font_description_free (self); 1002 pango_font_description_free (self);
774 1003
775void 1004void
776make_default (CFPlus::Font self) 1005make_default (CFPlus::Font self)
1006 PROTOTYPE: $
777 CODE: 1007 CODE:
778 default_font = self; 1008 default_font = self;
779 1009
780MODULE = CFPlus PACKAGE = CFPlus::Layout 1010MODULE = CFPlus PACKAGE = CFPlus::Layout
781 1011
1012PROTOTYPES: DISABLE
1013
782void 1014void
783reset_glyph_cache () 1015reset_glyph_cache ()
1016 PROTOTYPE:
784 CODE: 1017 CODE:
785 tc_clear (); 1018 tc_clear ();
786 1019
787CFPlus::Layout 1020CFPlus::Layout
788new (SV *class) 1021new (SV *class)
1006xy_to_index (CFPlus::Layout self, int x, int y) 1239xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1240 CODE:
1008{ 1241{
1009 int index, trailing; 1242 int index, trailing;
1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1243 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1011 RETVAL = index; 1244 RETVAL = index + trailing;
1012} 1245}
1013 OUTPUT: 1246 OUTPUT:
1014 RETVAL 1247 RETVAL
1015 1248
1016void 1249void
1022 1255
1023 EXTEND (SP, 3); 1256 EXTEND (SP, 3);
1024 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1257 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1258 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1259 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1260}
1261
1262void
1263index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1264 PPCODE:
1265{
1266 int line, x;
1267
1268 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1269 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270
1271 EXTEND (SP, 2);
1272 PUSHs (sv_2mortal (newSViv (line - 1)));
1273 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274}
1275
1276void
1277line_x_to_index (CFPlus::Layout self, int line, int x)
1278 PPCODE:
1279{
1280 PangoLayoutLine *lp;
1281 int index, trailing;
1282
1283 if (line < 0)
1284 XSRETURN_EMPTY;
1285
1286 if (!(lp = pango_layout_get_line (self->pl, line)))
1287 XSRETURN_EMPTY; /* do better */
1288
1289 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290
1291 EXTEND (SP, 2);
1292 if (GIMME_V == G_SCALAR)
1293 PUSHs (sv_2mortal (newSViv (index + trailing)));
1294 else
1295 {
1296 PUSHs (sv_2mortal (newSViv (index)));
1297 PUSHs (sv_2mortal (newSViv (trailing)));
1298 }
1027} 1299}
1028 1300
1029void 1301void
1030render (CFPlus::Layout self, float x, float y, int flags = 0) 1302render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1303 PPCODE:
1036 flags 1308 flags
1037 ); 1309 );
1038 1310
1039MODULE = CFPlus PACKAGE = CFPlus::Texture 1311MODULE = CFPlus PACKAGE = CFPlus::Texture
1040 1312
1041void 1313PROTOTYPES: ENABLE
1042pad2pot (SV *data_, SV *w_, SV *h_)
1043 CODE:
1044{
1045 int ow = SvIV (w_);
1046 int oh = SvIV (h_);
1047 1314
1048 if (ow && oh) 1315int minpot (int n)
1316
1317void
1318pad (SV *data_, int ow, int oh, int nw, int nh)
1319 CODE:
1320{
1321 if ((nw != ow || nh != oh) && SvOK (data_))
1049 { 1322 {
1050 int nw = minpot (ow);
1051 int nh = minpot (oh);
1052
1053 if (nw != ow || nh != oh)
1054 {
1055 if (SvOK (data_))
1056 {
1057 STRLEN datalen; 1323 STRLEN datalen;
1058 char *data = SvPVbyte (data_, datalen); 1324 char *data = SvPVbyte (data_, datalen);
1059 int bpp = datalen / (ow * oh); 1325 int bpp = datalen / (ow * oh);
1060 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1326 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1061 1327
1062 SvPOK_only (result_); 1328 SvPOK_only (result_);
1063 SvCUR_set (result_, nw * nh * bpp); 1329 SvCUR_set (result_, nw * nh * bpp);
1064 1330
1065 memset (SvPVX (result_), 0, nw * nh * bpp); 1331 memset (SvPVX (result_), 0, nw * nh * bpp);
1066 while (oh--) 1332 while (oh--)
1067 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1333 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1068 1334
1069 sv_setsv (data_, result_); 1335 sv_setsv (data_, result_);
1070 }
1071
1072 sv_setiv (w_, nw);
1073 sv_setiv (h_, nh);
1074 }
1075 } 1336 }
1076} 1337}
1077 1338
1078void 1339void
1079draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1340draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1122 glDisable (GL_ALPHA_TEST); 1383 glDisable (GL_ALPHA_TEST);
1123 glDisable (GL_BLEND); 1384 glDisable (GL_BLEND);
1124 } 1385 }
1125} 1386}
1126 1387
1388IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1389 CODE:
1390{
1391 GLint width;
1392 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1393 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1394 RETVAL = width > 0;
1395}
1396 OUTPUT:
1397 RETVAL
1398
1127MODULE = CFPlus PACKAGE = CFPlus::Map 1399MODULE = CFPlus PACKAGE = CFPlus::Map
1128 1400
1401PROTOTYPES: DISABLE
1402
1129CFPlus::Map 1403CFPlus::Map
1130new (SV *class, int map_width, int map_height) 1404new (SV *class)
1131 CODE: 1405 CODE:
1132 New (0, RETVAL, 1, struct map); 1406 New (0, RETVAL, 1, struct map);
1133 RETVAL->x = 0; 1407 RETVAL->x = 0;
1134 RETVAL->y = 0; 1408 RETVAL->y = 0;
1135 RETVAL->w = map_width; 1409 RETVAL->w = 0;
1136 RETVAL->h = map_height; 1410 RETVAL->h = 0;
1137 RETVAL->ox = 0; 1411 RETVAL->ox = 0;
1138 RETVAL->oy = 0; 1412 RETVAL->oy = 0;
1139 RETVAL->faces = 8192; 1413 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1140 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1414 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1141 RETVAL->texs = 8192;
1142 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1143 RETVAL->rows = 0; 1415 RETVAL->rows = 0;
1144 RETVAL->row = 0; 1416 RETVAL->row = 0;
1145 OUTPUT: 1417 OUTPUT:
1146 RETVAL 1418 RETVAL
1147 1419
1148void 1420void
1149DESTROY (CFPlus::Map self) 1421DESTROY (CFPlus::Map self)
1150 CODE: 1422 CODE:
1151{ 1423{
1152 map_clear (self); 1424 map_clear (self);
1153 Safefree (self->face); 1425 Safefree (self->face2tile);
1154 Safefree (self->tex); 1426 Safefree (self->tex);
1155 Safefree (self); 1427 Safefree (self);
1156} 1428}
1157 1429
1158void 1430void
1431resize (CFPlus::Map self, int map_width, int map_height)
1432 CODE:
1433 self->w = map_width;
1434 self->h = map_height;
1435
1436void
1159clear (CFPlus::Map self) 1437clear (CFPlus::Map self)
1160 CODE: 1438 CODE:
1161 map_clear (self); 1439 map_clear (self);
1162 1440
1163void 1441void
1164set_face (CFPlus::Map self, int face, int texid) 1442set_tileid (CFPlus::Map self, int face, int tile)
1165 CODE: 1443 CODE:
1166{ 1444{
1167 while (self->faces <= face) 1445 need_facenum (self, face); self->face2tile [face] = tile;
1168 { 1446 need_texid (self, tile);
1169 Append (mapface, self->face, self->faces, self->faces); 1447}
1170 self->faces *= 2;
1171 }
1172 1448
1173 self->face [face] = texid; 1449void
1450set_smooth (CFPlus::Map self, int face, int smooth, int level)
1451 CODE:
1452{
1453 tileid texid;
1454 maptex *tex;
1455
1456 if (face < 0 || face >= self->faces)
1457 return;
1458
1459 if (smooth < 0 || smooth >= self->faces)
1460 return;
1461
1462 texid = self->face2tile [face];
1463
1464 if (!texid)
1465 return;
1466
1467 tex = self->tex + texid;
1468 tex->smoothtile = self->face2tile [smooth];
1469 tex->smoothlevel = level;
1174} 1470}
1175 1471
1176void 1472void
1177set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1473set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1178 CODE: 1474 CODE:
1179{ 1475{
1180 while (self->texs <= texid) 1476 need_texid (self, texid);
1181 {
1182 Append (maptex, self->tex, self->texs, self->texs);
1183 self->texs *= 2;
1184 }
1185 1477
1186 { 1478 {
1187 maptex *tex = self->tex + texid; 1479 maptex *tex = self->tex + texid;
1188 1480
1189 tex->name = name; 1481 tex->name = name;
1231void 1523void
1232scroll (CFPlus::Map self, int dx, int dy) 1524scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1525 CODE:
1234{ 1526{
1235 if (dx > 0) 1527 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1528 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1529 else if (dx < 0)
1238 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1530 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1239 1531
1240 if (dy > 0) 1532 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1533 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1534 else if (dy < 0)
1243 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1535 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1244 1536
1245 self->ox += dx; self->x += dx; 1537 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1538 self->oy += dy; self->y += dy;
1247 1539
1248 while (self->y < 0) 1540 while (self->y < 0)
1253 self->y += MAP_EXTEND_Y; 1545 self->y += MAP_EXTEND_Y;
1254 } 1546 }
1255} 1547}
1256 1548
1257void 1549void
1258map1a_update (CFPlus::Map self, SV *data_) 1550map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1551 CODE:
1260{ 1552{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1553 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1554 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1555 mapcell *cell;
1264 int x, y, flags; 1556 int x, y, flags;
1265 1557
1266 while (data < data_end) 1558 while (data < data_end - 1)
1267 { 1559 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1560 flags = (data [0] << 8) + data [1]; data += 2;
1269 1561
1270 x = self->x + ((flags >> 10) & 63); 1562 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1563 y = self->y + ((flags >> 4) & 63);
1272 1564
1273 cell = map_get_cell (self, x, y); 1565 cell = map_get_cell (self, x, y);
1274 1566
1275 if (flags & 15) 1567 if (flags & 15)
1276 { 1568 {
1277 if (cell->darkness < 0) 1569 if (!cell->darkness)
1278 { 1570 {
1571 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1572 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1573 }
1284 1574
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1575 //TODO: don't trust server data to be in-range(!)
1576
1577 if (flags & 8)
1578 {
1579 if (extmap)
1580 {
1581 uint8_t ext, cmd;
1582
1583 do
1584 {
1585 ext = *data++;
1586 cmd = ext & 0x3f;
1587
1588 if (cmd < 4)
1589 cell->darkness = 255 - ext * 64 + 1;
1590 else if (cmd == 5) // health
1591 {
1592 cell->stat_width = 1;
1593 cell->stat_hp = *data++;
1594 }
1595 else if (cmd == 6) // monster width
1596 cell->stat_width = *data++ + 1;
1597 else if (cmd == 0x47)
1598 {
1599 if (*data == 4)
1600 ; // decode player count
1601
1602 data += *data + 1;
1603 }
1604 else if (cmd == 8) // cell flags
1605 cell->flags = *data++;
1606 else if (ext & 0x40) // unknown, multibyte => skip
1607 data += *data + 1;
1608 else
1609 data++;
1610 }
1611 while (ext & 0x80);
1612 }
1613 else
1614 cell->darkness = *data++ + 1;
1615 }
1288 1616
1289 if (flags & 4) 1617 if (flags & 4)
1290 { 1618 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [0] = self->face2tile [face];
1292 } 1622 }
1293 1623
1294 if (flags & 2) 1624 if (flags & 2)
1295 { 1625 {
1296 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [1] = self->face2tile [face];
1297 } 1629 }
1298 1630
1299 if (flags & 1) 1631 if (flags & 1)
1300 { 1632 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1633 faceid face = (data [0] << 8) + data [1]; data += 2;
1634 need_facenum (self, face);
1635 cell->tile [2] = self->face2tile [face];
1302 } 1636 }
1303 } 1637 }
1304 else 1638 else
1305 cell->darkness = -1; 1639 cell->darkness = 0;
1306 } 1640 }
1307} 1641}
1308 1642
1309SV * 1643SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1644mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1336 { 1670 {
1337 mapcell *cell = row->col + (x - row->c0); 1671 mapcell *cell = row->col + (x - row->c0);
1338 1672
1339 for (z = 0; z <= 0; z++) 1673 for (z = 0; z <= 0; z++)
1340 { 1674 {
1341 mapface face = cell->face [z];
1342
1343 if (face)
1344 {
1345 maptex tex = self->tex [face]; 1675 maptex tex = self->tex [cell->tile [z]];
1346 int a0 = 255 - tex.a; 1676 int a0 = 255 - tex.a;
1347 int a1 = tex.a; 1677 int a1 = tex.a;
1348 1678
1349 r = (r * a0 + tex.r * a1) / 255; 1679 r = (r * a0 + tex.r * a1) / 255;
1350 g = (g * a0 + tex.g * a1) / 255; 1680 g = (g * a0 + tex.g * a1) / 255;
1351 b = (b * a0 + tex.b * a1) / 255; 1681 b = (b * a0 + tex.b * a1) / 255;
1352 a = (a * a0 + tex.a * a1) / 255; 1682 a = (a * a0 + tex.a * a1) / 255;
1353 }
1354 } 1683 }
1355 } 1684 }
1356 1685
1357 *map++ = (r ) 1686 *map++ = (r )
1358 | (g << 8) 1687 | (g << 8)
1365} 1694}
1366 OUTPUT: 1695 OUTPUT:
1367 RETVAL 1696 RETVAL
1368 1697
1369void 1698void
1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1699draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1371 CODE: 1700 CODE:
1372{ 1701{
1373 int vx, vy; 1702 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1703 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1705 smooth_key skey;
1374 int x, y, z; 1706 int x, y, z;
1375 int last_name; 1707 int last_name;
1376 mapface face;
1377 1708
1378 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1709 // thats current max. sorry.
1379 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1710 if (sw > 255) sw = 255;
1711 if (sh > 255) sh = 255;
1380 1712
1381 /* 1713 // clear key, in case of extra padding
1382 int vx = self->vx = self->w >= sw 1714 memset (&skey, 0, sizeof (skey));
1383 ? self->x + (self->w - sw) / 2
1384 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1385
1386 int vy = self->vy = self->h >= sh
1387 ? self->y + (self->h - sh) / 2
1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1389 */
1390 1715
1391 glColor4ub (255, 255, 255, 255); 1716 glColor4ub (255, 255, 255, 255);
1392 1717
1393 glEnable (GL_BLEND); 1718 glEnable (GL_BLEND);
1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1719 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1397 1722
1398 glBegin (GL_QUADS); 1723 glBegin (GL_QUADS);
1399 1724
1400 last_name = 0; 1725 last_name = 0;
1401 1726
1727 mx += self->x;
1728 my += self->y;
1729
1730 // first pass: determine smooth_max
1731 // rather ugly, if you ask me
1732 // could also be stored inside mapcell and updated on change
1733 memset (smooth_max, 0, sizeof (smooth_max));
1734
1735 for (y = 0; y < sh; y++)
1736 if (0 <= y + my && y + my < self->rows)
1737 {
1738 maprow *row = self->row + (y + my);
1739
1740 for (x = 0; x < sw; x++)
1741 if (row->c0 <= x + mx && x + mx < row->c1)
1742 {
1743 mapcell *cell = row->col + (x + mx - row->c0);
1744
1745 smooth_max[x + 1][y + 1] =
1746 MAX (self->tex [cell->tile [0]].smoothlevel,
1747 MAX (self->tex [cell->tile [1]].smoothlevel,
1748 self->tex [cell->tile [2]].smoothlevel));
1749 }
1750 }
1751
1402 for (z = 0; z < 3; z++) 1752 for (z = 0; z <= 2; z++)
1753 {
1754 memset (smooth_level, 0, sizeof (smooth_level));
1755
1403 for (y = 0; y < sh; y++) 1756 for (y = 0; y < sh; y++)
1404 if (0 <= y + vy && y + vy < self->rows) 1757 if (0 <= y + my && y + my < self->rows)
1405 { 1758 {
1406 maprow *row = self->row + (y + vy); 1759 maprow *row = self->row + (y + my);
1407 1760
1408 for (x = 0; x < sw; x++) 1761 for (x = 0; x < sw; x++)
1409 if (row->c0 <= x + vx && x + vx < row->c1) 1762 if (row->c0 <= x + mx && x + mx < row->c1)
1410 { 1763 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1764 mapcell *cell = row->col + (x + mx - row->c0);
1412
1413 face = cell->face [z]; 1765 tileid tile = cell->tile [z];
1414 1766
1415 if (face) 1767 if (tile)
1768 {
1769 maptex tex = self->tex [tile];
1770 int px = (x + 1) * T - tex.w;
1771 int py = (y + 1) * T - tex.h;
1772
1773 // suppressing texture state switches here
1774 // is only moderately effective, but worth the extra effort
1775 if (last_name != tex.name)
1776 {
1777 if (!tex.name)
1778 tex = self->tex [2]; /* missing, replace by noface */
1779
1780 glEnd ();
1781 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1782 glBegin (GL_QUADS);
1783 }
1784
1785 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1786 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1787 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1788 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1789
1790 if (cell->flags && z == 2)
1791 {
1792 if (cell->flags & 1)
1793 {
1794 maptex tex = self->tex [1];
1795 int px = x * T + T * 2 / 32;
1796 int py = y * T - T * 6 / 32;
1797
1798 glEnd ();
1799 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1800 glBegin (GL_QUADS);
1801
1802 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806 }
1807 }
1808
1809 // update smooth hash
1810 if (tex.smoothtile)
1811 {
1812 skey.tile = tex.smoothtile;
1813 skey.level = tex.smoothlevel;
1814
1815 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1816
1817 // add bits to current tile and all neighbours. skey.x|y is
1818 // shifted +1|+1 so we always stay positive.
1819
1820 // bits is ___n cccc CCCC bbbb
1821 // n do not draw borders&corners
1822 // c draw these corners, but...
1823 // C ... not these
1824 // b draw these borders
1825
1826 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1827 // ┃· ·· ·┃ ━━
1828
1829 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1830 // ·· ·· ·┏ ┓·
1831
1832 // full tile
1833 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1834
1835 // borders
1836 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1837 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1838 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1839 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1840
1841 // corners
1842 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1843 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1844 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1845 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1846 }
1847 }
1848 }
1849 }
1850
1851 // go through all smoothlevels, lowest to highest, then draw.
1852 // this is basically counting sort
1853 {
1854 int w, b;
1855
1856 for (w = 0; w < 256 / 32; ++w)
1857 {
1858 uint32_t smask = smooth_level [w];
1859 if (smask)
1860 for (b = 0; b < 32; ++b)
1861 if (smask & (((uint32_t)1) << b))
1416 { 1862 {
1417 maptex tex = self->tex [face]; 1863 int level = (w << 5) | b;
1864 HE *he;
1418 1865
1419 int px = (x + 1) * 32 - tex.w; 1866 hv_iterinit (smooth);
1420 int py = (y + 1) * 32 - tex.h; 1867 while ((he = hv_iternext (smooth)))
1421
1422 if (last_name != tex.name)
1423 { 1868 {
1869 smooth_key *skey = (smooth_key *)HeKEY (he);
1870 IV bits = SvIVX (HeVAL (he));
1871
1872 if (!(bits & 0x1000)
1873 && skey->level == level
1874 && level > smooth_max [skey->x][skey->y])
1875 {
1876 maptex tex = self->tex [skey->tile];
1877 int px = (((int)skey->x) - 1) * T;
1878 int py = (((int)skey->y) - 1) * T;
1879 int border = bits & 15;
1880 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881 float dx = tex.s * .0625f; // 16 images/row
1882 float dy = tex.t * .5f ; // 2 images/column
1883
1884 // this time naively avoiding texture state changes
1885 // save gobs of state changes.
1886 if (last_name != tex.name)
1887 {
1888 if (!tex.name)
1889 continue; // smoothing not yet available
1890
1424 glEnd (); 1891 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1892 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1893 glBegin (GL_QUADS);
1894 }
1895
1896 if (border)
1897 {
1898 float ox = border * dx;
1899
1900 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1901 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1902 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1903 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1904 }
1905
1906 if (corner)
1907 {
1908 float ox = corner * dx;
1909
1910 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1911 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1912 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1913 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1914 }
1915 }
1428 } 1916 }
1429
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 1917 }
1435 }
1436 } 1918 }
1919 }
1920
1921 hv_clear (smooth);
1922 }
1437 1923
1438 glEnd (); 1924 glEnd ();
1439 1925
1440 glDisable (GL_TEXTURE_2D); 1926 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1927 glDisable (GL_BLEND);
1928
1929 // top layer: overlays such as the health bar
1930 for (y = 0; y < sh; y++)
1931 if (0 <= y + my && y + my < self->rows)
1932 {
1933 maprow *row = self->row + (y + my);
1934
1935 for (x = 0; x < sw; x++)
1936 if (row->c0 <= x + mx && x + mx < row->c1)
1937 {
1938 mapcell *cell = row->col + (x + mx - row->c0);
1939
1940 int px = x * T;
1941 int py = y * T;
1942
1943 if (cell->stat_hp)
1944 {
1945 int width = cell->stat_width * T;
1946 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1947
1948 glColor3ub (0, 0, 0);
1949 glRectf (px + 1, py - thick - 2,
1950 px + width - 1, py);
1951
1952 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1953 glRectf (px + 2,
1954 py - thick - 1,
1955 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1956 }
1957 }
1958 }
1442} 1959}
1443 1960
1444void 1961void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1962draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1963 CODE:
1500 glDisable (GL_BLEND); 2017 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D); 2018 glDisable (GL_TEXTURE_2D);
1502} 2019}
1503 2020
1504void 2021void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2022fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1506 PPCODE: 2023 PPCODE:
1507{ 2024{
1508 int vx, vy;
1509 int x, y; 2025 int x, y;
2026 int sw1 = sw + 2;
2027 int sh1 = sh + 2;
2028 int sh3 = sh * 3;
1510 int sw4 = (sw + 3) & ~3; 2029 int sw34 = (sw * 3 + 3) & ~3;
2030 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2031 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2032 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1513 2033
1514 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv); 2034 SvPOK_only (darkness3_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh); 2035 SvCUR_set (darkness3_sv, sw34 * sh3);
1517 2036
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2037 mx += self->x - 1;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2038 my += self->y - 1;
1520 2039
2040 memset (darkness1, 255, sw1 * sh1);
2041
1521 for (y = 0; y < sh; y++) 2042 for (y = 0; y < sh1; y++)
1522 if (0 <= y + vy && y + vy < self->rows) 2043 if (0 <= y + my && y + my < self->rows)
1523 { 2044 {
1524 maprow *row = self->row + (y + vy); 2045 maprow *row = self->row + (y + my);
1525 2046
1526 for (x = 0; x < sw; x++) 2047 for (x = 0; x < sw1; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 2048 if (row->c0 <= x + mx && x + mx < row->c1)
1528 { 2049 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 2050 mapcell *cell = row->col + (x + mx - row->c0);
1530 2051
1531 darkness[y * sw4 + x] = cell->darkness < 0 2052 darkness1 [y * sw1 + x] = cell->darkness
2053 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 2054 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 2055 }
1535 } 2056 }
1536 2057
2058 for (y = 0; y < sh; ++y)
2059 for (x = 0; x < sw; ++x)
2060 {
2061 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2062 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2063 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2064 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2065 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2066 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2067 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2068 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2069 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2070
2071 uint8_t r11 = (d11 + d21 + d12) / 3;
2072 uint8_t r21 = d21;
2073 uint8_t r31 = (d21 + d31 + d32) / 3;
2074
2075 uint8_t r12 = d12;
2076 uint8_t r22 = d22;
2077 uint8_t r32 = d32;
2078
2079 uint8_t r13 = (d13 + d23 + d12) / 3;
2080 uint8_t r23 = d23;
2081 uint8_t r33 = (d23 + d33 + d32) / 3;
2082
2083 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2084 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2085 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2086 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2087 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2088 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2089 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2090 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2091 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2092 }
2093
2094 free (darkness1);
2095
1537 EXTEND (SP, 3); 2096 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 2097 PUSHs (sv_2mortal (newSViv (sw34)));
1539 PUSHs (sv_2mortal (newSViv (sh))); 2098 PUSHs (sv_2mortal (newSViv (sh3)));
1540 PUSHs (darkness_sv); 2099 PUSHs (darkness3_sv);
1541} 2100}
1542 2101
1543SV * 2102SV *
1544get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2103get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1545 CODE: 2104 CODE:
1574 if (row && row->c0 <= x && x < row->c1) 2133 if (row && row->c0 <= x && x < row->c1)
1575 { 2134 {
1576 mapcell *cell = row->col + (x - row->c0); 2135 mapcell *cell = row->col + (x - row->c0);
1577 uint8_t flags = 0; 2136 uint8_t flags = 0;
1578 2137
1579 if (cell->face [0]) flags |= 1; 2138 if (cell->tile [0]) flags |= 1;
1580 if (cell->face [1]) flags |= 2; 2139 if (cell->tile [1]) flags |= 2;
1581 if (cell->face [2]) flags |= 4; 2140 if (cell->tile [2]) flags |= 4;
1582 2141
1583 *data++ = flags; 2142 *data++ = flags;
1584 2143
1585 if (flags & 1) 2144 if (flags & 1)
1586 { 2145 {
2146 tileid tile = cell->tile [0];
1587 *data++ = cell->face [0] >> 8; 2147 *data++ = tile >> 8;
1588 *data++ = cell->face [0]; 2148 *data++ = tile;
1589 } 2149 }
1590 2150
1591 if (flags & 2) 2151 if (flags & 2)
1592 { 2152 {
2153 tileid tile = cell->tile [1];
1593 *data++ = cell->face [1] >> 8; 2154 *data++ = tile >> 8;
1594 *data++ = cell->face [1]; 2155 *data++ = tile;
1595 } 2156 }
1596 2157
1597 if (flags & 4) 2158 if (flags & 4)
1598 { 2159 {
2160 tileid tile = cell->tile [2];
1599 *data++ = cell->face [2] >> 8; 2161 *data++ = tile >> 8;
1600 *data++ = cell->face [2]; 2162 *data++ = tile;
1601 } 2163 }
1602 } 2164 }
1603 else 2165 else
1604 *data++ = 0; 2166 *data++ = 0;
1605 } 2167 }
1645 { 2207 {
1646 uint8_t flags = *data++; 2208 uint8_t flags = *data++;
1647 2209
1648 if (flags) 2210 if (flags)
1649 { 2211 {
1650 mapface face[3] = { 0, 0, 0 };
1651
1652 mapcell *cell = row_get_cell (row, x); 2212 mapcell *cell = row_get_cell (row, x);
2213 tileid tile[3] = { 0, 0, 0 };
1653 2214
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2215 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2216 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2217 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1657 2218
1658 if (cell->darkness <= 0) 2219 if (cell->darkness == 0)
1659 { 2220 {
1660 cell->darkness = -1; 2221 cell->darkness = 0;
1661 2222
1662 for (z = 0; z <= 2; z++) 2223 for (z = 0; z <= 2; z++)
1663 { 2224 {
1664 cell->face[z] = face[z]; 2225 tileid t = tile [z];
1665 2226
1666 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2227 if (t >= self->texs || (t && !self->tex [t].name))
2228 {
1667 XPUSHs (sv_2mortal (newSViv (face[z]))); 2229 XPUSHs (sv_2mortal (newSViv (t)));
2230 need_texid (self, t);
2231 }
2232
2233 cell->tile [z] = t;
1668 } 2234 }
1669 } 2235 }
1670 } 2236 }
1671 } 2237 }
1672 } 2238 }
1673} 2239}
1674 2240
2241MODULE = CFPlus PACKAGE = CFPlus::RW
2242
2243CFPlus::RW
2244new (SV *class, SV *data_sv)
2245 CODE:
2246{
2247 STRLEN datalen;
2248 char *data = SvPVbyte (data_sv, datalen);
2249
2250 RETVAL = SDL_RWFromConstMem (data, datalen);
2251}
2252 OUTPUT:
2253 RETVAL
2254
2255CFPlus::RW
2256new_from_file (SV *class, const char *path, const char *mode = "rb")
2257 CODE:
2258 RETVAL = SDL_RWFromFile (path, mode);
2259 OUTPUT:
2260 RETVAL
2261
2262void
2263close (CFPlus::RW self)
2264 CODE:
2265 SDL_RWclose (self);
2266
2267MODULE = CFPlus PACKAGE = CFPlus::Channel
2268
2269PROTOTYPES: DISABLE
2270
2271void
2272halt (CFPlus::Channel self)
2273 CODE:
2274 Mix_HaltChannel (self);
2275
2276void
2277expire (CFPlus::Channel self, int ticks = -1)
2278 CODE:
2279 Mix_ExpireChannel (self, ticks);
2280
2281void
2282fade_out (CFPlus::Channel self, int ticks = -1)
2283 CODE:
2284 Mix_FadeOutChannel (self, ticks);
2285
2286int
2287volume (CFPlus::Channel self, int volume)
2288 CODE:
2289 RETVAL = Mix_Volume (self, volume);
2290 OUTPUT:
2291 RETVAL
2292
2293void
2294unregister_all_effects (CFPlus::Channel self)
2295 CODE:
2296 Mix_UnregisterAllEffects (self);
2297
2298void
2299set_panning (CFPlus::Channel self, int left, int right)
2300 CODE:
2301 Mix_SetPanning (self, left, right);
2302
2303void
2304set_distance (CFPlus::Channel self, int distance)
2305 CODE:
2306 Mix_SetDistance (self, distance);
2307
2308void
2309set_position (CFPlus::Channel self, int angle, int distance)
2310 CODE:
2311 Mix_SetPosition (self, angle, distance);
2312
2313void
2314set_reverse_stereo (CFPlus::Channel self, int flip)
2315 CODE:
2316 Mix_SetReverseStereo (self, flip);
2317
1675MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2318MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1676 2319
2320PROTOTYPES: DISABLE
2321
1677CFPlus::MixChunk 2322CFPlus::MixChunk
1678new_from_file (SV *class, char *path) 2323new (SV *class, CFPlus::RW rwops)
1679 CODE: 2324 CODE:
1680 RETVAL = Mix_LoadWAV (path); 2325 RETVAL = Mix_LoadWAV_RW (rwops, 1);
1681 OUTPUT: 2326 OUTPUT:
1682 RETVAL 2327 RETVAL
1683 2328
1684void 2329void
1685DESTROY (CFPlus::MixChunk self) 2330DESTROY (CFPlus::MixChunk self)
1691 CODE: 2336 CODE:
1692 RETVAL = Mix_VolumeChunk (self, volume); 2337 RETVAL = Mix_VolumeChunk (self, volume);
1693 OUTPUT: 2338 OUTPUT:
1694 RETVAL 2339 RETVAL
1695 2340
1696int 2341CFPlus::Channel
1697play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2342play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1698 CODE: 2343 CODE:
1699 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2344 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2345 Mix_UnregisterAllEffects (RETVAL);
1700 OUTPUT: 2346 OUTPUT:
1701 RETVAL 2347 RETVAL
1702 2348
1703MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2349MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1704 2350
1705int 2351int
1706volume (int volume = -1) 2352volume (int volume = -1)
2353 PROTOTYPE: ;$
1707 CODE: 2354 CODE:
1708 RETVAL = Mix_VolumeMusic (volume); 2355 RETVAL = Mix_VolumeMusic (volume);
1709 OUTPUT: 2356 OUTPUT:
1710 RETVAL 2357 RETVAL
1711 2358
2359void
2360fade_out (int ms)
2361 CODE:
2362 Mix_FadeOutMusic (ms);
2363
2364void
2365halt ()
2366 CODE:
2367 Mix_HaltMusic ();
2368
1712CFPlus::MixMusic 2369CFPlus::MixMusic
1713new_from_file (SV *class, char *path) 2370new (SV *class, CFPlus::RW rwops)
1714 CODE: 2371 CODE:
1715 RETVAL = Mix_LoadMUS (path); 2372 RETVAL = Mix_LoadMUS_RW (rwops);
1716 OUTPUT: 2373 OUTPUT:
1717 RETVAL 2374 RETVAL
1718 2375
1719void 2376void
1720DESTROY (CFPlus::MixMusic self) 2377DESTROY (CFPlus::MixMusic self)
1726 CODE: 2383 CODE:
1727 RETVAL = Mix_PlayMusic (self, loops); 2384 RETVAL = Mix_PlayMusic (self, loops);
1728 OUTPUT: 2385 OUTPUT:
1729 RETVAL 2386 RETVAL
1730 2387
2388void
2389fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2390 CODE:
2391 Mix_FadeInMusicPos (self, loops, ms, position);
2392
1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2393MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2394
2395PROTOTYPES: ENABLE
1732 2396
1733BOOT: 2397BOOT:
1734{ 2398{
1735 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2399 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1736 static const struct { 2400 static const struct {
1737 const char *name; 2401 const char *name;
1738 IV iv; 2402 IV iv;
1739 } *civ, const_iv[] = { 2403 } *civ, const_iv[] = {
1740# define const_iv(name) { # name, (IV)name } 2404# define const_iv(name) { # name, (IV)name }
2405 const_iv (GL_VENDOR),
2406 const_iv (GL_VERSION),
2407 const_iv (GL_EXTENSIONS),
1741 const_iv (GL_COLOR_MATERIAL), 2408 const_iv (GL_COLOR_MATERIAL),
1742 const_iv (GL_SMOOTH), 2409 const_iv (GL_SMOOTH),
1743 const_iv (GL_FLAT), 2410 const_iv (GL_FLAT),
1744 const_iv (GL_DITHER), 2411 const_iv (GL_DITHER),
1745 const_iv (GL_BLEND), 2412 const_iv (GL_BLEND),
1749 const_iv (GL_ALPHA_TEST), 2416 const_iv (GL_ALPHA_TEST),
1750 const_iv (GL_NORMALIZE), 2417 const_iv (GL_NORMALIZE),
1751 const_iv (GL_RESCALE_NORMAL), 2418 const_iv (GL_RESCALE_NORMAL),
1752 const_iv (GL_FRONT), 2419 const_iv (GL_FRONT),
1753 const_iv (GL_BACK), 2420 const_iv (GL_BACK),
2421 const_iv (GL_AUX0),
1754 const_iv (GL_AND), 2422 const_iv (GL_AND),
1755 const_iv (GL_ONE), 2423 const_iv (GL_ONE),
1756 const_iv (GL_ZERO), 2424 const_iv (GL_ZERO),
1757 const_iv (GL_SRC_ALPHA), 2425 const_iv (GL_SRC_ALPHA),
1758 const_iv (GL_DST_ALPHA), 2426 const_iv (GL_DST_ALPHA),
1772 const_iv (GL_LUMINANCE), 2440 const_iv (GL_LUMINANCE),
1773 const_iv (GL_LUMINANCE_ALPHA), 2441 const_iv (GL_LUMINANCE_ALPHA),
1774 const_iv (GL_FLOAT), 2442 const_iv (GL_FLOAT),
1775 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2443 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1776 const_iv (GL_COMPILE), 2444 const_iv (GL_COMPILE),
2445 const_iv (GL_PROXY_TEXTURE_1D),
2446 const_iv (GL_PROXY_TEXTURE_2D),
1777 const_iv (GL_TEXTURE_1D), 2447 const_iv (GL_TEXTURE_1D),
1778 const_iv (GL_TEXTURE_2D), 2448 const_iv (GL_TEXTURE_2D),
1779 const_iv (GL_TEXTURE_ENV), 2449 const_iv (GL_TEXTURE_ENV),
1780 const_iv (GL_TEXTURE_MAG_FILTER), 2450 const_iv (GL_TEXTURE_MAG_FILTER),
1781 const_iv (GL_TEXTURE_MIN_FILTER), 2451 const_iv (GL_TEXTURE_MIN_FILTER),
1802 const_iv (GL_COLOR_LOGIC_OP), 2472 const_iv (GL_COLOR_LOGIC_OP),
1803 const_iv (GL_SEPARABLE_2D), 2473 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 2474 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 2475 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 2476 const_iv (GL_CONSTANT_BORDER),
2477 const_iv (GL_POINTS),
1807 const_iv (GL_LINES), 2478 const_iv (GL_LINES),
2479 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 2480 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 2481 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 2482 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 2483 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 2484 const_iv (GL_TRIANGLE_STRIP),
1813 const_iv (GL_TRIANGLE_FAN), 2485 const_iv (GL_TRIANGLE_FAN),
2486 const_iv (GL_POLYGON),
1814 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2487 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488 const_iv (GL_POINT_SMOOTH_HINT),
2489 const_iv (GL_LINE_SMOOTH_HINT),
2490 const_iv (GL_POLYGON_SMOOTH_HINT),
2491 const_iv (GL_GENERATE_MIPMAP_HINT),
1815 const_iv (GL_FASTEST), 2492 const_iv (GL_FASTEST),
2493 const_iv (GL_DONT_CARE),
2494 const_iv (GL_NICEST),
1816 const_iv (GL_V2F), 2495 const_iv (GL_V2F),
1817 const_iv (GL_V3F), 2496 const_iv (GL_V3F),
1818 const_iv (GL_T2F_V3F), 2497 const_iv (GL_T2F_V3F),
1819 const_iv (GL_T2F_N3F_V3F), 2498 const_iv (GL_T2F_N3F_V3F),
1820# undef const_iv 2499# undef const_iv
1821 }; 2500 };
1822 2501
1823 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2502 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1824 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2503 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2504
2505 texture_av = newAV ();
2506 AvREAL_off (texture_av);
1825} 2507}
1826 2508
1827char * 2509char *
1828gl_vendor () 2510gl_vendor ()
1829 CODE: 2511 CODE:
1843 CODE: 2525 CODE:
1844 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2526 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1845 OUTPUT: 2527 OUTPUT:
1846 RETVAL 2528 RETVAL
1847 2529
2530const char *glGetString (GLenum pname)
2531
2532GLint glGetInteger (GLenum pname)
2533 CODE:
2534 glGetIntegerv (pname, &RETVAL);
2535 OUTPUT:
2536 RETVAL
2537
2538GLdouble glGetDouble (GLenum pname)
2539 CODE:
2540 glGetDoublev (pname, &RETVAL);
2541 OUTPUT:
2542 RETVAL
2543
1848int glGetError () 2544int glGetError ()
1849 2545
1850void glFinish () 2546void glFinish ()
1851 2547
1852void glClear (int mask) 2548void glClear (int mask)
1889# near_ and far_ are due to microsofts buggy "c" compiler 2585# near_ and far_ are due to microsofts buggy "c" compiler
1890void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2586void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1891 2587
1892# near_ and far_ are due to microsofts buggy "c" compiler 2588# near_ and far_ are due to microsofts buggy "c" compiler
1893void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2589void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2590
2591PROTOTYPES: DISABLE
1894 2592
1895void glViewport (int x, int y, int width, int height) 2593void glViewport (int x, int y, int width, int height)
1896 2594
1897void glScissor (int x, int y, int width, int height) 2595void glScissor (int x, int y, int width, int height)
1898 2596
1906 2604
1907void glRotate (float angle, float x, float y, float z) 2605void glRotate (float angle, float x, float y, float z)
1908 CODE: 2606 CODE:
1909 glRotatef (angle, x, y, z); 2607 glRotatef (angle, x, y, z);
1910 2608
1911void glBegin (int mode)
1912
1913void glEnd ()
1914
1915void glColor (float r, float g, float b, float a = 1.0) 2609void glColor (float r, float g, float b, float a = 1.0)
1916 PROTOTYPE: @
1917 ALIAS: 2610 ALIAS:
1918 glColor_premultiply = 1 2611 glColor_premultiply = 1
1919 CODE: 2612 CODE:
1920 if (ix) 2613 if (ix)
1921 { 2614 {
1924 b *= a; 2617 b *= a;
1925 } 2618 }
1926 // microsoft visual "c" rounds instead of truncating... 2619 // microsoft visual "c" rounds instead of truncating...
1927 glColor4f (r, g, b, a); 2620 glColor4f (r, g, b, a);
1928 2621
1929void glInterleavedArrays (int format, int stride, char *data)
1930
1931void glDrawElements (int mode, int count, int type, char *indices)
1932
1933# 1.2 void glDrawRangeElements (int mode, int start, int end
1934
1935void glRasterPos (float x, float y, float z = 0.) 2622void glRasterPos (float x, float y, float z = 0.)
1936 CODE: 2623 CODE:
1937 glRasterPos3f (0, 0, z); 2624 glRasterPos3f (0, 0, z);
1938 glBitmap (0, 0, 0, 0, x, y, 0); 2625 glBitmap (0, 0, 0, 0, x, y, 0);
1939 2626
1943 2630
1944void glTexCoord (float s, float t) 2631void glTexCoord (float s, float t)
1945 CODE: 2632 CODE:
1946 glTexCoord2f (s, t); 2633 glTexCoord2f (s, t);
1947 2634
2635void glRect (float x1, float y1, float x2, float y2)
2636 CODE:
2637 glRectf (x1, y1, x2, y2);
2638
2639PROTOTYPES: ENABLE
2640
2641void glBegin (int mode)
2642
2643void glEnd ()
2644
2645void glPointSize (GLfloat size)
2646
2647void glLineWidth (GLfloat width)
2648
2649void glInterleavedArrays (int format, int stride, char *data)
2650
2651void glDrawElements (int mode, int count, int type, char *indices)
2652
2653# 1.2 void glDrawRangeElements (int mode, int start, int end
2654
1948void glTexEnv (int target, int pname, float param) 2655void glTexEnv (int target, int pname, float param)
1949 CODE: 2656 CODE:
1950 glTexEnvf (target, pname, param); 2657 glTexEnvf (target, pname, param);
1951 2658
1952void glTexParameter (int target, int pname, float param) 2659void glTexParameter (int target, int pname, float param)
1974 2681
1975void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2682void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1976 2683
1977void glDrawPixels (int width, int height, int format, int type, char *pixels) 2684void glDrawPixels (int width, int height, int format, int type, char *pixels)
1978 2685
2686void glPixelZoom (float x, float y)
2687
1979void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2688void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1980 2689
1981int glGenTexture () 2690int glGenTexture ()
1982 CODE: 2691 CODE:
1983{ 2692 RETVAL = gen_texture ();
1984 GLuint name;
1985 glGenTextures (1, &name);
1986 RETVAL = name;
1987}
1988 OUTPUT: 2693 OUTPUT:
1989 RETVAL 2694 RETVAL
1990 2695
1991void glDeleteTexture (int name) 2696void glDeleteTexture (int name)
1992 CODE: 2697 CODE:
1993{
1994 GLuint name_ = name;
1995 glDeleteTextures (1, &name_); 2698 del_texture (name);
1996} 2699
1997
1998int glGenList () 2700int glGenList ()
1999 CODE: 2701 CODE:
2000 RETVAL = glGenLists (1); 2702 RETVAL = glGenLists (1);
2001 OUTPUT: 2703 OUTPUT:
2002 RETVAL 2704 RETVAL
2009 2711
2010void glEndList () 2712void glEndList ()
2011 2713
2012void glCallList (int list) 2714void glCallList (int list)
2013 2715
2716MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2014 2717
2718PROTOTYPES: DISABLE
2719
2720void
2721find_widget (SV *self, NV x, NV y)
2722 PPCODE:
2723{
2724 if (within_widget (self, x, y))
2725 XPUSHs (self);
2726}
2727
2728BOOT:
2729{
2730 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2731
2732 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2733 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2734 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2735 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2736}
2737
2738void
2739draw (SV *self)
2740 CODE:
2741{
2742 HV *hv;
2743 SV **svp;
2744 NV x, y, w, h;
2745 SV *draw_x_sv = GvSV (draw_x_gv);
2746 SV *draw_y_sv = GvSV (draw_y_gv);
2747 SV *draw_w_sv = GvSV (draw_w_gv);
2748 SV *draw_h_sv = GvSV (draw_h_gv);
2749 SV *hover;
2750 double draw_x, draw_y, draw_w, draw_h;
2751
2752 if (!SvROK (self))
2753 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2754
2755 hv = (HV *)SvRV (self);
2756
2757 if (SvTYPE (hv) != SVt_PVHV)
2758 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2759
2760 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762
2763 if (!h || !w)
2764 XSRETURN_EMPTY;
2765
2766 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2767 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2768
2769 draw_x = SvNV (draw_x_sv) + x;
2770 draw_y = SvNV (draw_y_sv) + y;
2771
2772 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2773 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2774 XSRETURN_EMPTY;
2775
2776 sv_setnv (draw_x_sv, draw_x);
2777 sv_setnv (draw_y_sv, draw_y);
2778
2779 glPushMatrix ();
2780 glTranslated (x, y, 0);
2781
2782 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2783 {
2784 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785
2786 if (svp && SvTRUE (*svp))
2787 {
2788 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2789 glEnable (GL_BLEND);
2790 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791 glBegin (GL_QUADS);
2792 glVertex2f (0, 0);
2793 glVertex2f (w, 0);
2794 glVertex2f (w, h);
2795 glVertex2f (0, h);
2796 glEnd ();
2797 glDisable (GL_BLEND);
2798 }
2799 }
2800#if 0
2801 if ($ENV{CFPLUS_DEBUG} & 1) {
2802 glPushMatrix;
2803 glColor 1, 1, 0, 1;
2804 glTranslate 0.375, 0.375;
2805 glBegin GL_LINE_LOOP;
2806 glVertex 0 , 0;
2807 glVertex $self->{w} - 1, 0;
2808 glVertex $self->{w} - 1, $self->{h} - 1;
2809 glVertex 0 , $self->{h} - 1;
2810 glEnd;
2811 glPopMatrix;
2812 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813 }
2814#endif
2815 PUSHMARK (SP);
2816 XPUSHs (self);
2817 PUTBACK;
2818 call_method ("_draw", G_VOID | G_DISCARD);
2819 SPAGAIN;
2820
2821 glPopMatrix ();
2822
2823 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2824 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2825}
2826

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines