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.133 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.214 by root, Sun Jul 29 18:56:02 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);
669#if SDL_VERSION_ATLEAST(1,2,10)
517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
519 672#endif
520 SDL_EnableUNICODE (1);
521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522 673
523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
524 675
525 if (m && m != (SDL_Rect **)-1) 676 if (m && m != (SDL_Rect **)-1)
526 while (*m) 677 while (*m)
527 { 678 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
528 AV *av = newAV (); 681 AV *av = newAV ();
529 av_push (av, newSViv ((*m)->w)); 682 av_push (av, newSViv ((*m)->w));
530 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));
531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
532 688
533 ++m; 689 ++m;
534 } 690 }
535} 691}
536 692
537char *
538SDL_GetError ()
539
540int 693int
541SDL_SetVideoMode (int w, int h, int fullscreen) 694SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
542 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
543 RETVAL = !!SDL_SetVideoMode ( 705 RETVAL = !!SDL_SetVideoMode (
544 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 706 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
545 ); 707 );
708
546 if (RETVAL) 709 if (RETVAL)
547 { 710 {
711 av_clear (texture_av);
712
548 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
549# 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);
550# include "glfunc.h" 715#include "glfunc.h"
551# undef GL_FUNC 716#undef GL_FUNC
552 } 717 }
718}
553 OUTPUT: 719 OUTPUT:
554 RETVAL 720 RETVAL
555 721
556void 722void
557SDL_GL_SwapBuffers () 723SDL_GL_SwapBuffers ()
558 724
559char * 725char *
560SDL_GetKeyName (int sym) 726SDL_GetKeyName (int sym)
561 727
728int
729SDL_GetAppState ()
730
562void 731void
563SDL_PollEvent () 732poll_events ()
564 PPCODE: 733 PPCODE:
565{ 734{
566 SDL_Event ev; 735 SDL_Event ev;
567 736
568 while (SDL_PollEvent (&ev)) 737 SDL_PumpEvents ();
738 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
569 { 739 {
570 HV *hv = newHV (); 740 HV *hv = newHV ();
571 hv_store (hv, "type", 4, newSViv (ev.type), 0); 741 hv_store (hv, "type", 4, newSViv (ev.type), 0);
572 742
573 switch (ev.type) 743 switch (ev.type)
575 case SDL_KEYDOWN: 745 case SDL_KEYDOWN:
576 case SDL_KEYUP: 746 case SDL_KEYUP:
577 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579 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 */
580 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581 break; 752 break;
582 753
583 case SDL_ACTIVEEVENT: 754 case SDL_ACTIVEEVENT:
584 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
585 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 756 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
586 break; 757 break;
587 758
588 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
589 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
590
591 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 779 hv_store (hv, "state", 5, newSViv (state), 0);
592 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 780 hv_store (hv, "x", 1, newSViv (x), 0);
593 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 781 hv_store (hv, "y", 1, newSViv (y), 0);
594 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 782 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
595 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 783 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 }
596 break; 785 break;
597 786
598 case SDL_MOUSEBUTTONDOWN: 787 case SDL_MOUSEBUTTONDOWN:
599 case SDL_MOUSEBUTTONUP: 788 case SDL_MOUSEBUTTONUP:
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
615 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))));
616 } 805 }
617} 806}
618 807
619int 808int
620Mix_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)
621 POSTCALL: 810 POSTCALL:
622 Mix_HookMusicFinished (music_finished); 811 Mix_HookMusicFinished (music_finished);
623 Mix_ChannelFinished (channel_finished); 812 Mix_ChannelFinished (channel_finished);
624 813
625void 814void
626Mix_CloseAudio () 815Mix_CloseAudio ()
627 816
628int 817int
629Mix_AllocateChannels (int numchans = -1) 818Mix_AllocateChannels (int numchans = -1)
630 819
820const char *
821Mix_GetError ()
822
631void 823void
632lowdelay (int fd, int val = 1) 824lowdelay (int fd, int val = 1)
633 CODE: 825 CODE:
826 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
827
828void
829win32_proxy_info ()
830 PPCODE:
831{
634#ifndef _WIN32 832#ifdef _WIN32
635 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 833 char buffer[2048];
834 DWORD buflen;
835
836 EXTEND (SP, 3);
837
838 buflen = sizeof (buffer);
839 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
840 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
841 {
842 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
843
844 buflen = sizeof (buffer);
845 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
846 {
847 PUSHs (newSVpv (buffer, 0));
848
849 buflen = sizeof (buffer);
850 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
851 PUSHs (newSVpv (buffer, 0));
852 }
853 }
636#endif 854#endif
855}
637 856
638void 857void
639add_font (char *file) 858add_font (char *file)
640 CODE: 859 CODE:
641 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 860 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
649 STRLEN image_len; 868 STRLEN image_len;
650 char *image = (char *)SvPVbyte (image_, image_len); 869 char *image = (char *)SvPVbyte (image_, image_len);
651 SDL_Surface *surface, *surface2; 870 SDL_Surface *surface, *surface2;
652 SDL_PixelFormat fmt; 871 SDL_PixelFormat fmt;
653 SDL_RWops *rw = ix 872 SDL_RWops *rw = ix
654 ? SDL_RWFromFile (image, "r") 873 ? SDL_RWFromFile (image, "rb")
655 : SDL_RWFromConstMem (image, image_len); 874 : SDL_RWFromConstMem (image, image_len);
656 875
657 if (!rw) 876 if (!rw)
658 croak ("load_image: %s", SDL_GetError ()); 877 croak ("load_image: %s", SDL_GetError ());
659 878
745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746#endif 965#endif
747 _exit (1); 966 _exit (1);
748 967
749void 968void
750_exit (int retval) 969_exit (int retval = 0)
751 CODE: 970 CODE:
971#ifdef WIN32
972 ExitThread (retval); // unclean, please beam me up
973#else
752 _exit (retval); 974 _exit (retval);
975#endif
976
977void
978debug ()
979 CODE:
980{
981#if DEBUG
982 VALGRIND_DO_LEAK_CHECK;
983#endif
984}
753 985
754MODULE = CFPlus PACKAGE = CFPlus::Font 986MODULE = CFPlus PACKAGE = CFPlus::Font
987
988PROTOTYPES: DISABLE
755 989
756CFPlus::Font 990CFPlus::Font
757new_from_file (SV *class, char *path, int id = 0) 991new_from_file (SV *class, char *path, int id = 0)
758 CODE: 992 CODE:
759{ 993{
770 CODE: 1004 CODE:
771 pango_font_description_free (self); 1005 pango_font_description_free (self);
772 1006
773void 1007void
774make_default (CFPlus::Font self) 1008make_default (CFPlus::Font self)
1009 PROTOTYPE: $
775 CODE: 1010 CODE:
776 default_font = self; 1011 default_font = self;
777 1012
778MODULE = CFPlus PACKAGE = CFPlus::Layout 1013MODULE = CFPlus PACKAGE = CFPlus::Layout
779 1014
1015PROTOTYPES: DISABLE
1016
780void 1017void
781reset_glyph_cache () 1018reset_glyph_cache ()
1019 PROTOTYPE:
782 CODE: 1020 CODE:
783 tc_clear (); 1021 tc_clear ();
784 1022
785CFPlus::Layout 1023CFPlus::Layout
786new (SV *class) 1024new (SV *class)
1004xy_to_index (CFPlus::Layout self, int x, int y) 1242xy_to_index (CFPlus::Layout self, int x, int y)
1005 CODE: 1243 CODE:
1006{ 1244{
1007 int index, trailing; 1245 int index, trailing;
1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009 RETVAL = index; 1247 RETVAL = index + trailing;
1010} 1248}
1011 OUTPUT: 1249 OUTPUT:
1012 RETVAL 1250 RETVAL
1013 1251
1014void 1252void
1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025} 1263}
1026 1264
1027void 1265void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1267 PPCODE:
1268{
1269 int line, x;
1270
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273
1274 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277}
1278
1279void
1280line_x_to_index (CFPlus::Layout self, int line, int x)
1281 PPCODE:
1282{
1283 PangoLayoutLine *lp;
1284 int index, trailing;
1285
1286 if (line < 0)
1287 XSRETURN_EMPTY;
1288
1289 if (!(lp = pango_layout_get_line (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */
1291
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293
1294 EXTEND (SP, 2);
1295 if (GIMME_V == G_SCALAR)
1296 PUSHs (sv_2mortal (newSViv (index + trailing)));
1297 else
1298 {
1299 PUSHs (sv_2mortal (newSViv (index)));
1300 PUSHs (sv_2mortal (newSViv (trailing)));
1301 }
1302}
1303
1304void
1028render (CFPlus::Layout self, float x, float y) 1305render (CFPlus::Layout self, float x, float y, int flags = 0)
1029 PPCODE: 1306 PPCODE:
1030 pango_opengl_render_layout_subpixel ( 1307 pango_opengl_render_layout_subpixel (
1031 self->pl, 1308 self->pl,
1032 x * PANGO_SCALE, y * PANGO_SCALE, 1309 x * PANGO_SCALE, y * PANGO_SCALE,
1033 self->r, self->g, self->b, self->a 1310 self->r, self->g, self->b, self->a,
1311 flags
1034 ); 1312 );
1035 1313
1036MODULE = CFPlus PACKAGE = CFPlus::Texture 1314MODULE = CFPlus PACKAGE = CFPlus::Texture
1037 1315
1038void 1316PROTOTYPES: ENABLE
1039pad2pot (SV *data_, SV *w_, SV *h_)
1040 CODE:
1041{
1042 int ow = SvIV (w_);
1043 int oh = SvIV (h_);
1044 1317
1045 if (ow && oh) 1318int minpot (int n)
1319
1320void
1321pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE:
1323{
1324 if ((nw != ow || nh != oh) && SvOK (data_))
1046 { 1325 {
1047 int nw = minpot (ow);
1048 int nh = minpot (oh);
1049
1050 if (nw != ow || nh != oh)
1051 {
1052 if (SvOK (data_))
1053 {
1054 STRLEN datalen; 1326 STRLEN datalen;
1055 char *data = SvPVbyte (data_, datalen); 1327 char *data = SvPVbyte (data_, datalen);
1056 int bpp = datalen / (ow * oh); 1328 int bpp = datalen / (ow * oh);
1057 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1329 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1058 1330
1059 SvPOK_only (result_); 1331 SvPOK_only (result_);
1060 SvCUR_set (result_, nw * nh * bpp); 1332 SvCUR_set (result_, nw * nh * bpp);
1061 1333
1062 memset (SvPVX (result_), 0, nw * nh * bpp); 1334 memset (SvPVX (result_), 0, nw * nh * bpp);
1063 while (oh--) 1335 while (oh--)
1064 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1336 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1065 1337
1066 sv_setsv (data_, result_); 1338 sv_setsv (data_, result_);
1067 }
1068
1069 sv_setiv (w_, nw);
1070 sv_setiv (h_, nh);
1071 }
1072 } 1339 }
1073} 1340}
1074 1341
1075void 1342void
1076draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1343draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1119 glDisable (GL_ALPHA_TEST); 1386 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND); 1387 glDisable (GL_BLEND);
1121 } 1388 }
1122} 1389}
1123 1390
1391IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1392 CODE:
1393{
1394 GLint width;
1395 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1396 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1397 RETVAL = width > 0;
1398}
1399 OUTPUT:
1400 RETVAL
1401
1124MODULE = CFPlus PACKAGE = CFPlus::Map 1402MODULE = CFPlus PACKAGE = CFPlus::Map
1125 1403
1404PROTOTYPES: DISABLE
1405
1126CFPlus::Map 1406CFPlus::Map
1127new (SV *class, int map_width, int map_height) 1407new (SV *class)
1128 CODE: 1408 CODE:
1129 New (0, RETVAL, 1, struct map); 1409 New (0, RETVAL, 1, struct map);
1130 RETVAL->x = 0; 1410 RETVAL->x = 0;
1131 RETVAL->y = 0; 1411 RETVAL->y = 0;
1132 RETVAL->w = map_width; 1412 RETVAL->w = 0;
1133 RETVAL->h = map_height; 1413 RETVAL->h = 0;
1134 RETVAL->ox = 0; 1414 RETVAL->ox = 0;
1135 RETVAL->oy = 0; 1415 RETVAL->oy = 0;
1136 RETVAL->faces = 8192; 1416 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1137 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1417 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1138 RETVAL->texs = 8192;
1139 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1140 RETVAL->rows = 0; 1418 RETVAL->rows = 0;
1141 RETVAL->row = 0; 1419 RETVAL->row = 0;
1142 OUTPUT: 1420 OUTPUT:
1143 RETVAL 1421 RETVAL
1144 1422
1145void 1423void
1146DESTROY (CFPlus::Map self) 1424DESTROY (CFPlus::Map self)
1147 CODE: 1425 CODE:
1148{ 1426{
1149 map_clear (self); 1427 map_clear (self);
1150 Safefree (self->face); 1428 Safefree (self->face2tile);
1151 Safefree (self->tex); 1429 Safefree (self->tex);
1152 Safefree (self); 1430 Safefree (self);
1153} 1431}
1154 1432
1155void 1433void
1434resize (CFPlus::Map self, int map_width, int map_height)
1435 CODE:
1436 self->w = map_width;
1437 self->h = map_height;
1438
1439void
1156clear (CFPlus::Map self) 1440clear (CFPlus::Map self)
1157 CODE: 1441 CODE:
1158 map_clear (self); 1442 map_clear (self);
1159 1443
1160void 1444void
1161set_face (CFPlus::Map self, int face, int texid) 1445set_tileid (CFPlus::Map self, int face, int tile)
1162 CODE: 1446 CODE:
1163{ 1447{
1164 while (self->faces <= face) 1448 need_facenum (self, face); self->face2tile [face] = tile;
1165 { 1449 need_texid (self, tile);
1166 Append (mapface, self->face, self->faces, self->faces); 1450}
1167 self->faces *= 2;
1168 }
1169 1451
1170 self->face [face] = texid; 1452void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level)
1454 CODE:
1455{
1456 tileid texid;
1457 maptex *tex;
1458
1459 if (face < 0 || face >= self->faces)
1460 return;
1461
1462 if (smooth < 0 || smooth >= self->faces)
1463 return;
1464
1465 texid = self->face2tile [face];
1466
1467 if (!texid)
1468 return;
1469
1470 tex = self->tex + texid;
1471 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level;
1171} 1473}
1172 1474
1173void 1475void
1174set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1476set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1175 CODE: 1477 CODE:
1176{ 1478{
1177 while (self->texs <= texid) 1479 need_texid (self, texid);
1178 {
1179 Append (maptex, self->tex, self->texs, self->texs);
1180 self->texs *= 2;
1181 }
1182 1480
1183 { 1481 {
1184 maptex *tex = self->tex + texid; 1482 maptex *tex = self->tex + texid;
1185 1483
1186 tex->name = name; 1484 tex->name = name;
1228void 1526void
1229scroll (CFPlus::Map self, int dx, int dy) 1527scroll (CFPlus::Map self, int dx, int dy)
1230 CODE: 1528 CODE:
1231{ 1529{
1232 if (dx > 0) 1530 if (dx > 0)
1233 map_blank (self, self->x, self->y, dx - 1, self->h); 1531 map_blank (self, self->x, self->y, dx, self->h);
1234 else if (dx < 0) 1532 else if (dx < 0)
1235 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1533 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1236 1534
1237 if (dy > 0) 1535 if (dy > 0)
1238 map_blank (self, self->x, self->y, self->w, dy - 1); 1536 map_blank (self, self->x, self->y, self->w, dy);
1239 else if (dy < 0) 1537 else if (dy < 0)
1240 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1538 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1241 1539
1242 self->ox += dx; self->x += dx; 1540 self->ox += dx; self->x += dx;
1243 self->oy += dy; self->y += dy; 1541 self->oy += dy; self->y += dy;
1244 1542
1245 while (self->y < 0) 1543 while (self->y < 0)
1250 self->y += MAP_EXTEND_Y; 1548 self->y += MAP_EXTEND_Y;
1251 } 1549 }
1252} 1550}
1253 1551
1254void 1552void
1255map1a_update (CFPlus::Map self, SV *data_) 1553map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256 CODE: 1554 CODE:
1257{ 1555{
1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259 uint8_t *data_end = (uint8_t *)SvEND (data_); 1557 uint8_t *data_end = (uint8_t *)SvEND (data_);
1260 mapcell *cell; 1558 mapcell *cell;
1261 int x, y, flags; 1559 int x, y, flags;
1262 1560
1263 while (data < data_end) 1561 while (data < data_end - 1)
1264 { 1562 {
1265 flags = (data [0] << 8) + data [1]; data += 2; 1563 flags = (data [0] << 8) + data [1]; data += 2;
1266 1564
1267 x = self->x + ((flags >> 10) & 63); 1565 x = self->x + ((flags >> 10) & 63);
1268 y = self->y + ((flags >> 4) & 63); 1566 y = self->y + ((flags >> 4) & 63);
1269 1567
1270 cell = map_get_cell (self, x, y); 1568 cell = map_get_cell (self, x, y);
1271 1569
1272 if (flags & 15) 1570 if (flags & 15)
1273 { 1571 {
1274 if (cell->darkness < 0) 1572 if (!cell->darkness)
1275 { 1573 {
1574 memset (cell, 0, sizeof (*cell));
1276 cell->darkness = 0; 1575 cell->darkness = 256;
1277 cell->face [0] = 0;
1278 cell->face [1] = 0;
1279 cell->face [2] = 0;
1280 } 1576 }
1281 1577
1282 cell->darkness = flags & 8 ? *data++ : 255;
1283
1284 //TODO: don't trust server data to be in-range(!) 1578 //TODO: don't trust server data to be in-range(!)
1579
1580 if (flags & 8)
1581 {
1582 if (extmap)
1583 {
1584 uint8_t ext, cmd;
1585
1586 do
1587 {
1588 ext = *data++;
1589 cmd = ext & 0x3f;
1590
1591 if (cmd < 4)
1592 cell->darkness = 255 - ext * 64 + 1;
1593 else if (cmd == 5) // health
1594 {
1595 cell->stat_width = 1;
1596 cell->stat_hp = *data++;
1597 }
1598 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47)
1601 {
1602 if (*data == 4)
1603 ; // decode player count
1604
1605 data += *data + 1;
1606 }
1607 else if (cmd == 8) // cell flags
1608 cell->flags = *data++;
1609 else if (ext & 0x40) // unknown, multibyte => skip
1610 data += *data + 1;
1611 else
1612 data++;
1613 }
1614 while (ext & 0x80);
1615 }
1616 else
1617 cell->darkness = *data++ + 1;
1618 }
1285 1619
1286 if (flags & 4) 1620 if (flags & 4)
1287 { 1621 {
1288 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face];
1289 } 1625 }
1290 1626
1291 if (flags & 2) 1627 if (flags & 2)
1292 { 1628 {
1293 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1294 } 1632 }
1295 1633
1296 if (flags & 1) 1634 if (flags & 1)
1297 { 1635 {
1298 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1299 } 1639 }
1300 } 1640 }
1301 else 1641 else
1302 cell->darkness = -1; 1642 cell->darkness = 0;
1303 } 1643 }
1304} 1644}
1305 1645
1306SV * 1646SV *
1307mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1333 { 1673 {
1334 mapcell *cell = row->col + (x - row->c0); 1674 mapcell *cell = row->col + (x - row->c0);
1335 1675
1336 for (z = 0; z <= 0; z++) 1676 for (z = 0; z <= 0; z++)
1337 { 1677 {
1338 mapface face = cell->face [z];
1339
1340 if (face)
1341 {
1342 maptex tex = self->tex [face]; 1678 maptex tex = self->tex [cell->tile [z]];
1343 int a0 = 255 - tex.a; 1679 int a0 = 255 - tex.a;
1344 int a1 = tex.a; 1680 int a1 = tex.a;
1345 1681
1346 r = (r * a0 + tex.r * a1) / 255; 1682 r = (r * a0 + tex.r * a1) / 255;
1347 g = (g * a0 + tex.g * a1) / 255; 1683 g = (g * a0 + tex.g * a1) / 255;
1348 b = (b * a0 + tex.b * a1) / 255; 1684 b = (b * a0 + tex.b * a1) / 255;
1349 a = (a * a0 + tex.a * a1) / 255; 1685 a = (a * a0 + tex.a * a1) / 255;
1350 }
1351 } 1686 }
1352 } 1687 }
1353 1688
1354 *map++ = (r ) 1689 *map++ = (r )
1355 | (g << 8) 1690 | (g << 8)
1362} 1697}
1363 OUTPUT: 1698 OUTPUT:
1364 RETVAL 1699 RETVAL
1365 1700
1366void 1701void
1367draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1368 CODE: 1703 CODE:
1369{ 1704{
1370 int vx, vy; 1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1708 smooth_key skey;
1371 int x, y, z; 1709 int x, y, z;
1372 int last_name; 1710 int last_name;
1373 mapface face;
1374 1711
1375 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1712 // thats current max. sorry.
1376 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1713 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255;
1377 1715
1378 /* 1716 // clear key, in case of extra padding
1379 int vx = self->vx = self->w >= sw 1717 memset (&skey, 0, sizeof (skey));
1380 ? self->x + (self->w - sw) / 2
1381 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1382
1383 int vy = self->vy = self->h >= sh
1384 ? self->y + (self->h - sh) / 2
1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1386 */
1387 1718
1388 glColor4ub (255, 255, 255, 255); 1719 glColor4ub (255, 255, 255, 255);
1389 1720
1390 glEnable (GL_BLEND); 1721 glEnable (GL_BLEND);
1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1394 1725
1395 glBegin (GL_QUADS); 1726 glBegin (GL_QUADS);
1396 1727
1397 last_name = 0; 1728 last_name = 0;
1398 1729
1730 mx += self->x;
1731 my += self->y;
1732
1733 // first pass: determine smooth_max
1734 // rather ugly, if you ask me
1735 // could also be stored inside mapcell and updated on change
1736 memset (smooth_max, 0, sizeof (smooth_max));
1737
1738 for (y = 0; y < sh; y++)
1739 if (0 <= y + my && y + my < self->rows)
1740 {
1741 maprow *row = self->row + (y + my);
1742
1743 for (x = 0; x < sw; x++)
1744 if (row->c0 <= x + mx && x + mx < row->c1)
1745 {
1746 mapcell *cell = row->col + (x + mx - row->c0);
1747
1748 smooth_max[x + 1][y + 1] =
1749 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel));
1752 }
1753 }
1754
1399 for (z = 0; z < 3; z++) 1755 for (z = 0; z <= 2; z++)
1756 {
1757 memset (smooth_level, 0, sizeof (smooth_level));
1758
1400 for (y = 0; y < sh; y++) 1759 for (y = 0; y < sh; y++)
1401 if (0 <= y + vy && y + vy < self->rows) 1760 if (0 <= y + my && y + my < self->rows)
1402 { 1761 {
1403 maprow *row = self->row + (y + vy); 1762 maprow *row = self->row + (y + my);
1404 1763
1405 for (x = 0; x < sw; x++) 1764 for (x = 0; x < sw; x++)
1406 if (row->c0 <= x + vx && x + vx < row->c1) 1765 if (row->c0 <= x + mx && x + mx < row->c1)
1407 { 1766 {
1408 mapcell *cell = row->col + (x + vx - row->c0); 1767 mapcell *cell = row->col + (x + mx - row->c0);
1409
1410 face = cell->face [z]; 1768 tileid tile = cell->tile [z];
1411 1769
1412 if (face) 1770 if (tile)
1771 {
1772 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w;
1774 int py = (y + 1) * T - tex.h;
1775
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name)
1779 {
1780 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */
1782
1783 glEnd ();
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1785 glBegin (GL_QUADS);
1786 }
1787
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793 if (cell->flags && z == 2)
1794 {
1795 if (cell->flags & 1)
1796 {
1797 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32;
1800
1801 glEnd ();
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1803 glBegin (GL_QUADS);
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 }
1810 }
1811
1812 // update smooth hash
1813 if (tex.smoothtile)
1814 {
1815 skey.tile = tex.smoothtile;
1816 skey.level = tex.smoothlevel;
1817
1818 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1819
1820 // add bits to current tile and all neighbours. skey.x|y is
1821 // shifted +1|+1 so we always stay positive.
1822
1823 // bits is ___n cccc CCCC bbbb
1824 // n do not draw borders&corners
1825 // c draw these corners, but...
1826 // C ... not these
1827 // b draw these borders
1828
1829 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1830 // ┃· ·· ·┃ ━━
1831
1832 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1833 // ·· ·· ·┏ ┓·
1834
1835 // full tile
1836 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1837
1838 // borders
1839 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1840 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1841 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1842 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1843
1844 // corners
1845 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1846 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1847 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1848 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1849 }
1850 }
1851 }
1852 }
1853
1854 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort
1856 {
1857 int w, b;
1858
1859 for (w = 0; w < 256 / 32; ++w)
1860 {
1861 uint32_t smask = smooth_level [w];
1862 if (smask)
1863 for (b = 0; b < 32; ++b)
1864 if (smask & (((uint32_t)1) << b))
1413 { 1865 {
1414 maptex tex = self->tex [face]; 1866 int level = (w << 5) | b;
1867 HE *he;
1415 1868
1416 int px = (x + 1) * 32 - tex.w; 1869 hv_iterinit (smooth);
1417 int py = (y + 1) * 32 - tex.h; 1870 while ((he = hv_iternext (smooth)))
1418
1419 if (last_name != tex.name)
1420 { 1871 {
1872 smooth_key *skey = (smooth_key *)HeKEY (he);
1873 IV bits = SvIVX (HeVAL (he));
1874
1875 if (!(bits & 0x1000)
1876 && skey->level == level
1877 && level > smooth_max [skey->x][skey->y])
1878 {
1879 maptex tex = self->tex [skey->tile];
1880 int px = (((int)skey->x) - 1) * T;
1881 int py = (((int)skey->y) - 1) * T;
1882 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column
1886
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name)
1890 {
1891 if (!tex.name)
1892 continue; // smoothing not yet available
1893
1421 glEnd (); 1894 glEnd ();
1422 last_name = tex.name;
1423 glBindTexture (GL_TEXTURE_2D, last_name); 1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424 glBegin (GL_QUADS); 1896 glBegin (GL_QUADS);
1897 }
1898
1899 if (border)
1900 {
1901 float ox = border * dx;
1902
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1907 }
1908
1909 if (corner)
1910 {
1911 float ox = corner * dx;
1912
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1917 }
1918 }
1425 } 1919 }
1426
1427 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431 } 1920 }
1432 }
1433 } 1921 }
1922 }
1923
1924 hv_clear (smooth);
1925 }
1434 1926
1435 glEnd (); 1927 glEnd ();
1436 1928
1437 glDisable (GL_TEXTURE_2D); 1929 glDisable (GL_TEXTURE_2D);
1438 glDisable (GL_BLEND); 1930 glDisable (GL_BLEND);
1931
1932 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows)
1935 {
1936 maprow *row = self->row + (y + my);
1937
1938 for (x = 0; x < sw; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1)
1940 {
1941 mapcell *cell = row->col + (x + mx - row->c0);
1942
1943 int px = x * T;
1944 int py = y * T;
1945
1946 if (cell->stat_hp)
1947 {
1948 int width = cell->stat_width * T;
1949 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1950
1951 glColor3ub (0, 0, 0);
1952 glRectf (px + 1, py - thick - 2,
1953 px + width - 1, py);
1954
1955 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1956 glRectf (px + 2,
1957 py - thick - 1,
1958 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1959 }
1960 }
1961 }
1439} 1962}
1440 1963
1441void 1964void
1442draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1965draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE: 1966 CODE:
1497 glDisable (GL_BLEND); 2020 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D); 2021 glDisable (GL_TEXTURE_2D);
1499} 2022}
1500 2023
1501void 2024void
1502fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503 PPCODE: 2026 PPCODE:
1504{ 2027{
1505 int vx, vy;
1506 int x, y; 2028 int x, y;
2029 int sw1 = sw + 2;
2030 int sh1 = sh + 2;
2031 int sh3 = sh * 3;
1507 int sw4 = (sw + 3) & ~3; 2032 int sw34 = (sw * 3 + 3) & ~3;
2033 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2034 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2035 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1510 2036
1511 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv); 2037 SvPOK_only (darkness3_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh); 2038 SvCUR_set (darkness3_sv, sw34 * sh3);
1514 2039
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2040 mx += self->x - 1;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2041 my += self->y - 1;
1517 2042
2043 memset (darkness1, 255, sw1 * sh1);
2044
1518 for (y = 0; y < sh; y++) 2045 for (y = 0; y < sh1; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 2046 if (0 <= y + my && y + my < self->rows)
1520 { 2047 {
1521 maprow *row = self->row + (y + vy); 2048 maprow *row = self->row + (y + my);
1522 2049
1523 for (x = 0; x < sw; x++) 2050 for (x = 0; x < sw1; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 2051 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 2052 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 2053 mapcell *cell = row->col + (x + mx - row->c0);
1527 2054
1528 darkness[y * sw4 + x] = cell->darkness < 0 2055 darkness1 [y * sw1 + x] = cell->darkness
2056 ? 255 - (cell->darkness - 1)
1529 ? 255 - FOW_DARKNESS 2057 : 255 - FOW_DARKNESS;
1530 : 255 - cell->darkness;
1531 } 2058 }
1532 } 2059 }
1533 2060
2061 for (y = 0; y < sh; ++y)
2062 for (x = 0; x < sw; ++x)
2063 {
2064 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2065 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2066 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2067 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2068 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2069 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2070 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2071 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2072 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2073
2074 uint8_t r11 = (d11 + d21 + d12) / 3;
2075 uint8_t r21 = d21;
2076 uint8_t r31 = (d21 + d31 + d32) / 3;
2077
2078 uint8_t r12 = d12;
2079 uint8_t r22 = d22;
2080 uint8_t r32 = d32;
2081
2082 uint8_t r13 = (d13 + d23 + d12) / 3;
2083 uint8_t r23 = d23;
2084 uint8_t r33 = (d23 + d33 + d32) / 3;
2085
2086 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2087 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2088 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2089 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2090 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2091 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2092 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2093 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2094 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2095 }
2096
2097 free (darkness1);
2098
1534 EXTEND (SP, 3); 2099 EXTEND (SP, 3);
1535 PUSHs (sv_2mortal (newSViv (sw4))); 2100 PUSHs (sv_2mortal (newSViv (sw34)));
1536 PUSHs (sv_2mortal (newSViv (sh))); 2101 PUSHs (sv_2mortal (newSViv (sh3)));
1537 PUSHs (darkness_sv); 2102 PUSHs (darkness3_sv);
1538} 2103}
1539 2104
1540SV * 2105SV *
1541get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542 CODE: 2107 CODE:
1571 if (row && row->c0 <= x && x < row->c1) 2136 if (row && row->c0 <= x && x < row->c1)
1572 { 2137 {
1573 mapcell *cell = row->col + (x - row->c0); 2138 mapcell *cell = row->col + (x - row->c0);
1574 uint8_t flags = 0; 2139 uint8_t flags = 0;
1575 2140
1576 if (cell->face [0]) flags |= 1; 2141 if (cell->tile [0]) flags |= 1;
1577 if (cell->face [1]) flags |= 2; 2142 if (cell->tile [1]) flags |= 2;
1578 if (cell->face [2]) flags |= 4; 2143 if (cell->tile [2]) flags |= 4;
1579 2144
1580 *data++ = flags; 2145 *data++ = flags;
1581 2146
1582 if (flags & 1) 2147 if (flags & 1)
1583 { 2148 {
2149 tileid tile = cell->tile [0];
1584 *data++ = cell->face [0] >> 8; 2150 *data++ = tile >> 8;
1585 *data++ = cell->face [0]; 2151 *data++ = tile;
1586 } 2152 }
1587 2153
1588 if (flags & 2) 2154 if (flags & 2)
1589 { 2155 {
2156 tileid tile = cell->tile [1];
1590 *data++ = cell->face [1] >> 8; 2157 *data++ = tile >> 8;
1591 *data++ = cell->face [1]; 2158 *data++ = tile;
1592 } 2159 }
1593 2160
1594 if (flags & 4) 2161 if (flags & 4)
1595 { 2162 {
2163 tileid tile = cell->tile [2];
1596 *data++ = cell->face [2] >> 8; 2164 *data++ = tile >> 8;
1597 *data++ = cell->face [2]; 2165 *data++ = tile;
1598 } 2166 }
1599 } 2167 }
1600 else 2168 else
1601 *data++ = 0; 2169 *data++ = 0;
1602 } 2170 }
1642 { 2210 {
1643 uint8_t flags = *data++; 2211 uint8_t flags = *data++;
1644 2212
1645 if (flags) 2213 if (flags)
1646 { 2214 {
1647 mapface face[3] = { 0, 0, 0 };
1648
1649 mapcell *cell = row_get_cell (row, x); 2215 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 };
1650 2217
1651 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2218 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1652 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1653 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1654 2221
1655 if (cell->darkness <= 0) 2222 if (cell->darkness == 0)
1656 { 2223 {
1657 cell->darkness = -1; 2224 cell->darkness = 0;
1658 2225
1659 for (z = 0; z <= 2; z++) 2226 for (z = 0; z <= 2; z++)
1660 { 2227 {
1661 cell->face[z] = face[z]; 2228 tileid t = tile [z];
1662 2229
1663 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2230 if (t >= self->texs || (t && !self->tex [t].name))
2231 {
1664 XPUSHs (sv_2mortal (newSViv (face[z]))); 2232 XPUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t);
2234 }
2235
2236 cell->tile [z] = t;
1665 } 2237 }
1666 } 2238 }
1667 } 2239 }
1668 } 2240 }
1669 } 2241 }
1670} 2242}
1671 2243
2244MODULE = CFPlus PACKAGE = CFPlus::RW
2245
2246CFPlus::RW
2247new (SV *class, SV *data_sv)
2248 CODE:
2249{
2250 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen);
2252
2253 RETVAL = SDL_RWFromConstMem (data, datalen);
2254}
2255 OUTPUT:
2256 RETVAL
2257
2258CFPlus::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT:
2263 RETVAL
2264
2265void
2266close (CFPlus::RW self)
2267 CODE:
2268 SDL_RWclose (self);
2269
2270MODULE = CFPlus PACKAGE = CFPlus::Channel
2271
2272PROTOTYPES: DISABLE
2273
2274void
2275halt (CFPlus::Channel self)
2276 CODE:
2277 Mix_HaltChannel (self);
2278
2279void
2280expire (CFPlus::Channel self, int ticks = -1)
2281 CODE:
2282 Mix_ExpireChannel (self, ticks);
2283
2284void
2285fade_out (CFPlus::Channel self, int ticks = -1)
2286 CODE:
2287 Mix_FadeOutChannel (self, ticks);
2288
2289int
2290volume (CFPlus::Channel self, int volume)
2291 CODE:
2292 RETVAL = Mix_Volume (self, volume);
2293 OUTPUT:
2294 RETVAL
2295
2296void
2297unregister_all_effects (CFPlus::Channel self)
2298 CODE:
2299 Mix_UnregisterAllEffects (self);
2300
2301void
2302set_panning (CFPlus::Channel self, int left, int right)
2303 CODE:
2304 Mix_SetPanning (self, left, right);
2305
2306void
2307set_distance (CFPlus::Channel self, int distance)
2308 CODE:
2309 Mix_SetDistance (self, distance);
2310
2311void
2312set_position (CFPlus::Channel self, int angle, int distance)
2313 CODE:
2314 Mix_SetPosition (self, angle, distance);
2315
2316void
2317set_reverse_stereo (CFPlus::Channel self, int flip)
2318 CODE:
2319 Mix_SetReverseStereo (self, flip);
2320
1672MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2321MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673 2322
2323PROTOTYPES: DISABLE
2324
1674CFPlus::MixChunk 2325CFPlus::MixChunk
1675new_from_file (SV *class, char *path) 2326new (SV *class, CFPlus::RW rwops)
1676 CODE: 2327 CODE:
1677 RETVAL = Mix_LoadWAV (path); 2328 RETVAL = Mix_LoadWAV_RW (rwops, 1);
1678 OUTPUT: 2329 OUTPUT:
1679 RETVAL 2330 RETVAL
1680 2331
1681void 2332void
1682DESTROY (CFPlus::MixChunk self) 2333DESTROY (CFPlus::MixChunk self)
1688 CODE: 2339 CODE:
1689 RETVAL = Mix_VolumeChunk (self, volume); 2340 RETVAL = Mix_VolumeChunk (self, volume);
1690 OUTPUT: 2341 OUTPUT:
1691 RETVAL 2342 RETVAL
1692 2343
1693int 2344CFPlus::Channel
1694play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2345play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695 CODE: 2346 CODE:
1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2347 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2348 Mix_UnregisterAllEffects (RETVAL);
1697 OUTPUT: 2349 OUTPUT:
1698 RETVAL 2350 RETVAL
1699 2351
1700MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2352MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701 2353
1702int 2354int
1703volume (int volume = -1) 2355volume (int volume = -1)
2356 PROTOTYPE: ;$
1704 CODE: 2357 CODE:
1705 RETVAL = Mix_VolumeMusic (volume); 2358 RETVAL = Mix_VolumeMusic (volume);
1706 OUTPUT: 2359 OUTPUT:
1707 RETVAL 2360 RETVAL
1708 2361
2362void
2363fade_out (int ms)
2364 CODE:
2365 Mix_FadeOutMusic (ms);
2366
2367void
2368halt ()
2369 CODE:
2370 Mix_HaltMusic ();
2371
1709CFPlus::MixMusic 2372CFPlus::MixMusic
1710new_from_file (SV *class, char *path) 2373new (SV *class, CFPlus::RW rwops)
1711 CODE: 2374 CODE:
1712 RETVAL = Mix_LoadMUS (path); 2375 RETVAL = Mix_LoadMUS_RW (rwops);
1713 OUTPUT: 2376 OUTPUT:
1714 RETVAL 2377 RETVAL
1715 2378
1716void 2379void
1717DESTROY (CFPlus::MixMusic self) 2380DESTROY (CFPlus::MixMusic self)
1723 CODE: 2386 CODE:
1724 RETVAL = Mix_PlayMusic (self, loops); 2387 RETVAL = Mix_PlayMusic (self, loops);
1725 OUTPUT: 2388 OUTPUT:
1726 RETVAL 2389 RETVAL
1727 2390
2391void
2392fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2393 CODE:
2394 Mix_FadeInMusicPos (self, loops, ms, position);
2395
1728MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2396MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2397
2398PROTOTYPES: ENABLE
1729 2399
1730BOOT: 2400BOOT:
1731{ 2401{
1732 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2402 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733 static const struct { 2403 static const struct {
1734 const char *name; 2404 const char *name;
1735 IV iv; 2405 IV iv;
1736 } *civ, const_iv[] = { 2406 } *civ, const_iv[] = {
1737# define const_iv(name) { # name, (IV)name } 2407# define const_iv(name) { # name, (IV)name }
2408 const_iv (GL_VENDOR),
2409 const_iv (GL_VERSION),
2410 const_iv (GL_EXTENSIONS),
1738 const_iv (GL_COLOR_MATERIAL), 2411 const_iv (GL_COLOR_MATERIAL),
1739 const_iv (GL_SMOOTH), 2412 const_iv (GL_SMOOTH),
1740 const_iv (GL_FLAT), 2413 const_iv (GL_FLAT),
1741 const_iv (GL_DITHER), 2414 const_iv (GL_DITHER),
1742 const_iv (GL_BLEND), 2415 const_iv (GL_BLEND),
1746 const_iv (GL_ALPHA_TEST), 2419 const_iv (GL_ALPHA_TEST),
1747 const_iv (GL_NORMALIZE), 2420 const_iv (GL_NORMALIZE),
1748 const_iv (GL_RESCALE_NORMAL), 2421 const_iv (GL_RESCALE_NORMAL),
1749 const_iv (GL_FRONT), 2422 const_iv (GL_FRONT),
1750 const_iv (GL_BACK), 2423 const_iv (GL_BACK),
2424 const_iv (GL_AUX0),
1751 const_iv (GL_AND), 2425 const_iv (GL_AND),
1752 const_iv (GL_ONE), 2426 const_iv (GL_ONE),
1753 const_iv (GL_ZERO), 2427 const_iv (GL_ZERO),
1754 const_iv (GL_SRC_ALPHA), 2428 const_iv (GL_SRC_ALPHA),
1755 const_iv (GL_DST_ALPHA), 2429 const_iv (GL_DST_ALPHA),
1769 const_iv (GL_LUMINANCE), 2443 const_iv (GL_LUMINANCE),
1770 const_iv (GL_LUMINANCE_ALPHA), 2444 const_iv (GL_LUMINANCE_ALPHA),
1771 const_iv (GL_FLOAT), 2445 const_iv (GL_FLOAT),
1772 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2446 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1773 const_iv (GL_COMPILE), 2447 const_iv (GL_COMPILE),
2448 const_iv (GL_PROXY_TEXTURE_1D),
2449 const_iv (GL_PROXY_TEXTURE_2D),
1774 const_iv (GL_TEXTURE_1D), 2450 const_iv (GL_TEXTURE_1D),
1775 const_iv (GL_TEXTURE_2D), 2451 const_iv (GL_TEXTURE_2D),
1776 const_iv (GL_TEXTURE_ENV), 2452 const_iv (GL_TEXTURE_ENV),
1777 const_iv (GL_TEXTURE_MAG_FILTER), 2453 const_iv (GL_TEXTURE_MAG_FILTER),
1778 const_iv (GL_TEXTURE_MIN_FILTER), 2454 const_iv (GL_TEXTURE_MIN_FILTER),
1799 const_iv (GL_COLOR_LOGIC_OP), 2475 const_iv (GL_COLOR_LOGIC_OP),
1800 const_iv (GL_SEPARABLE_2D), 2476 const_iv (GL_SEPARABLE_2D),
1801 const_iv (GL_CONVOLUTION_2D), 2477 const_iv (GL_CONVOLUTION_2D),
1802 const_iv (GL_CONVOLUTION_BORDER_MODE), 2478 const_iv (GL_CONVOLUTION_BORDER_MODE),
1803 const_iv (GL_CONSTANT_BORDER), 2479 const_iv (GL_CONSTANT_BORDER),
2480 const_iv (GL_POINTS),
1804 const_iv (GL_LINES), 2481 const_iv (GL_LINES),
2482 const_iv (GL_LINE_STRIP),
1805 const_iv (GL_LINE_LOOP), 2483 const_iv (GL_LINE_LOOP),
1806 const_iv (GL_QUADS), 2484 const_iv (GL_QUADS),
1807 const_iv (GL_QUAD_STRIP), 2485 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES), 2486 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP), 2487 const_iv (GL_TRIANGLE_STRIP),
1810 const_iv (GL_TRIANGLE_FAN), 2488 const_iv (GL_TRIANGLE_FAN),
2489 const_iv (GL_POLYGON),
1811 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2490 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2491 const_iv (GL_POINT_SMOOTH_HINT),
2492 const_iv (GL_LINE_SMOOTH_HINT),
2493 const_iv (GL_POLYGON_SMOOTH_HINT),
2494 const_iv (GL_GENERATE_MIPMAP_HINT),
1812 const_iv (GL_FASTEST), 2495 const_iv (GL_FASTEST),
2496 const_iv (GL_DONT_CARE),
2497 const_iv (GL_NICEST),
1813 const_iv (GL_V2F), 2498 const_iv (GL_V2F),
1814 const_iv (GL_V3F), 2499 const_iv (GL_V3F),
1815 const_iv (GL_T2F_V3F), 2500 const_iv (GL_T2F_V3F),
1816 const_iv (GL_T2F_N3F_V3F), 2501 const_iv (GL_T2F_N3F_V3F),
1817# undef const_iv 2502# undef const_iv
1818 }; 2503 };
1819 2504
1820 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2505 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1821 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2506 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2507
2508 texture_av = newAV ();
2509 AvREAL_off (texture_av);
1822} 2510}
1823 2511
1824char * 2512char *
1825gl_vendor () 2513gl_vendor ()
1826 CODE: 2514 CODE:
1840 CODE: 2528 CODE:
1841 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2529 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1842 OUTPUT: 2530 OUTPUT:
1843 RETVAL 2531 RETVAL
1844 2532
2533const char *glGetString (GLenum pname)
2534
2535GLint glGetInteger (GLenum pname)
2536 CODE:
2537 glGetIntegerv (pname, &RETVAL);
2538 OUTPUT:
2539 RETVAL
2540
2541GLdouble glGetDouble (GLenum pname)
2542 CODE:
2543 glGetDoublev (pname, &RETVAL);
2544 OUTPUT:
2545 RETVAL
2546
1845int glGetError () 2547int glGetError ()
1846 2548
1847void glFinish () 2549void glFinish ()
1848 2550
1849void glClear (int mask) 2551void glClear (int mask)
1886# near_ and far_ are due to microsofts buggy "c" compiler 2588# near_ and far_ are due to microsofts buggy "c" compiler
1887void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2589void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1888 2590
1889# near_ and far_ are due to microsofts buggy "c" compiler 2591# near_ and far_ are due to microsofts buggy "c" compiler
1890void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2592void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2593
2594PROTOTYPES: DISABLE
1891 2595
1892void glViewport (int x, int y, int width, int height) 2596void glViewport (int x, int y, int width, int height)
1893 2597
1894void glScissor (int x, int y, int width, int height) 2598void glScissor (int x, int y, int width, int height)
1895 2599
1903 2607
1904void glRotate (float angle, float x, float y, float z) 2608void glRotate (float angle, float x, float y, float z)
1905 CODE: 2609 CODE:
1906 glRotatef (angle, x, y, z); 2610 glRotatef (angle, x, y, z);
1907 2611
1908void glBegin (int mode)
1909
1910void glEnd ()
1911
1912void glColor (float r, float g, float b, float a = 1.0) 2612void glColor (float r, float g, float b, float a = 1.0)
1913 PROTOTYPE: @
1914 ALIAS: 2613 ALIAS:
1915 glColor_premultiply = 1 2614 glColor_premultiply = 1
1916 CODE: 2615 CODE:
1917 if (ix) 2616 if (ix)
1918 { 2617 {
1921 b *= a; 2620 b *= a;
1922 } 2621 }
1923 // microsoft visual "c" rounds instead of truncating... 2622 // microsoft visual "c" rounds instead of truncating...
1924 glColor4f (r, g, b, a); 2623 glColor4f (r, g, b, a);
1925 2624
1926void glInterleavedArrays (int format, int stride, char *data)
1927
1928void glDrawElements (int mode, int count, int type, char *indices)
1929
1930# 1.2 void glDrawRangeElements (int mode, int start, int end
1931
1932void glRasterPos (float x, float y, float z = 0.) 2625void glRasterPos (float x, float y, float z = 0.)
1933 CODE: 2626 CODE:
1934 glRasterPos3f (0, 0, z); 2627 glRasterPos3f (0, 0, z);
1935 glBitmap (0, 0, 0, 0, x, y, 0); 2628 glBitmap (0, 0, 0, 0, x, y, 0);
1936 2629
1940 2633
1941void glTexCoord (float s, float t) 2634void glTexCoord (float s, float t)
1942 CODE: 2635 CODE:
1943 glTexCoord2f (s, t); 2636 glTexCoord2f (s, t);
1944 2637
2638void glRect (float x1, float y1, float x2, float y2)
2639 CODE:
2640 glRectf (x1, y1, x2, y2);
2641
2642PROTOTYPES: ENABLE
2643
2644void glBegin (int mode)
2645
2646void glEnd ()
2647
2648void glPointSize (GLfloat size)
2649
2650void glLineWidth (GLfloat width)
2651
2652void glInterleavedArrays (int format, int stride, char *data)
2653
2654void glDrawElements (int mode, int count, int type, char *indices)
2655
2656# 1.2 void glDrawRangeElements (int mode, int start, int end
2657
1945void glTexEnv (int target, int pname, float param) 2658void glTexEnv (int target, int pname, float param)
1946 CODE: 2659 CODE:
1947 glTexEnvf (target, pname, param); 2660 glTexEnvf (target, pname, param);
1948 2661
1949void glTexParameter (int target, int pname, float param) 2662void glTexParameter (int target, int pname, float param)
1971 2684
1972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2685void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1973 2686
1974void glDrawPixels (int width, int height, int format, int type, char *pixels) 2687void glDrawPixels (int width, int height, int format, int type, char *pixels)
1975 2688
2689void glPixelZoom (float x, float y)
2690
1976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2691void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1977 2692
1978int glGenTexture () 2693int glGenTexture ()
1979 CODE: 2694 CODE:
1980{ 2695 RETVAL = gen_texture ();
1981 GLuint name;
1982 glGenTextures (1, &name);
1983 RETVAL = name;
1984}
1985 OUTPUT: 2696 OUTPUT:
1986 RETVAL 2697 RETVAL
1987 2698
1988void glDeleteTexture (int name) 2699void glDeleteTexture (int name)
1989 CODE: 2700 CODE:
1990{
1991 GLuint name_ = name;
1992 glDeleteTextures (1, &name_); 2701 del_texture (name);
1993} 2702
1994
1995int glGenList () 2703int glGenList ()
1996 CODE: 2704 CODE:
1997 RETVAL = glGenLists (1); 2705 RETVAL = glGenLists (1);
1998 OUTPUT: 2706 OUTPUT:
1999 RETVAL 2707 RETVAL
2006 2714
2007void glEndList () 2715void glEndList ()
2008 2716
2009void glCallList (int list) 2717void glCallList (int list)
2010 2718
2719MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2011 2720
2721PROTOTYPES: DISABLE
2722
2723void
2724find_widget (SV *self, NV x, NV y)
2725 PPCODE:
2726{
2727 if (within_widget (self, x, y))
2728 XPUSHs (self);
2729}
2730
2731BOOT:
2732{
2733 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2734
2735 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2736 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2737 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2738 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2739}
2740
2741void
2742draw (SV *self)
2743 CODE:
2744{
2745 HV *hv;
2746 SV **svp;
2747 NV x, y, w, h;
2748 SV *draw_x_sv = GvSV (draw_x_gv);
2749 SV *draw_y_sv = GvSV (draw_y_gv);
2750 SV *draw_w_sv = GvSV (draw_w_gv);
2751 SV *draw_h_sv = GvSV (draw_h_gv);
2752 SV *hover;
2753 double draw_x, draw_y, draw_w, draw_h;
2754
2755 if (!SvROK (self))
2756 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2757
2758 hv = (HV *)SvRV (self);
2759
2760 if (SvTYPE (hv) != SVt_PVHV)
2761 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2762
2763 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2764 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2765
2766 if (!h || !w)
2767 XSRETURN_EMPTY;
2768
2769 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2770 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2771
2772 draw_x = SvNV (draw_x_sv) + x;
2773 draw_y = SvNV (draw_y_sv) + y;
2774
2775 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2776 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2777 XSRETURN_EMPTY;
2778
2779 sv_setnv (draw_x_sv, draw_x);
2780 sv_setnv (draw_y_sv, draw_y);
2781
2782 glPushMatrix ();
2783 glTranslated (x, y, 0);
2784
2785 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2786 {
2787 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2788
2789 if (svp && SvTRUE (*svp))
2790 {
2791 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2792 glEnable (GL_BLEND);
2793 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2794 glBegin (GL_QUADS);
2795 glVertex2f (0, 0);
2796 glVertex2f (w, 0);
2797 glVertex2f (w, h);
2798 glVertex2f (0, h);
2799 glEnd ();
2800 glDisable (GL_BLEND);
2801 }
2802 }
2803#if 0
2804 if ($ENV{CFPLUS_DEBUG} & 1) {
2805 glPushMatrix;
2806 glColor 1, 1, 0, 1;
2807 glTranslate 0.375, 0.375;
2808 glBegin GL_LINE_LOOP;
2809 glVertex 0 , 0;
2810 glVertex $self->{w} - 1, 0;
2811 glVertex $self->{w} - 1, $self->{h} - 1;
2812 glVertex 0 , $self->{h} - 1;
2813 glEnd;
2814 glPopMatrix;
2815 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2816 }
2817#endif
2818 PUSHMARK (SP);
2819 XPUSHs (self);
2820 PUTBACK;
2821 call_method ("_draw", G_VOID | G_DISCARD);
2822 SPAGAIN;
2823
2824 glPopMatrix ();
2825
2826 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2827 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2828}
2829

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines