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.157 by root, Sun Oct 1 14:48:50 2006 UTC vs.
Revision 1.219 by root, Mon Aug 6 05:06:32 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# include <wininet.h>
7# 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>
8#endif 14#endif
9 15
10#include "EXTERN.h" 16#include "EXTERN.h"
11#include "perl.h" 17#include "perl.h"
12#include "XSUB.h" 18#include "XSUB.h"
13 19
14#ifdef _WIN32 20#ifdef _WIN32
15# undef pipe 21# undef pipe
16#endif 22#endif
17 23
24#include <assert.h>
18#include <math.h> 25#include <math.h>
19#include <string.h> 26#include <string.h>
20#include <stdio.h> 27#include <stdio.h>
21#include <stdlib.h> 28#include <stdlib.h>
22 29
30#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
31
23#include <SDL.h> 32#include <SDL.h>
33#include <SDL_thread.h>
24#include <SDL_endian.h> 34#include <SDL_endian.h>
25#include <SDL_image.h> 35#include <SDL_image.h>
26#include <SDL_mixer.h> 36#include <SDL_mixer.h>
27#include <SDL_opengl.h> 37#include <SDL_opengl.h>
28 38
37# include <sys/types.h> 47# include <sys/types.h>
38# include <sys/socket.h> 48# include <sys/socket.h>
39# include <netinet/in.h> 49# include <netinet/in.h>
40# include <netinet/tcp.h> 50# include <netinet/tcp.h>
41# include <inttypes.h> 51# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 52#endif
50 53
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 55
53#define FOW_DARKNESS 32 56#define FOW_DARKNESS 32
54 57
55#define MAP_EXTEND_X 32 58#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 59#define MAP_EXTEND_Y 512
61# define PARACHUTE SDL_INIT_NOPARACHUTE 64# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else 65#else
63# define PARACHUTE 0 66# define PARACHUTE 0
64#endif 67#endif
65 68
69static AV *texture_av;
70
66static struct 71static struct
67{ 72{
68#define GL_FUNC(ptr,name) ptr name; 73#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h" 74#include "glfunc.h"
70#undef GL_FUNC 75#undef GL_FUNC
71} gl; 76} gl;
72 77
78static void
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 79gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{ 80{
75 if (gl.BlendFuncSeparate) 81 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa); 82 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT) 83 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 84 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else 85 else
80 glBlendFunc (sa, da); 86 glBlendFunc (sa, da);
81} 87}
82 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
83#include "texcache.c" 113#include "texcache.c"
84 114
85#include "pango-font.c" 115#include "pango-font.c"
86#include "pango-fontmap.c" 116#include "pango-fontmap.c"
87#include "pango-render.c" 117#include "pango-render.c"
88 118
119typedef IV CFPlus__Channel;
120typedef SDL_RWops *CFPlus__RW;
89typedef Mix_Chunk *CFPlus__MixChunk; 121typedef Mix_Chunk *CFPlus__MixChunk;
90typedef Mix_Music *CFPlus__MixMusic; 122typedef Mix_Music *CFPlus__MixMusic;
91 123
92typedef PangoFontDescription *CFPlus__Font; 124typedef PangoFontDescription *CFPlus__Font;
93 125
160 192
161 *w = rect.width; 193 *w = rect.width;
162 *h = rect.height; 194 *h = rect.height;
163} 195}
164 196
197typedef uint16_t tileid;
165typedef uint16_t mapface; 198typedef uint16_t faceid;
166 199
167typedef struct { 200typedef struct {
168 GLint name; 201 int name;
169 int w, h; 202 int w, h;
170 float s, t; 203 float s, t;
171 uint8_t r, g, b, a; 204 uint8_t r, g, b, a;
205 tileid smoothtile;
206 uint8_t smoothlevel;
172} maptex; 207} maptex;
173 208
174typedef struct { 209typedef struct {
175 uint32_t player; 210 uint32_t player;
176 mapface face[3]; 211 tileid tile[3];
177 uint16_t darkness; 212 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags; 213 uint8_t stat_width, stat_hp, flags, smoothmax;
179} mapcell; 214} mapcell;
180 215
181typedef struct { 216typedef struct {
182 int32_t c0, c1; 217 int32_t c0, c1;
183 mapcell *col; 218 mapcell *col;
184} maprow; 219} maprow;
185 220
186typedef struct map { 221typedef struct map {
187 int x, y, w, h; 222 int x, y, w, h;
188 int ox, oy; /* offset to virtual global coordinate system */ 223 int ox, oy; /* offset to virtual global coordinate system */
189 int faces; 224 int faces; tileid *face2tile; // [faceid]
190 mapface *face; 225 int texs; maptex *tex; // [tileid]
191
192 int texs;
193 maptex *tex;
194 226
195 int32_t rows; 227 int32_t rows;
196 maprow *row; 228 maprow *row;
197} *CFPlus__Map; 229} *CFPlus__Map;
198 230
218 return ptr; 250 return ptr;
219} 251}
220 252
221#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))
222#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}
223 275
224static maprow * 276static maprow *
225map_get_row (CFPlus__Map self, int y) 277map_get_row (CFPlus__Map self, int y)
226{ 278{
227 if (0 > y) 279 if (0 > y)
322 cell->player = 0; 374 cell->player = 0;
323 } 375 }
324 } 376 }
325} 377}
326 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);
393}
394
327static void 395static void
328music_finished (void) 396music_finished (void)
329{ 397{
330 SDL_UserEvent ev; 398 SDL_UserEvent ev;
331 399
363 n |= n >> 4; 431 n |= n >> 4;
364 n |= n >> 8; 432 n |= n >> 8;
365 n |= n >> 16; 433 n |= n >> 16;
366 434
367 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;
368} 483}
369 484
370MODULE = CFPlus PACKAGE = CFPlus 485MODULE = CFPlus PACKAGE = CFPlus
371 486
372PROTOTYPES: ENABLE 487PROTOTYPES: ENABLE
377 static const struct { 492 static const struct {
378 const char *name; 493 const char *name;
379 IV iv; 494 IV iv;
380 } *civ, const_iv[] = { 495 } *civ, const_iv[] = {
381# 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
382 const_iv (SDL_ACTIVEEVENT), 500 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 501 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 502 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 503 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 504 const_iv (SDL_MOUSEBUTTONDOWN),
395 const_iv (SDL_EVENT_RESERVEDA), 513 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 514 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 515 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 516 const_iv (SDL_VIDEOEXPOSE),
399 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
400 const_iv (SDLK_KP0), 523 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 524 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 525 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 526 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 527 const_iv (SDLK_KP4),
459 const_iv (SDLK_BREAK), 582 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 583 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 584 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 585 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 586 const_iv (SDLK_UNDO),
587
464 const_iv (KMOD_NONE), 588 const_iv (KMOD_NONE),
589 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 590 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 591 const_iv (KMOD_RSHIFT),
592 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 593 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 594 const_iv (KMOD_RCTRL),
595 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 596 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 597 const_iv (KMOD_RALT),
598 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 599 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 600 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 601 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 602 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 603 const_iv (KMOD_MODE),
476 const_iv (KMOD_CTRL),
477 const_iv (KMOD_SHIFT),
478 const_iv (KMOD_ALT),
479 const_iv (KMOD_META)
480# undef const_iv 604# undef const_iv
481 }; 605 };
482 606
483 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; )
484 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);
485} 612}
613
614void
615weaken (SV *rv)
616 PROTOTYPE: $
617 CODE:
618 sv_rvweaken (rv);
486 619
487int 620int
488in_destruct () 621in_destruct ()
489 CODE: 622 CODE:
490 RETVAL = PL_main_cv == Nullcv; 623 RETVAL = PL_main_cv == Nullcv;
502 opengl_fontmap = pango_opengl_font_map_new (); 635 opengl_fontmap = pango_opengl_font_map_new ();
503 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);
504 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
505} 638}
506 639
640char *
641SDL_GetError ()
642
507int 643int
508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
509 645
510void 646void
511SDL_Quit () 647SDL_Quit ()
512 648
513void 649void
514SDL_ListModes () 650SDL_ListModes (int rgb, int alpha)
515 PPCODE: 651 PPCODE:
516{ 652{
517 SDL_Rect **m; 653 SDL_Rect **m;
518 654
519 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 655 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 656 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 657 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 658 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
523 659
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 660 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
526 662
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 663 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
531 667
532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10) 669#if SDL_VERSION_ATLEAST(1,2,10)
534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1); 670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif 672#endif
537 673
538 SDL_EnableUNICODE (1);
539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
540
541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
542 675
543 if (m && m != (SDL_Rect **)-1) 676 if (m && m != (SDL_Rect **)-1)
544 while (*m) 677 while (*m)
545 { 678 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
546 AV *av = newAV (); 681 AV *av = newAV ();
547 av_push (av, newSViv ((*m)->w)); 682 av_push (av, newSViv ((*m)->w));
548 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));
549 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
550 688
551 ++m; 689 ++m;
552 } 690 }
553} 691}
554 692
555char *
556SDL_GetError ()
557
558int 693int
559SDL_SetVideoMode (int w, int h, int fullscreen) 694SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
560 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
561 RETVAL = !!SDL_SetVideoMode ( 705 RETVAL = !!SDL_SetVideoMode (
562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 706 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
563 ); 707 );
708
564 if (RETVAL) 709 if (RETVAL)
565 { 710 {
711 av_clear (texture_av);
712
566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567# 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);
568# include "glfunc.h" 715#include "glfunc.h"
569# undef GL_FUNC 716#undef GL_FUNC
570 } 717 }
718}
571 OUTPUT: 719 OUTPUT:
572 RETVAL 720 RETVAL
573 721
574void 722void
575SDL_GL_SwapBuffers () 723SDL_GL_SwapBuffers ()
576 724
577char * 725char *
578SDL_GetKeyName (int sym) 726SDL_GetKeyName (int sym)
579 727
728int
729SDL_GetAppState ()
730
580void 731void
581SDL_PollEvent () 732poll_events ()
582 PPCODE: 733 PPCODE:
583{ 734{
584 SDL_Event ev; 735 SDL_Event ev;
585 736
586 while (SDL_PollEvent (&ev)) 737 SDL_PumpEvents ();
738 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587 { 739 {
588 HV *hv = newHV (); 740 HV *hv = newHV ();
589 hv_store (hv, "type", 4, newSViv (ev.type), 0); 741 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590 742
591 switch (ev.type) 743 switch (ev.type)
593 case SDL_KEYDOWN: 745 case SDL_KEYDOWN:
594 case SDL_KEYUP: 746 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 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 */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 752 break;
600 753
601 case SDL_ACTIVEEVENT: 754 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 756 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604 break; 757 break;
605 758
606 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
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 779 hv_store (hv, "state", 5, newSViv (state), 0);
610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 780 hv_store (hv, "x", 1, newSViv (x), 0);
611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 781 hv_store (hv, "y", 1, newSViv (y), 0);
612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 782 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 783 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 }
614 break; 785 break;
615 786
616 case SDL_MOUSEBUTTONDOWN: 787 case SDL_MOUSEBUTTONDOWN:
617 case SDL_MOUSEBUTTONUP: 788 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
633 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))));
634 } 805 }
635} 806}
636 807
637int 808int
638Mix_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 = 1024)
639 POSTCALL: 810 POSTCALL:
640 Mix_HookMusicFinished (music_finished); 811 Mix_HookMusicFinished (music_finished);
641 Mix_ChannelFinished (channel_finished); 812 Mix_ChannelFinished (channel_finished);
642 813
643void 814void
644Mix_CloseAudio () 815Mix_CloseAudio ()
645 816
646int 817int
647Mix_AllocateChannels (int numchans = -1) 818Mix_AllocateChannels (int numchans = -1)
648 819
820const char *
821Mix_GetError ()
822
649void 823void
650lowdelay (int fd, int val = 1) 824lowdelay (int fd, int val = 1)
651 CODE: 825 CODE:
652#ifndef _WIN32
653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 826 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654#endif
655 827
656void 828void
657win32_proxy_info () 829win32_proxy_info ()
658 PPCODE: 830 PPCODE:
659{ 831{
660#ifdef _WIN32 832#ifdef _WIN32
661 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048]; 833 char buffer[2048];
663 DWORD buflen; 834 DWORD buflen;
664 835
665 EXTEND (SP, 3); 836 EXTEND (SP, 3);
666 837
697 STRLEN image_len; 868 STRLEN image_len;
698 char *image = (char *)SvPVbyte (image_, image_len); 869 char *image = (char *)SvPVbyte (image_, image_len);
699 SDL_Surface *surface, *surface2; 870 SDL_Surface *surface, *surface2;
700 SDL_PixelFormat fmt; 871 SDL_PixelFormat fmt;
701 SDL_RWops *rw = ix 872 SDL_RWops *rw = ix
702 ? SDL_RWFromFile (image, "r") 873 ? SDL_RWFromFile (image, "rb")
703 : SDL_RWFromConstMem (image, image_len); 874 : SDL_RWFromConstMem (image, image_len);
704 875
705 if (!rw) 876 if (!rw)
706 croak ("load_image: %s", SDL_GetError ()); 877 croak ("load_image: %s", SDL_GetError ());
707 878
793 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
794#endif 965#endif
795 _exit (1); 966 _exit (1);
796 967
797void 968void
798_exit (int retval) 969_exit (int retval = 0)
799 CODE: 970 CODE:
971#ifdef WIN32
972 ExitThread (retval); // unclean, please beam me up
973#else
800 _exit (retval); 974 _exit (retval);
975#endif
976
977void
978debug ()
979 CODE:
980{
981#if DEBUG
982 VALGRIND_DO_LEAK_CHECK;
983#endif
984}
801 985
802MODULE = CFPlus PACKAGE = CFPlus::Font 986MODULE = CFPlus PACKAGE = CFPlus::Font
987
988PROTOTYPES: DISABLE
803 989
804CFPlus::Font 990CFPlus::Font
805new_from_file (SV *class, char *path, int id = 0) 991new_from_file (SV *class, char *path, int id = 0)
806 CODE: 992 CODE:
807{ 993{
818 CODE: 1004 CODE:
819 pango_font_description_free (self); 1005 pango_font_description_free (self);
820 1006
821void 1007void
822make_default (CFPlus::Font self) 1008make_default (CFPlus::Font self)
1009 PROTOTYPE: $
823 CODE: 1010 CODE:
824 default_font = self; 1011 default_font = self;
825 1012
826MODULE = CFPlus PACKAGE = CFPlus::Layout 1013MODULE = CFPlus PACKAGE = CFPlus::Layout
827 1014
1015PROTOTYPES: DISABLE
1016
828void 1017void
829reset_glyph_cache () 1018reset_glyph_cache ()
1019 PROTOTYPE:
830 CODE: 1020 CODE:
831 tc_clear (); 1021 tc_clear ();
832 1022
833CFPlus::Layout 1023CFPlus::Layout
834new (SV *class) 1024new (SV *class)
1052xy_to_index (CFPlus::Layout self, int x, int y) 1242xy_to_index (CFPlus::Layout self, int x, int y)
1053 CODE: 1243 CODE:
1054{ 1244{
1055 int index, trailing; 1245 int index, trailing;
1056 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);
1057 RETVAL = index; 1247 RETVAL = index + trailing;
1058} 1248}
1059 OUTPUT: 1249 OUTPUT:
1060 RETVAL 1250 RETVAL
1061 1251
1062void 1252void
1068 1258
1069 EXTEND (SP, 3); 1259 EXTEND (SP, 3);
1070 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1260 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1071 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1072 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1263}
1264
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 }
1073} 1302}
1074 1303
1075void 1304void
1076render (CFPlus::Layout self, float x, float y, int flags = 0) 1305render (CFPlus::Layout self, float x, float y, int flags = 0)
1077 PPCODE: 1306 PPCODE:
1082 flags 1311 flags
1083 ); 1312 );
1084 1313
1085MODULE = CFPlus PACKAGE = CFPlus::Texture 1314MODULE = CFPlus PACKAGE = CFPlus::Texture
1086 1315
1087void 1316PROTOTYPES: ENABLE
1088pad2pot (SV *data_, SV *w_, SV *h_)
1089 CODE:
1090{
1091 int ow = SvIV (w_);
1092 int oh = SvIV (h_);
1093 1317
1094 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_))
1095 { 1325 {
1096 int nw = minpot (ow);
1097 int nh = minpot (oh);
1098
1099 if (nw != ow || nh != oh)
1100 {
1101 if (SvOK (data_))
1102 {
1103 STRLEN datalen; 1326 STRLEN datalen;
1104 char *data = SvPVbyte (data_, datalen); 1327 char *data = SvPVbyte (data_, datalen);
1105 int bpp = datalen / (ow * oh); 1328 int bpp = datalen / (ow * oh);
1106 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1329 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1107 1330
1108 SvPOK_only (result_); 1331 SvPOK_only (result_);
1109 SvCUR_set (result_, nw * nh * bpp); 1332 SvCUR_set (result_, nw * nh * bpp);
1110 1333
1111 memset (SvPVX (result_), 0, nw * nh * bpp); 1334 memset (SvPVX (result_), 0, nw * nh * bpp);
1112 while (oh--) 1335 while (oh--)
1113 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);
1114 1337
1115 sv_setsv (data_, result_); 1338 sv_setsv (data_, result_);
1116 }
1117
1118 sv_setiv (w_, nw);
1119 sv_setiv (h_, nh);
1120 }
1121 } 1339 }
1122} 1340}
1123 1341
1124void 1342void
1125draw_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.)
1131{ 1349{
1132 HV *hv = (HV *)SvRV (self); 1350 HV *hv = (HV *)SvRV (self);
1133 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1351 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1134 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1352 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1135 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1353 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354
1355 if (name <= 0)
1356 XSRETURN_EMPTY;
1136 1357
1137 if (items < 5) 1358 if (items < 5)
1138 { 1359 {
1139 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1360 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1140 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1361 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1168 glDisable (GL_ALPHA_TEST); 1389 glDisable (GL_ALPHA_TEST);
1169 glDisable (GL_BLEND); 1390 glDisable (GL_BLEND);
1170 } 1391 }
1171} 1392}
1172 1393
1394IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1395 CODE:
1396{
1397 GLint width;
1398 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1399 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1400 RETVAL = width > 0;
1401}
1402 OUTPUT:
1403 RETVAL
1404
1173MODULE = CFPlus PACKAGE = CFPlus::Map 1405MODULE = CFPlus PACKAGE = CFPlus::Map
1174 1406
1407PROTOTYPES: DISABLE
1408
1175CFPlus::Map 1409CFPlus::Map
1176new (SV *class, int map_width, int map_height) 1410new (SV *class)
1177 CODE: 1411 CODE:
1178 New (0, RETVAL, 1, struct map); 1412 New (0, RETVAL, 1, struct map);
1179 RETVAL->x = 0; 1413 RETVAL->x = 0;
1180 RETVAL->y = 0; 1414 RETVAL->y = 0;
1181 RETVAL->w = map_width; 1415 RETVAL->w = 0;
1182 RETVAL->h = map_height; 1416 RETVAL->h = 0;
1183 RETVAL->ox = 0; 1417 RETVAL->ox = 0;
1184 RETVAL->oy = 0; 1418 RETVAL->oy = 0;
1185 RETVAL->faces = 8192; 1419 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1186 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1420 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1187 RETVAL->texs = 8192;
1188 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1189 RETVAL->rows = 0; 1421 RETVAL->rows = 0;
1190 RETVAL->row = 0; 1422 RETVAL->row = 0;
1191 OUTPUT: 1423 OUTPUT:
1192 RETVAL 1424 RETVAL
1193 1425
1194void 1426void
1195DESTROY (CFPlus::Map self) 1427DESTROY (CFPlus::Map self)
1196 CODE: 1428 CODE:
1197{ 1429{
1198 map_clear (self); 1430 map_clear (self);
1199 Safefree (self->face); 1431 Safefree (self->face2tile);
1200 Safefree (self->tex); 1432 Safefree (self->tex);
1201 Safefree (self); 1433 Safefree (self);
1202} 1434}
1203 1435
1204void 1436void
1437resize (CFPlus::Map self, int map_width, int map_height)
1438 CODE:
1439 self->w = map_width;
1440 self->h = map_height;
1441
1442void
1205clear (CFPlus::Map self) 1443clear (CFPlus::Map self)
1206 CODE: 1444 CODE:
1207 map_clear (self); 1445 map_clear (self);
1208 1446
1209void 1447void
1210set_face (CFPlus::Map self, int face, int texid) 1448set_tileid (CFPlus::Map self, int face, int tile)
1211 CODE: 1449 CODE:
1212{ 1450{
1213 while (self->faces <= face) 1451 need_facenum (self, face); self->face2tile [face] = tile;
1214 { 1452 need_texid (self, tile);
1215 Append (mapface, self->face, self->faces, self->faces); 1453}
1216 self->faces *= 2;
1217 }
1218 1454
1219 self->face [face] = texid; 1455void
1456set_smooth (CFPlus::Map self, int face, int smooth, int level)
1457 CODE:
1458{
1459 tileid texid;
1460 maptex *tex;
1461
1462 if (face < 0 || face >= self->faces)
1463 return;
1464
1465 if (smooth < 0 || smooth >= self->faces)
1466 return;
1467
1468 texid = self->face2tile [face];
1469
1470 if (!texid)
1471 return;
1472
1473 tex = self->tex + texid;
1474 tex->smoothtile = self->face2tile [smooth];
1475 tex->smoothlevel = level;
1220} 1476}
1221 1477
1222void 1478void
1223set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1479set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1224 CODE: 1480 CODE:
1225{ 1481{
1226 while (self->texs <= texid) 1482 need_texid (self, texid);
1227 {
1228 Append (maptex, self->tex, self->texs, self->texs);
1229 self->texs *= 2;
1230 }
1231 1483
1232 { 1484 {
1233 maptex *tex = self->tex + texid; 1485 maptex *tex = self->tex + texid;
1234 1486
1235 tex->name = name; 1487 tex->name = name;
1279 CODE: 1531 CODE:
1280{ 1532{
1281 if (dx > 0) 1533 if (dx > 0)
1282 map_blank (self, self->x, self->y, dx, self->h); 1534 map_blank (self, self->x, self->y, dx, self->h);
1283 else if (dx < 0) 1535 else if (dx < 0)
1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1536 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1285 1537
1286 if (dy > 0) 1538 if (dy > 0)
1287 map_blank (self, self->x, self->y, self->w, dy); 1539 map_blank (self, self->x, self->y, self->w, dy);
1288 else if (dy < 0) 1540 else if (dy < 0)
1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1541 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1290 1542
1291 self->ox += dx; self->x += dx; 1543 self->ox += dx; self->x += dx;
1292 self->oy += dy; self->y += dy; 1544 self->oy += dy; self->y += dy;
1293 1545
1294 while (self->y < 0) 1546 while (self->y < 0)
1346 cell->stat_width = 1; 1598 cell->stat_width = 1;
1347 cell->stat_hp = *data++; 1599 cell->stat_hp = *data++;
1348 } 1600 }
1349 else if (cmd == 6) // monster width 1601 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1; 1602 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width 1603 else if (cmd == 0x47)
1352 { 1604 {
1353 if (*data == 4) 1605 if (*data == 4)
1354 ; // decode player tag 1606 ; // decode player count
1355 1607
1356 data += *data + 1; 1608 data += *data + 1;
1357 } 1609 }
1358 else if (cmd == 8) // cell flags 1610 else if (cmd == 8) // cell flags
1359 cell->flags = *data++; 1611 cell->flags = *data++;
1368 cell->darkness = *data++ + 1; 1620 cell->darkness = *data++ + 1;
1369 } 1621 }
1370 1622
1371 if (flags & 4) 1623 if (flags & 4)
1372 { 1624 {
1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1625 faceid face = (data [0] << 8) + data [1]; data += 2;
1626 need_facenum (self, face);
1627 cell->tile [0] = self->face2tile [face];
1374 } 1628 }
1375 1629
1376 if (flags & 2) 1630 if (flags & 2)
1377 { 1631 {
1378 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1632 faceid face = (data [0] << 8) + data [1]; data += 2;
1633 need_facenum (self, face);
1634 cell->tile [1] = self->face2tile [face];
1379 } 1635 }
1380 1636
1381 if (flags & 1) 1637 if (flags & 1)
1382 { 1638 {
1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1639 faceid face = (data [0] << 8) + data [1]; data += 2;
1640 need_facenum (self, face);
1641 cell->tile [2] = self->face2tile [face];
1384 } 1642 }
1385 } 1643 }
1386 else 1644 else
1387 cell->darkness = 0; 1645 cell->darkness = 0;
1388 } 1646 }
1418 { 1676 {
1419 mapcell *cell = row->col + (x - row->c0); 1677 mapcell *cell = row->col + (x - row->c0);
1420 1678
1421 for (z = 0; z <= 0; z++) 1679 for (z = 0; z <= 0; z++)
1422 { 1680 {
1423 mapface face = cell->face [z];
1424
1425 if (face)
1426 {
1427 maptex tex = self->tex [face]; 1681 maptex tex = self->tex [cell->tile [z]];
1428 int a0 = 255 - tex.a; 1682 int a0 = 255 - tex.a;
1429 int a1 = tex.a; 1683 int a1 = tex.a;
1430 1684
1431 r = (r * a0 + tex.r * a1) / 255; 1685 r = (r * a0 + tex.r * a1) / 255;
1432 g = (g * a0 + tex.g * a1) / 255; 1686 g = (g * a0 + tex.g * a1) / 255;
1433 b = (b * a0 + tex.b * a1) / 255; 1687 b = (b * a0 + tex.b * a1) / 255;
1434 a = (a * a0 + tex.a * a1) / 255; 1688 a = (a * a0 + tex.a * a1) / 255;
1435 }
1436 } 1689 }
1437 } 1690 }
1438 1691
1439 *map++ = (r ) 1692 *map++ = (r )
1440 | (g << 8) 1693 | (g << 8)
1446 RETVAL = map_sv; 1699 RETVAL = map_sv;
1447} 1700}
1448 OUTPUT: 1701 OUTPUT:
1449 RETVAL 1702 RETVAL
1450 1703
1451void 1704SV *
1452draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1705draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1453 CODE: 1706 CODE:
1454{ 1707{
1455 int vx, vy; 1708 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1709 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1710 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1711 smooth_key skey;
1456 int x, y, z; 1712 int x, y, z;
1457 int last_name; 1713 int last_name;
1458 mapface face; 1714 AV *missing = newAV ();
1715 RETVAL = newRV_noinc ((SV *)missing);
1459 1716
1460 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1717 // thats current max. sorry.
1461 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1718 if (sw > 255) sw = 255;
1719 if (sh > 255) sh = 255;
1462 1720
1463 /* 1721 // clear key, in case of extra padding
1464 int vx = self->vx = self->w >= sw 1722 memset (&skey, 0, sizeof (skey));
1465 ? self->x + (self->w - sw) / 2
1466 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1467
1468 int vy = self->vy = self->h >= sh
1469 ? self->y + (self->h - sh) / 2
1470 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1471 */
1472 1723
1473 glColor4ub (255, 255, 255, 255); 1724 glColor4ub (255, 255, 255, 255);
1474 1725
1475 glEnable (GL_BLEND); 1726 glEnable (GL_BLEND);
1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1727 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1477 glEnable (GL_TEXTURE_2D); 1728 glEnable (GL_TEXTURE_2D);
1478 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1729 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1479 1730
1480 glBegin (GL_QUADS); 1731 glBegin (GL_QUADS);
1481 1732
1482 last_name = 0; 1733 last_name = -1;
1483 1734
1735 mx += self->x;
1736 my += self->y;
1737
1738 // first pass: determine smooth_max
1739 // rather ugly, if you ask me
1740 // could also be stored inside mapcell and updated on change
1741 memset (smooth_max, 0, sizeof (smooth_max));
1742
1743 for (y = 0; y < sh; y++)
1744 if (0 <= y + my && y + my < self->rows)
1745 {
1746 maprow *row = self->row + (y + my);
1747
1748 for (x = 0; x < sw; x++)
1749 if (row->c0 <= x + mx && x + mx < row->c1)
1750 {
1751 mapcell *cell = row->col + (x + mx - row->c0);
1752
1753 smooth_max[x + 1][y + 1] =
1754 MAX (self->tex [cell->tile [0]].smoothlevel,
1755 MAX (self->tex [cell->tile [1]].smoothlevel,
1756 self->tex [cell->tile [2]].smoothlevel));
1757 }
1758 }
1759
1484 for (z = 0; z < 3; z++) 1760 for (z = 0; z <= 2; z++)
1761 {
1762 memset (smooth_level, 0, sizeof (smooth_level));
1763
1485 for (y = 0; y < sh; y++) 1764 for (y = 0; y < sh; y++)
1486 if (0 <= y + vy && y + vy < self->rows) 1765 if (0 <= y + my && y + my < self->rows)
1487 { 1766 {
1488 maprow *row = self->row + (y + vy); 1767 maprow *row = self->row + (y + my);
1489 1768
1490 for (x = 0; x < sw; x++) 1769 for (x = 0; x < sw; x++)
1491 if (row->c0 <= x + vx && x + vx < row->c1) 1770 if (row->c0 <= x + mx && x + mx < row->c1)
1492 { 1771 {
1493 mapcell *cell = row->col + (x + vx - row->c0); 1772 mapcell *cell = row->col + (x + mx - row->c0);
1494
1495 face = cell->face [z]; 1773 tileid tile = cell->tile [z];
1774
1775 if (tile)
1776 {
1777 maptex tex = self->tex [tile];
1778 int px, py;
1496 1779
1497 if (face && face < self->texs) 1780 // suppressing texture state switches here
1781 // is only moderately effective, but worth the extra effort
1782 if (last_name != tex.name)
1783 {
1784 if (!tex.name)
1785 {
1786 av_push (missing, newSViv (tile));
1787 tex = self->tex [2]; /* missing, replace by noface */
1788 }
1789
1790 glEnd ();
1791 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1792 glBegin (GL_QUADS);
1793 }
1794
1795 px = (x + 1) * T - tex.w;
1796 py = (y + 1) * T - tex.h;
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1802
1803 if (cell->flags && z == 2)
1804 {
1805 if (cell->flags & 1)
1806 {
1807 maptex tex = self->tex [1];
1808 int px = x * T + T * 2 / 32;
1809 int py = y * T - T * 6 / 32;
1810
1811 glEnd ();
1812 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1813 glBegin (GL_QUADS);
1814
1815 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1816 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1817 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1818 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1819 }
1820 }
1821
1822 // update smooth hash
1823 if (tex.smoothtile)
1824 {
1825 skey.tile = tex.smoothtile;
1826 skey.level = tex.smoothlevel;
1827
1828 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1829
1830 // add bits to current tile and all neighbours. skey.x|y is
1831 // shifted +1|+1 so we always stay positive.
1832
1833 // bits is ___n cccc CCCC bbbb
1834 // n do not draw borders&corners
1835 // c draw these corners, but...
1836 // C ... not these
1837 // b draw these borders
1838
1839 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1840 // ┃· ·· ·┃ ━━
1841
1842 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1843 // ·· ·· ·┏ ┓·
1844
1845 // full tile
1846 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1847
1848 // borders
1849 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1850 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1851 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1852 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1853
1854 // corners
1855 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1856 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1857 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1858 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1859 }
1860 }
1861 }
1862 }
1863
1864 // go through all smoothlevels, lowest to highest, then draw.
1865 // this is basically counting sort
1866 {
1867 int w, b;
1868
1869 for (w = 0; w < 256 / 32; ++w)
1870 {
1871 uint32_t smask = smooth_level [w];
1872 if (smask)
1873 for (b = 0; b < 32; ++b)
1874 if (smask & (((uint32_t)1) << b))
1498 { 1875 {
1499 maptex tex = self->tex [face]; 1876 int level = (w << 5) | b;
1500 int px = (x + 1) * 32 - tex.w; 1877 HE *he;
1501 int py = (y + 1) * 32 - tex.h;
1502 1878
1503 if (last_name != tex.name) 1879 hv_iterinit (smooth);
1880 while ((he = hv_iternext (smooth)))
1504 { 1881 {
1882 smooth_key *skey = (smooth_key *)HeKEY (he);
1883 IV bits = SvIVX (HeVAL (he));
1884
1885 if (!(bits & 0x1000)
1886 && skey->level == level
1887 && level > smooth_max [skey->x][skey->y])
1888 {
1889 maptex tex = self->tex [skey->tile];
1890 int px = (((int)skey->x) - 1) * T;
1891 int py = (((int)skey->y) - 1) * T;
1892 int border = bits & 15;
1893 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1894 float dx = tex.s * .0625f; // 16 images/row
1895 float dy = tex.t * .5f ; // 2 images/column
1896
1897 // this time naively avoiding texture state changes
1898 // save gobs of state changes.
1899 if (last_name != tex.name)
1900 {
1901 if (!tex.name)
1902 {
1903 av_push (missing, newSViv (skey->tile));
1904 continue; // smoothing not yet available
1905 }
1906
1505 glEnd (); 1907 glEnd ();
1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1908 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1507 glBegin (GL_QUADS); 1909 glBegin (GL_QUADS);
1910 }
1911
1912 if (border)
1913 {
1914 float ox = border * dx;
1915
1916 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1917 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1918 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1919 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1920 }
1921
1922 if (corner)
1923 {
1924 float ox = corner * dx;
1925
1926 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1927 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1928 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1929 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1930 }
1508 } 1931 }
1509
1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 } 1932 }
1533 } 1933 }
1534 }
1535 } 1934 }
1935 }
1936
1937 hv_clear (smooth);
1938 }
1536 1939
1537 glEnd (); 1940 glEnd ();
1538 1941
1539 glDisable (GL_TEXTURE_2D); 1942 glDisable (GL_TEXTURE_2D);
1540 glDisable (GL_BLEND); 1943 glDisable (GL_BLEND);
1541 1944
1542 // top layer: overlays such as the health bar 1945 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++) 1946 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows) 1947 if (0 <= y + my && y + my < self->rows)
1545 { 1948 {
1546 maprow *row = self->row + (y + vy); 1949 maprow *row = self->row + (y + my);
1547 1950
1548 for (x = 0; x < sw; x++) 1951 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1) 1952 if (row->c0 <= x + mx && x + mx < row->c1)
1550 { 1953 {
1551 mapcell *cell = row->col + (x + vx - row->c0); 1954 mapcell *cell = row->col + (x + mx - row->c0);
1552 1955
1553 int px = x * 32; 1956 int px = x * T;
1554 int py = y * 32; 1957 int py = y * T;
1555 1958
1556 if (cell->stat_hp) 1959 if (cell->stat_hp)
1557 { 1960 {
1558 int width = cell->stat_width * 32; 1961 int width = cell->stat_width * T;
1559 int thick = sh / 28 + 1 + cell->stat_width; 1962 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1560 1963
1561 glColor3ub (0, 0, 0); 1964 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2, 1965 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py); 1966 px + width - 1, py);
1564 1967
1568 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1); 1971 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1569 } 1972 }
1570 } 1973 }
1571 } 1974 }
1572} 1975}
1976 OUTPUT:
1977 RETVAL
1573 1978
1574void 1979void
1575draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1980draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1576 CODE: 1981 CODE:
1577{ 1982{
1630 glDisable (GL_BLEND); 2035 glDisable (GL_BLEND);
1631 glDisable (GL_TEXTURE_2D); 2036 glDisable (GL_TEXTURE_2D);
1632} 2037}
1633 2038
1634void 2039void
1635fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2040fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1636 PPCODE: 2041 PPCODE:
1637{ 2042{
1638 int vx, vy;
1639 int x, y; 2043 int x, y;
2044 int sw1 = sw + 2;
2045 int sh1 = sh + 2;
2046 int sh3 = sh * 3;
1640 int sw4 = (sw + 3) & ~3; 2047 int sw34 = (sw * 3 + 3) & ~3;
2048 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1641 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2049 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1642 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2050 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1643 2051
1644 memset (darkness, 255, sw4 * sh);
1645 SvPOK_only (darkness_sv); 2052 SvPOK_only (darkness3_sv);
1646 SvCUR_set (darkness_sv, sw4 * sh); 2053 SvCUR_set (darkness3_sv, sw34 * sh3);
1647 2054
1648 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2055 mx += self->x - 1;
1649 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2056 my += self->y - 1;
1650 2057
2058 memset (darkness1, 255, sw1 * sh1);
2059
1651 for (y = 0; y < sh; y++) 2060 for (y = 0; y < sh1; y++)
1652 if (0 <= y + vy && y + vy < self->rows) 2061 if (0 <= y + my && y + my < self->rows)
1653 { 2062 {
1654 maprow *row = self->row + (y + vy); 2063 maprow *row = self->row + (y + my);
1655 2064
1656 for (x = 0; x < sw; x++) 2065 for (x = 0; x < sw1; x++)
1657 if (row->c0 <= x + vx && x + vx < row->c1) 2066 if (row->c0 <= x + mx && x + mx < row->c1)
1658 { 2067 {
1659 mapcell *cell = row->col + (x + vx - row->c0); 2068 mapcell *cell = row->col + (x + mx - row->c0);
1660 2069
1661 darkness[y * sw4 + x] = cell->darkness 2070 darkness1 [y * sw1 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1) 2071 ? 255 - (cell->darkness - 1)
1663 : 255 - FOW_DARKNESS; 2072 : 255 - FOW_DARKNESS;
1664 } 2073 }
1665 } 2074 }
1666 2075
2076 for (y = 0; y < sh; ++y)
2077 for (x = 0; x < sw; ++x)
2078 {
2079 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2080 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2081 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2082 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2083 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2084 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2085 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2086 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2087 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2088
2089 uint8_t r11 = (d11 + d21 + d12) / 3;
2090 uint8_t r21 = d21;
2091 uint8_t r31 = (d21 + d31 + d32) / 3;
2092
2093 uint8_t r12 = d12;
2094 uint8_t r22 = d22;
2095 uint8_t r32 = d32;
2096
2097 uint8_t r13 = (d13 + d23 + d12) / 3;
2098 uint8_t r23 = d23;
2099 uint8_t r33 = (d23 + d33 + d32) / 3;
2100
2101 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2102 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2103 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2104 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2105 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2106 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2107 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2108 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2109 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2110 }
2111
2112 free (darkness1);
2113
1667 EXTEND (SP, 3); 2114 EXTEND (SP, 3);
1668 PUSHs (sv_2mortal (newSViv (sw4))); 2115 PUSHs (sv_2mortal (newSViv (sw34)));
1669 PUSHs (sv_2mortal (newSViv (sh))); 2116 PUSHs (sv_2mortal (newSViv (sh3)));
1670 PUSHs (darkness_sv); 2117 PUSHs (darkness3_sv);
1671} 2118}
1672 2119
1673SV * 2120SV *
1674get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2121get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1675 CODE: 2122 CODE:
1704 if (row && row->c0 <= x && x < row->c1) 2151 if (row && row->c0 <= x && x < row->c1)
1705 { 2152 {
1706 mapcell *cell = row->col + (x - row->c0); 2153 mapcell *cell = row->col + (x - row->c0);
1707 uint8_t flags = 0; 2154 uint8_t flags = 0;
1708 2155
1709 if (cell->face [0]) flags |= 1; 2156 if (cell->tile [0]) flags |= 1;
1710 if (cell->face [1]) flags |= 2; 2157 if (cell->tile [1]) flags |= 2;
1711 if (cell->face [2]) flags |= 4; 2158 if (cell->tile [2]) flags |= 4;
1712 2159
1713 *data++ = flags; 2160 *data++ = flags;
1714 2161
1715 if (flags & 1) 2162 if (flags & 1)
1716 { 2163 {
2164 tileid tile = cell->tile [0];
1717 *data++ = cell->face [0] >> 8; 2165 *data++ = tile >> 8;
1718 *data++ = cell->face [0]; 2166 *data++ = tile;
1719 } 2167 }
1720 2168
1721 if (flags & 2) 2169 if (flags & 2)
1722 { 2170 {
2171 tileid tile = cell->tile [1];
1723 *data++ = cell->face [1] >> 8; 2172 *data++ = tile >> 8;
1724 *data++ = cell->face [1]; 2173 *data++ = tile;
1725 } 2174 }
1726 2175
1727 if (flags & 4) 2176 if (flags & 4)
1728 { 2177 {
2178 tileid tile = cell->tile [2];
1729 *data++ = cell->face [2] >> 8; 2179 *data++ = tile >> 8;
1730 *data++ = cell->face [2]; 2180 *data++ = tile;
1731 } 2181 }
1732 } 2182 }
1733 else 2183 else
1734 *data++ = 0; 2184 *data++ = 0;
1735 } 2185 }
1775 { 2225 {
1776 uint8_t flags = *data++; 2226 uint8_t flags = *data++;
1777 2227
1778 if (flags) 2228 if (flags)
1779 { 2229 {
1780 mapface face[3] = { 0, 0, 0 };
1781
1782 mapcell *cell = row_get_cell (row, x); 2230 mapcell *cell = row_get_cell (row, x);
2231 tileid tile[3] = { 0, 0, 0 };
1783 2232
1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2233 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2234 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2235 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1787 2236
1788 if (cell->darkness == 0) 2237 if (cell->darkness == 0)
1789 { 2238 {
1790 cell->darkness = 0; 2239 cell->darkness = 0;
1791 2240
1792 for (z = 0; z <= 2; z++) 2241 for (z = 0; z <= 2; z++)
1793 { 2242 {
1794 cell->face[z] = face[z]; 2243 tileid t = tile [z];
1795 2244
1796 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2245 if (t >= self->texs || (t && !self->tex [t].name))
2246 {
1797 XPUSHs (sv_2mortal (newSViv (face[z]))); 2247 XPUSHs (sv_2mortal (newSViv (t)));
2248 need_texid (self, t);
2249 }
2250
2251 cell->tile [z] = t;
1798 } 2252 }
1799 } 2253 }
1800 } 2254 }
1801 } 2255 }
1802 } 2256 }
1803} 2257}
1804 2258
2259MODULE = CFPlus PACKAGE = CFPlus::RW
2260
2261CFPlus::RW
2262new (SV *class, SV *data_sv)
2263 CODE:
2264{
2265 STRLEN datalen;
2266 char *data = SvPVbyte (data_sv, datalen);
2267
2268 RETVAL = SDL_RWFromConstMem (data, datalen);
2269}
2270 OUTPUT:
2271 RETVAL
2272
2273CFPlus::RW
2274new_from_file (SV *class, const char *path, const char *mode = "rb")
2275 CODE:
2276 RETVAL = SDL_RWFromFile (path, mode);
2277 OUTPUT:
2278 RETVAL
2279
2280# fails on win32:
2281# CFPlus.xs(2268) : error C2059: syntax error : '('
2282#void
2283#close (CFPlus::RW self)
2284# CODE:
2285# (self->(close)) (self);
2286
2287MODULE = CFPlus PACKAGE = CFPlus::Channel
2288
2289PROTOTYPES: DISABLE
2290
2291CFPlus::Channel
2292find ()
2293 CODE:
2294{
2295 RETVAL = Mix_GroupAvailable (-1);
2296
2297 if (RETVAL < 0)
2298 {
2299 RETVAL = Mix_GroupOldest (-1);
2300
2301 if (RETVAL < 0)
2302 XSRETURN_UNDEF;
2303
2304 Mix_HaltChannel (RETVAL);
2305 }
2306
2307 Mix_UnregisterAllEffects (RETVAL);
2308 Mix_Volume (RETVAL, 128);
2309}
2310 OUTPUT:
2311 RETVAL
2312
2313void
2314halt (CFPlus::Channel self)
2315 CODE:
2316 Mix_HaltChannel (self);
2317
2318void
2319expire (CFPlus::Channel self, int ticks = -1)
2320 CODE:
2321 Mix_ExpireChannel (self, ticks);
2322
2323void
2324fade_out (CFPlus::Channel self, int ticks = -1)
2325 CODE:
2326 Mix_FadeOutChannel (self, ticks);
2327
2328int
2329volume (CFPlus::Channel self, int volume)
2330 CODE:
2331 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332 OUTPUT:
2333 RETVAL
2334
2335void
2336unregister_all_effects (CFPlus::Channel self)
2337 CODE:
2338 Mix_UnregisterAllEffects (self);
2339
2340void
2341set_panning (CFPlus::Channel self, int left, int right)
2342 CODE:
2343 left = CLAMP (left , 0, 255);
2344 right = CLAMP (right, 0, 255);
2345 Mix_SetPanning (self, left, right);
2346
2347void
2348set_distance (CFPlus::Channel self, int distance)
2349 CODE:
2350 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351
2352void
2353set_position (CFPlus::Channel self, int angle, int distance)
2354 CODE:
2355 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2356
2357void
2358set_reverse_stereo (CFPlus::Channel self, int flip)
2359 CODE:
2360 Mix_SetReverseStereo (self, flip);
2361
1805MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2362MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1806 2363
2364PROTOTYPES: DISABLE
2365
1807CFPlus::MixChunk 2366CFPlus::MixChunk
1808new_from_file (SV *class, char *path) 2367new (SV *class, CFPlus::RW rwops)
1809 CODE: 2368 CODE:
1810 RETVAL = Mix_LoadWAV (path); 2369 RETVAL = Mix_LoadWAV_RW (rwops, 1);
1811 OUTPUT: 2370 OUTPUT:
1812 RETVAL 2371 RETVAL
1813 2372
1814void 2373void
1815DESTROY (CFPlus::MixChunk self) 2374DESTROY (CFPlus::MixChunk self)
1817 Mix_FreeChunk (self); 2376 Mix_FreeChunk (self);
1818 2377
1819int 2378int
1820volume (CFPlus::MixChunk self, int volume = -1) 2379volume (CFPlus::MixChunk self, int volume = -1)
1821 CODE: 2380 CODE:
2381 if (items > 1)
2382 volume = CLAMP (volume, 0, 128);
1822 RETVAL = Mix_VolumeChunk (self, volume); 2383 RETVAL = Mix_VolumeChunk (self, volume);
1823 OUTPUT: 2384 OUTPUT:
1824 RETVAL 2385 RETVAL
1825 2386
1826int 2387CFPlus::Channel
1827play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2388play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
1828 CODE: 2389 CODE:
2390{
1829 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2391 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2392
2393 if (RETVAL < 0)
2394 XSRETURN_UNDEF;
2395
2396 if (channel < 0)
2397 {
2398 Mix_UnregisterAllEffects (RETVAL);
2399 Mix_Volume (RETVAL, 128);
2400 }
2401}
1830 OUTPUT: 2402 OUTPUT:
1831 RETVAL 2403 RETVAL
1832 2404
1833MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2405MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1834 2406
1835int 2407int
1836volume (int volume = -1) 2408volume (int volume = -1)
2409 PROTOTYPE: ;$
1837 CODE: 2410 CODE:
2411 if (items > 0)
2412 volume = CLAMP (volume, 0, 128);
1838 RETVAL = Mix_VolumeMusic (volume); 2413 RETVAL = Mix_VolumeMusic (volume);
1839 OUTPUT: 2414 OUTPUT:
1840 RETVAL 2415 RETVAL
1841 2416
2417void
2418fade_out (int ms)
2419 CODE:
2420 Mix_FadeOutMusic (ms);
2421
2422void
2423halt ()
2424 CODE:
2425 Mix_HaltMusic ();
2426
1842CFPlus::MixMusic 2427CFPlus::MixMusic
1843new_from_file (SV *class, char *path) 2428new (SV *class, CFPlus::RW rwops)
1844 CODE: 2429 CODE:
1845 RETVAL = Mix_LoadMUS (path); 2430 RETVAL = Mix_LoadMUS_RW (rwops);
1846 OUTPUT: 2431 OUTPUT:
1847 RETVAL 2432 RETVAL
1848 2433
1849void 2434void
1850DESTROY (CFPlus::MixMusic self) 2435DESTROY (CFPlus::MixMusic self)
1856 CODE: 2441 CODE:
1857 RETVAL = Mix_PlayMusic (self, loops); 2442 RETVAL = Mix_PlayMusic (self, loops);
1858 OUTPUT: 2443 OUTPUT:
1859 RETVAL 2444 RETVAL
1860 2445
2446void
2447fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2448 CODE:
2449 Mix_FadeInMusicPos (self, loops, ms, position);
2450
1861MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2451MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2452
2453PROTOTYPES: ENABLE
1862 2454
1863BOOT: 2455BOOT:
1864{ 2456{
1865 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2457 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1866 static const struct { 2458 static const struct {
1867 const char *name; 2459 const char *name;
1868 IV iv; 2460 IV iv;
1869 } *civ, const_iv[] = { 2461 } *civ, const_iv[] = {
1870# define const_iv(name) { # name, (IV)name } 2462# define const_iv(name) { # name, (IV)name }
2463 const_iv (GL_VENDOR),
2464 const_iv (GL_VERSION),
2465 const_iv (GL_EXTENSIONS),
1871 const_iv (GL_COLOR_MATERIAL), 2466 const_iv (GL_COLOR_MATERIAL),
1872 const_iv (GL_SMOOTH), 2467 const_iv (GL_SMOOTH),
1873 const_iv (GL_FLAT), 2468 const_iv (GL_FLAT),
1874 const_iv (GL_DITHER), 2469 const_iv (GL_DITHER),
1875 const_iv (GL_BLEND), 2470 const_iv (GL_BLEND),
1879 const_iv (GL_ALPHA_TEST), 2474 const_iv (GL_ALPHA_TEST),
1880 const_iv (GL_NORMALIZE), 2475 const_iv (GL_NORMALIZE),
1881 const_iv (GL_RESCALE_NORMAL), 2476 const_iv (GL_RESCALE_NORMAL),
1882 const_iv (GL_FRONT), 2477 const_iv (GL_FRONT),
1883 const_iv (GL_BACK), 2478 const_iv (GL_BACK),
2479 const_iv (GL_AUX0),
1884 const_iv (GL_AND), 2480 const_iv (GL_AND),
1885 const_iv (GL_ONE), 2481 const_iv (GL_ONE),
1886 const_iv (GL_ZERO), 2482 const_iv (GL_ZERO),
1887 const_iv (GL_SRC_ALPHA), 2483 const_iv (GL_SRC_ALPHA),
1888 const_iv (GL_DST_ALPHA), 2484 const_iv (GL_DST_ALPHA),
1902 const_iv (GL_LUMINANCE), 2498 const_iv (GL_LUMINANCE),
1903 const_iv (GL_LUMINANCE_ALPHA), 2499 const_iv (GL_LUMINANCE_ALPHA),
1904 const_iv (GL_FLOAT), 2500 const_iv (GL_FLOAT),
1905 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2501 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1906 const_iv (GL_COMPILE), 2502 const_iv (GL_COMPILE),
2503 const_iv (GL_PROXY_TEXTURE_1D),
2504 const_iv (GL_PROXY_TEXTURE_2D),
1907 const_iv (GL_TEXTURE_1D), 2505 const_iv (GL_TEXTURE_1D),
1908 const_iv (GL_TEXTURE_2D), 2506 const_iv (GL_TEXTURE_2D),
1909 const_iv (GL_TEXTURE_ENV), 2507 const_iv (GL_TEXTURE_ENV),
1910 const_iv (GL_TEXTURE_MAG_FILTER), 2508 const_iv (GL_TEXTURE_MAG_FILTER),
1911 const_iv (GL_TEXTURE_MIN_FILTER), 2509 const_iv (GL_TEXTURE_MIN_FILTER),
1932 const_iv (GL_COLOR_LOGIC_OP), 2530 const_iv (GL_COLOR_LOGIC_OP),
1933 const_iv (GL_SEPARABLE_2D), 2531 const_iv (GL_SEPARABLE_2D),
1934 const_iv (GL_CONVOLUTION_2D), 2532 const_iv (GL_CONVOLUTION_2D),
1935 const_iv (GL_CONVOLUTION_BORDER_MODE), 2533 const_iv (GL_CONVOLUTION_BORDER_MODE),
1936 const_iv (GL_CONSTANT_BORDER), 2534 const_iv (GL_CONSTANT_BORDER),
2535 const_iv (GL_POINTS),
1937 const_iv (GL_LINES), 2536 const_iv (GL_LINES),
1938 const_iv (GL_LINE_STRIP), 2537 const_iv (GL_LINE_STRIP),
1939 const_iv (GL_LINE_LOOP), 2538 const_iv (GL_LINE_LOOP),
1940 const_iv (GL_QUADS), 2539 const_iv (GL_QUADS),
1941 const_iv (GL_QUAD_STRIP), 2540 const_iv (GL_QUAD_STRIP),
1942 const_iv (GL_TRIANGLES), 2541 const_iv (GL_TRIANGLES),
1943 const_iv (GL_TRIANGLE_STRIP), 2542 const_iv (GL_TRIANGLE_STRIP),
1944 const_iv (GL_TRIANGLE_FAN), 2543 const_iv (GL_TRIANGLE_FAN),
2544 const_iv (GL_POLYGON),
1945 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2545 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2546 const_iv (GL_POINT_SMOOTH_HINT),
2547 const_iv (GL_LINE_SMOOTH_HINT),
2548 const_iv (GL_POLYGON_SMOOTH_HINT),
2549 const_iv (GL_GENERATE_MIPMAP_HINT),
1946 const_iv (GL_FASTEST), 2550 const_iv (GL_FASTEST),
2551 const_iv (GL_DONT_CARE),
2552 const_iv (GL_NICEST),
1947 const_iv (GL_V2F), 2553 const_iv (GL_V2F),
1948 const_iv (GL_V3F), 2554 const_iv (GL_V3F),
1949 const_iv (GL_T2F_V3F), 2555 const_iv (GL_T2F_V3F),
1950 const_iv (GL_T2F_N3F_V3F), 2556 const_iv (GL_T2F_N3F_V3F),
1951# undef const_iv 2557# undef const_iv
1952 }; 2558 };
1953 2559
1954 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1955 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2562
2563 texture_av = newAV ();
2564 AvREAL_off (texture_av);
1956} 2565}
1957 2566
1958char * 2567char *
1959gl_vendor () 2568gl_vendor ()
1960 CODE: 2569 CODE:
1974 CODE: 2583 CODE:
1975 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2584 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1976 OUTPUT: 2585 OUTPUT:
1977 RETVAL 2586 RETVAL
1978 2587
2588const char *glGetString (GLenum pname)
2589
2590GLint glGetInteger (GLenum pname)
2591 CODE:
2592 glGetIntegerv (pname, &RETVAL);
2593 OUTPUT:
2594 RETVAL
2595
2596GLdouble glGetDouble (GLenum pname)
2597 CODE:
2598 glGetDoublev (pname, &RETVAL);
2599 OUTPUT:
2600 RETVAL
2601
1979int glGetError () 2602int glGetError ()
1980 2603
1981void glFinish () 2604void glFinish ()
1982 2605
1983void glClear (int mask) 2606void glClear (int mask)
2020# near_ and far_ are due to microsofts buggy "c" compiler 2643# near_ and far_ are due to microsofts buggy "c" compiler
2021void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2644void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2022 2645
2023# near_ and far_ are due to microsofts buggy "c" compiler 2646# near_ and far_ are due to microsofts buggy "c" compiler
2024void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2647void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2648
2649PROTOTYPES: DISABLE
2025 2650
2026void glViewport (int x, int y, int width, int height) 2651void glViewport (int x, int y, int width, int height)
2027 2652
2028void glScissor (int x, int y, int width, int height) 2653void glScissor (int x, int y, int width, int height)
2029 2654
2037 2662
2038void glRotate (float angle, float x, float y, float z) 2663void glRotate (float angle, float x, float y, float z)
2039 CODE: 2664 CODE:
2040 glRotatef (angle, x, y, z); 2665 glRotatef (angle, x, y, z);
2041 2666
2042void glBegin (int mode)
2043
2044void glEnd ()
2045
2046void glColor (float r, float g, float b, float a = 1.0) 2667void glColor (float r, float g, float b, float a = 1.0)
2047 PROTOTYPE: @
2048 ALIAS: 2668 ALIAS:
2049 glColor_premultiply = 1 2669 glColor_premultiply = 1
2050 CODE: 2670 CODE:
2051 if (ix) 2671 if (ix)
2052 { 2672 {
2055 b *= a; 2675 b *= a;
2056 } 2676 }
2057 // microsoft visual "c" rounds instead of truncating... 2677 // microsoft visual "c" rounds instead of truncating...
2058 glColor4f (r, g, b, a); 2678 glColor4f (r, g, b, a);
2059 2679
2060void glInterleavedArrays (int format, int stride, char *data)
2061
2062void glDrawElements (int mode, int count, int type, char *indices)
2063
2064# 1.2 void glDrawRangeElements (int mode, int start, int end
2065
2066void glRasterPos (float x, float y, float z = 0.) 2680void glRasterPos (float x, float y, float z = 0.)
2067 CODE: 2681 CODE:
2068 glRasterPos3f (0, 0, z); 2682 glRasterPos3f (0, 0, z);
2069 glBitmap (0, 0, 0, 0, x, y, 0); 2683 glBitmap (0, 0, 0, 0, x, y, 0);
2070 2684
2074 2688
2075void glTexCoord (float s, float t) 2689void glTexCoord (float s, float t)
2076 CODE: 2690 CODE:
2077 glTexCoord2f (s, t); 2691 glTexCoord2f (s, t);
2078 2692
2693void glRect (float x1, float y1, float x2, float y2)
2694 CODE:
2695 glRectf (x1, y1, x2, y2);
2696
2697PROTOTYPES: ENABLE
2698
2699void glBegin (int mode)
2700
2701void glEnd ()
2702
2703void glPointSize (GLfloat size)
2704
2705void glLineWidth (GLfloat width)
2706
2707void glInterleavedArrays (int format, int stride, char *data)
2708
2709void glDrawElements (int mode, int count, int type, char *indices)
2710
2711# 1.2 void glDrawRangeElements (int mode, int start, int end
2712
2079void glTexEnv (int target, int pname, float param) 2713void glTexEnv (int target, int pname, float param)
2080 CODE: 2714 CODE:
2081 glTexEnvf (target, pname, param); 2715 glTexEnvf (target, pname, param);
2082 2716
2083void glTexParameter (int target, int pname, float param) 2717void glTexParameter (int target, int pname, float param)
2105 2739
2106void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2107 2741
2108void glDrawPixels (int width, int height, int format, int type, char *pixels) 2742void glDrawPixels (int width, int height, int format, int type, char *pixels)
2109 2743
2744void glPixelZoom (float x, float y)
2745
2110void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2746void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2111 2747
2112int glGenTexture () 2748int glGenTexture ()
2113 CODE: 2749 CODE:
2114{ 2750 RETVAL = gen_texture ();
2115 GLuint name;
2116 glGenTextures (1, &name);
2117 RETVAL = name;
2118}
2119 OUTPUT: 2751 OUTPUT:
2120 RETVAL 2752 RETVAL
2121 2753
2122void glDeleteTexture (int name) 2754void glDeleteTexture (int name)
2123 CODE: 2755 CODE:
2124{
2125 GLuint name_ = name;
2126 glDeleteTextures (1, &name_); 2756 del_texture (name);
2127} 2757
2128
2129int glGenList () 2758int glGenList ()
2130 CODE: 2759 CODE:
2131 RETVAL = glGenLists (1); 2760 RETVAL = glGenLists (1);
2132 OUTPUT: 2761 OUTPUT:
2133 RETVAL 2762 RETVAL
2140 2769
2141void glEndList () 2770void glEndList ()
2142 2771
2143void glCallList (int list) 2772void glCallList (int list)
2144 2773
2774MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2775
2776PROTOTYPES: DISABLE
2777
2778void
2779find_widget (SV *self, NV x, NV y)
2780 PPCODE:
2781{
2782 if (within_widget (self, x, y))
2783 XPUSHs (self);
2784}
2785
2786BOOT:
2787{
2788 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2789
2790 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2791 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2792 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2793 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2794}
2795
2796void
2797draw (SV *self)
2798 CODE:
2799{
2800 HV *hv;
2801 SV **svp;
2802 NV x, y, w, h;
2803 SV *draw_x_sv = GvSV (draw_x_gv);
2804 SV *draw_y_sv = GvSV (draw_y_gv);
2805 SV *draw_w_sv = GvSV (draw_w_gv);
2806 SV *draw_h_sv = GvSV (draw_h_gv);
2807 SV *hover;
2808 double draw_x, draw_y, draw_w, draw_h;
2809
2810 if (!SvROK (self))
2811 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2812
2813 hv = (HV *)SvRV (self);
2814
2815 if (SvTYPE (hv) != SVt_PVHV)
2816 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2817
2818 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2819 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2820
2821 if (!h || !w)
2822 XSRETURN_EMPTY;
2823
2824 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2825 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2826
2827 draw_x = SvNV (draw_x_sv) + x;
2828 draw_y = SvNV (draw_y_sv) + y;
2829
2830 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2831 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2832 XSRETURN_EMPTY;
2833
2834 sv_setnv (draw_x_sv, draw_x);
2835 sv_setnv (draw_y_sv, draw_y);
2836
2837 glPushMatrix ();
2838 glTranslated (x, y, 0);
2839
2840 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2841 {
2842 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2843
2844 if (svp && SvTRUE (*svp))
2845 {
2846 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2847 glEnable (GL_BLEND);
2848 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2849 glBegin (GL_QUADS);
2850 glVertex2f (0, 0);
2851 glVertex2f (w, 0);
2852 glVertex2f (w, h);
2853 glVertex2f (0, h);
2854 glEnd ();
2855 glDisable (GL_BLEND);
2856 }
2857 }
2858#if 0
2859 if ($ENV{CFPLUS_DEBUG} & 1) {
2860 glPushMatrix;
2861 glColor 1, 1, 0, 1;
2862 glTranslate 0.375, 0.375;
2863 glBegin GL_LINE_LOOP;
2864 glVertex 0 , 0;
2865 glVertex $self->{w} - 1, 0;
2866 glVertex $self->{w} - 1, $self->{h} - 1;
2867 glVertex 0 , $self->{h} - 1;
2868 glEnd;
2869 glPopMatrix;
2870 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2871 }
2872#endif
2873 PUSHMARK (SP);
2874 XPUSHs (self);
2875 PUTBACK;
2876 call_method ("_draw", G_VOID | G_DISCARD);
2877 SPAGAIN;
2878
2879 glPopMatrix ();
2880
2881 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2882 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2883}
2884

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines