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.127 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.225 by root, Sat Aug 11 12:07:54 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# 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>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
27#endif
28
29#include <assert.h>
12#include <math.h> 30#include <math.h>
13#include <string.h> 31#include <string.h>
14#include <stdio.h> 32#include <stdio.h>
15#include <stdlib.h> 33#include <stdlib.h>
16 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
17#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
18#include <SDL_endian.h> 39#include <SDL_endian.h>
19#include <SDL_image.h> 40#include <SDL_image.h>
20#include <SDL_mixer.h> 41#include <SDL_mixer.h>
21#include <SDL_opengl.h> 42#include <SDL_opengl.h>
22 43
31# include <sys/types.h> 52# include <sys/types.h>
32# include <sys/socket.h> 53# include <sys/socket.h>
33# include <netinet/in.h> 54# include <netinet/in.h>
34# include <netinet/tcp.h> 55# include <netinet/tcp.h>
35# include <inttypes.h> 56# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 57#endif
44 58
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 60
49#define FOW_DARKNESS 32 61#define FOW_DARKNESS 32
50 62
51#define MAP_EXTEND_X 32 63#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 64#define MAP_EXTEND_Y 512
57# define PARACHUTE SDL_INIT_NOPARACHUTE 69# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 70#else
59# define PARACHUTE 0 71# define PARACHUTE 0
60#endif 72#endif
61 73
74static AV *texture_av;
75
62static struct 76static struct
63{ 77{
64#define GL_FUNC(ptr,name) ptr name; 78#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 79#include "glfunc.h"
66#undef GL_FUNC 80#undef GL_FUNC
67} gl; 81} gl;
68 82
83static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 84gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 85{
71 if (gl.BlendFuncSeparate) 86 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 87 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 88 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 89 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 90 else
76 glBlendFunc (sa, da); 91 glBlendFunc (sa, da);
77} 92}
78 93
94static GLuint
95gen_texture ()
96{
97 GLuint name;
98
99 if (AvFILL (texture_av) >= 0)
100 name = (GLuint)(size_t)av_pop (texture_av);
101 else
102 glGenTextures (1, &name);
103
104 return name;
105}
106
107static void
108del_texture (GLuint name)
109{
110 /* make a half-assed attempt at returning the memory used by the texture */
111 /* textures are frequently being reused by cfplus anyway */
112 /*glBindTexture (GL_TEXTURE_2D, name);*/
113 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
114 av_push (texture_av, (SV *)(size_t)name);
115 glDeleteTextures (1, &name);
116}
117
79#include "texcache.c" 118#include "texcache.c"
119#include "rendercache.c"
80 120
81#include "pango-font.c" 121#include "pango-font.c"
82#include "pango-fontmap.c" 122#include "pango-fontmap.c"
83#include "pango-render.c" 123#include "pango-render.c"
84 124
125typedef IV CFPlus__Channel;
126typedef SDL_RWops *CFPlus__RW;
85typedef Mix_Chunk *CFClient__MixChunk; 127typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 128typedef Mix_Music *CFPlus__MixMusic;
87 129
88typedef PangoFontDescription *CFClient__Font; 130typedef PangoFontDescription *CFPlus__Font;
89 131
90static int 132static int
91shape_attr_p (PangoLayoutRun *run) 133shape_attr_p (PangoLayoutRun *run)
92{ 134{
93 GSList *attrs = run->item->analysis.extra_attrs; 135 GSList *attrs = run->item->analysis.extra_attrs;
107 149
108typedef struct cf_layout { 150typedef struct cf_layout {
109 PangoLayout *pl; 151 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 152 float r, g, b, a; // default color for rgba mode
111 int base_height; 153 int base_height;
112 CFClient__Font font; 154 CFPlus__Font font;
155 rc_t *rc;
113} *CFClient__Layout; 156} *CFPlus__Layout;
114 157
115static CFClient__Font default_font; 158static CFPlus__Font default_font;
116static PangoContext *opengl_context; 159static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 160static PangoFontMap *opengl_fontmap;
118 161
119static void 162static void
120substitute_func (FcPattern *pattern, gpointer data) 163substitute_func (FcPattern *pattern, gpointer data)
125#endif 168#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 169 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 170}
128 171
129static void 172static void
130layout_update_font (CFClient__Layout self) 173layout_update_font (CFPlus__Layout self)
131{ 174{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 175 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 176 * reasonably well with bitstream vera
134 */ 177 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 178 PangoFontDescription *font = self->font ? self->font : default_font;
139 182
140 pango_layout_set_font_description (self->pl, font); 183 pango_layout_set_font_description (self->pl, font);
141} 184}
142 185
143static void 186static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 187layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 188{
189 PangoRectangle rect;
190
191 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 192 pango_layout_get_extents (self->pl, 0, &rect);
147 193
148 if (!*w) *w = 1; 194 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 195 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 196
151 *w = (*w + 3) & ~3; 197 if (!rect.width) rect.width = 1;
152} 198 if (!rect.height) rect.height = 1;
153 199
200 *w = rect.width;
201 *h = rect.height;
202}
203
204typedef uint16_t tileid;
154typedef uint16_t mapface; 205typedef uint16_t faceid;
155 206
156typedef struct { 207typedef struct {
157 GLint name; 208 int name;
158 int w, h; 209 int w, h;
159 float s, t; 210 float s, t;
160 uint8_t r, g, b, a; 211 uint8_t r, g, b, a;
212 tileid smoothtile;
213 uint8_t smoothlevel;
161} maptex; 214} maptex;
162 215
163typedef struct { 216typedef struct {
217 uint32_t player;
218 tileid tile[3];
164 int16_t darkness; 219 uint16_t darkness;
165 mapface face[3]; 220 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 221} mapcell;
167 222
168typedef struct { 223typedef struct {
169 int32_t c0, c1; 224 int32_t c0, c1;
170 mapcell *col; 225 mapcell *col;
171} maprow; 226} maprow;
172 227
173typedef struct map { 228typedef struct map {
174 int x, y, w, h; 229 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 230 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 231 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 232 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 233
182 int32_t rows; 234 int32_t rows;
183 maprow *row; 235 maprow *row;
184} *CFClient__Map; 236} *CFPlus__Map;
185 237
186static char * 238static char *
187prepend (char *ptr, int sze, int inc) 239prepend (char *ptr, int sze, int inc)
188{ 240{
189 char *p; 241 char *p;
206} 258}
207 259
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 260#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 261#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 262
263static void
264need_facenum (struct map *self, faceid face)
265{
266 while (self->faces <= face)
267 {
268 Append (tileid, self->face2tile, self->faces, self->faces);
269 self->faces *= 2;
270 }
271}
272
273static void
274need_texid (struct map *self, int texid)
275{
276 while (self->texs <= texid)
277 {
278 Append (maptex, self->tex, self->texs, self->texs);
279 self->texs *= 2;
280 }
281}
282
211static maprow * 283static maprow *
212map_get_row (CFClient__Map self, int y) 284map_get_row (CFPlus__Map self, int y)
213{ 285{
214 if (0 > y) 286 if (0 > y)
215 { 287 {
216 int extend = - y + MAP_EXTEND_Y; 288 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 289 Prepend (maprow, self->row, self->rows, extend);
255 327
256 return row->col + (x - row->c0); 328 return row->col + (x - row->c0);
257} 329}
258 330
259static mapcell * 331static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 332map_get_cell (CFPlus__Map self, int x, int y)
261{ 333{
262 return row_get_cell (map_get_row (self, y), x); 334 return row_get_cell (map_get_row (self, y), x);
263} 335}
264 336
265static void 337static void
266map_clear (CFClient__Map self) 338map_clear (CFPlus__Map self)
267{ 339{
268 int r; 340 int r;
269 341
270 for (r = 0; r < self->rows; r++) 342 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 343 Safefree (self->row[r].col);
279 self->row = 0; 351 self->row = 0;
280 self->rows = 0; 352 self->rows = 0;
281} 353}
282 354
283static void 355static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 356map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 357{
286 int x, y; 358 int x, y;
287 maprow *row; 359 maprow *row;
360 mapcell *cell;
288 361
289 for (y = y0; y < y0 + h; y++) 362 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 363 if (y >= 0)
291 { 364 {
292 if (y >= self->rows) 365 if (y >= self->rows)
298 if (x >= row->c0) 371 if (x >= row->c0)
299 { 372 {
300 if (x >= row->c1) 373 if (x >= row->c1)
301 break; 374 break;
302 375
303 row->col[x - row->c0].darkness = -1; 376 cell = row->col + x - row->c0;
377
378 cell->darkness = 0;
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
304 } 382 }
305 } 383 }
384}
385
386typedef struct {
387 tileid tile;
388 uint8_t x, y, level;
389} smooth_key;
390
391static void
392smooth_or_bits (HV *hv, smooth_key *key, IV bits)
393{
394 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
395
396 if (SvIOK (*sv))
397 SvIV_set (*sv, SvIVX (*sv) | bits);
398 else
399 sv_setiv (*sv, bits);
306} 400}
307 401
308static void 402static void
309music_finished (void) 403music_finished (void)
310{ 404{
346 n |= n >> 16; 440 n |= n >> 16;
347 441
348 return n + 1; 442 return n + 1;
349} 443}
350 444
445/* SDL should provide this, really. */
446#define SDLK_MODIFIER_MIN 300
447#define SDLK_MODIFIER_MAX 314
448
449/******************************************************************************/
450
451static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
452static GV *hover_gv;
453
454static int
455within_widget (SV *widget, NV x, NV y)
456{
457 HV *self;
458 SV **svp;
459 NV wx, ww, wy, wh;
460
461 if (!SvROK (widget))
462 return 0;
463
464 self = (HV *)SvRV (widget);
465
466 if (SvTYPE (self) != SVt_PVHV)
467 return 0;
468
469 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
470 if (y < wy)
471 return 0;
472
473 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
474 if (y >= wy + wh)
475 return 0;
476
477 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
478 if (x < wx)
479 return 0;
480
481 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
482 if (x >= wx + ww)
483 return 0;
484
485 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
486 if (!svp || !SvTRUE (*svp))
487 return 0;
488
489 return 1;
490}
491
351MODULE = CFClient PACKAGE = CFClient 492MODULE = CFPlus PACKAGE = CFPlus
352 493
353PROTOTYPES: ENABLE 494PROTOTYPES: ENABLE
354 495
355BOOT: 496BOOT:
356{ 497{
357 HV *stash = gv_stashpv ("CFClient", 1); 498 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 499 static const struct {
359 const char *name; 500 const char *name;
360 IV iv; 501 IV iv;
361 } *civ, const_iv[] = { 502 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 503# define const_iv(name) { # name, (IV)name }
504 const_iv (SDLK_MODIFIER_MIN),
505 const_iv (SDLK_MODIFIER_MAX),
506
363 const_iv (SDL_ACTIVEEVENT), 507 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 508 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 509 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 510 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 511 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 520 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 521 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 522 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 523 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 524 const_iv (SDL_USEREVENT),
525
526 const_iv (SDL_APPINPUTFOCUS),
527 const_iv (SDL_APPMOUSEFOCUS),
528 const_iv (SDL_APPACTIVE),
529
381 const_iv (SDLK_KP0), 530 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 531 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 532 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 533 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 534 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 589 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 590 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 591 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 592 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 593 const_iv (SDLK_UNDO),
594
445 const_iv (KMOD_NONE), 595 const_iv (KMOD_NONE),
596 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 597 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 598 const_iv (KMOD_RSHIFT),
599 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 600 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 601 const_iv (KMOD_RCTRL),
602 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 603 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 604 const_iv (KMOD_RALT),
605 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 606 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 607 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 608 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 609 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 610 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 611# undef const_iv
462 }; 612 };
463 613
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 614 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 615 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
616
617 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
618 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 619}
620
621void
622weaken (SV *rv)
623 PROTOTYPE: $
624 CODE:
625 sv_rvweaken (rv);
626
627int
628in_destruct ()
629 CODE:
630 RETVAL = PL_main_cv == Nullcv;
631 OUTPUT:
632 RETVAL
467 633
468NV floor (NV x) 634NV floor (NV x)
469 635
470NV ceil (NV x) 636NV ceil (NV x)
471 637
476 opengl_fontmap = pango_opengl_font_map_new (); 642 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 643 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 644 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
479} 645}
480 646
647char *
648SDL_GetError ()
649
481int 650int
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 651SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 652
484void 653void
485SDL_Quit () 654SDL_Quit ()
486 655
487void 656void
488SDL_ListModes () 657SDL_ListModes (int rgb, int alpha)
489 PPCODE: 658 PPCODE:
490{ 659{
491 SDL_Rect **m; 660 SDL_Rect **m;
492 661
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 662 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 663 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 664 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 665 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 666
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 667 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 668 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 669
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 670 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 671 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 672 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 673 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 674
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 675 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 676#if SDL_VERSION_ATLEAST(1,2,10)
508 SDL_EnableUNICODE (1); 677 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 678 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679#endif
510 680
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 681 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 682
513 if (m && m != (SDL_Rect **)-1) 683 if (m && m != (SDL_Rect **)-1)
514 while (*m) 684 while (*m)
515 { 685 {
686 if ((*m)->w >= 640 && (*m)->h >= 480)
687 {
516 AV *av = newAV (); 688 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 689 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 690 av_push (av, newSViv ((*m)->h));
691 av_push (av, newSViv (rgb));
692 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 693 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
694 }
520 695
521 ++m; 696 ++m;
522 } 697 }
523} 698}
524 699
525char *
526SDL_GetError ()
527
528int 700int
529SDL_SetVideoMode (int w, int h, int fullscreen) 701SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 702 CODE:
703{
704 SDL_EnableUNICODE (1);
705 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
706
707 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
708 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
709 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
710 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
711
531 RETVAL = !!SDL_SetVideoMode ( 712 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 713 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 714 );
715
534 if (RETVAL) 716 if (RETVAL)
535 { 717 {
718 av_clear (texture_av);
719
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 720 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 721#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 722#include "glfunc.h"
539# undef GL_FUNC 723#undef GL_FUNC
540 } 724 }
725}
541 OUTPUT: 726 OUTPUT:
542 RETVAL 727 RETVAL
543 728
544void 729void
545SDL_GL_SwapBuffers () 730SDL_GL_SwapBuffers ()
546 731
547char * 732char *
548SDL_GetKeyName (int sym) 733SDL_GetKeyName (int sym)
549 734
735int
736SDL_GetAppState ()
737
550void 738void
551SDL_PollEvent () 739poll_events ()
552 PPCODE: 740 PPCODE:
553{ 741{
554 SDL_Event ev; 742 SDL_Event ev;
555 743
556 while (SDL_PollEvent (&ev)) 744 SDL_PumpEvents ();
745 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 746 {
558 HV *hv = newHV (); 747 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 748 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 749
561 switch (ev.type) 750 switch (ev.type)
563 case SDL_KEYDOWN: 752 case SDL_KEYDOWN:
564 case SDL_KEYUP: 753 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 754 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 755 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 756 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
757 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 758 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 759 break;
570 760
571 case SDL_ACTIVEEVENT: 761 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 762 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 763 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 764 break;
575 765
576 case SDL_MOUSEMOTION: 766 case SDL_MOUSEMOTION:
767 {
768 int state = ev.motion.state;
769 int x = ev.motion.x;
770 int y = ev.motion.y;
771 int xrel = ev.motion.xrel;
772 int yrel = ev.motion.yrel;
773
774 /* do simplistic event compression */
775 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
776 && state == ev.motion.state)
777 {
778 xrel += ev.motion.xrel;
779 yrel += ev.motion.yrel;
780 x = ev.motion.x;
781 y = ev.motion.y;
782 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783 }
784
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 786 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 787 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 788 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 789 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 790 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791 }
584 break; 792 break;
585 793
586 case SDL_MOUSEBUTTONDOWN: 794 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 795 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 796 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 806 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 807 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 808 break;
601 } 809 }
602 810
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 811 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 812 }
605} 813}
606 814
607int 815int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 816Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
609 POSTCALL: 817 POSTCALL:
610 Mix_HookMusicFinished (music_finished); 818 Mix_HookMusicFinished (music_finished);
611 Mix_ChannelFinished (channel_finished); 819 Mix_ChannelFinished (channel_finished);
612 820
613void 821void
614Mix_CloseAudio () 822Mix_CloseAudio ()
615 823
616int 824int
617Mix_AllocateChannels (int numchans = -1) 825Mix_AllocateChannels (int numchans = -1)
618 826
827const char *
828Mix_GetError ()
829
619void 830void
620lowdelay (int fd, int val = 1) 831lowdelay (int fd, int val = 1)
621 CODE: 832 CODE:
833 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
834
835void
836win32_proxy_info ()
837 PPCODE:
838{
622#ifndef _WIN32 839#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 840 char buffer[2048];
841 DWORD buflen;
842
843 EXTEND (SP, 3);
844
845 buflen = sizeof (buffer);
846 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
847 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
848 {
849 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
850
851 buflen = sizeof (buffer);
852 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
853 {
854 PUSHs (newSVpv (buffer, 0));
855
856 buflen = sizeof (buffer);
857 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
858 PUSHs (newSVpv (buffer, 0));
859 }
860 }
624#endif 861#endif
862}
625 863
626void 864void
627add_font (char *file) 865add_font (char *file)
628 CODE: 866 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 867 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 868
631void 869void
632load_image_inline (SV *image_) 870load_image_inline (SV *image_)
633 ALIAS: 871 ALIAS:
634 load_image_file = 1 872 load_image_file = 1
637 STRLEN image_len; 875 STRLEN image_len;
638 char *image = (char *)SvPVbyte (image_, image_len); 876 char *image = (char *)SvPVbyte (image_, image_len);
639 SDL_Surface *surface, *surface2; 877 SDL_Surface *surface, *surface2;
640 SDL_PixelFormat fmt; 878 SDL_PixelFormat fmt;
641 SDL_RWops *rw = ix 879 SDL_RWops *rw = ix
642 ? SDL_RWFromFile (image, "r") 880 ? SDL_RWFromFile (image, "rb")
643 : SDL_RWFromConstMem (image, image_len); 881 : SDL_RWFromConstMem (image, image_len);
644 882
645 if (!rw) 883 if (!rw)
646 croak ("load_image: %s", SDL_GetError ()); 884 croak ("load_image: %s", SDL_GetError ());
647 885
676 914
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 915 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 916
679 assert (surface2->pitch == surface2->w * 4); 917 assert (surface2->pitch == surface2->w * 4);
680 918
919 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 920 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 921 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 922 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 923 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 924 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 925 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 926 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
927 SDL_UnlockSurface (surface2);
690 928
691 SDL_FreeSurface (surface); 929 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 930 SDL_FreeSurface (surface2);
693} 931}
694 932
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 971 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 972#endif
735 _exit (1); 973 _exit (1);
736 974
737void 975void
738_exit (int retval) 976_exit (int retval = 0)
739 CODE: 977 CODE:
978#ifdef WIN32
979 ExitThread (retval); // unclean, please beam me up
980#else
740 _exit (retval); 981 _exit (retval);
982#endif
741 983
984void
985debug ()
986 CODE:
987{
988#if DEBUG
989 VALGRIND_DO_LEAK_CHECK;
990#endif
991}
992
742MODULE = CFClient PACKAGE = CFClient::Font 993MODULE = CFPlus PACKAGE = CFPlus::Font
743 994
744CFClient::Font 995PROTOTYPES: DISABLE
996
997CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 998new_from_file (SV *class, char *path, int id = 0)
746 CODE: 999 CODE:
747{ 1000{
748 int count; 1001 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1002 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
752} 1005}
753 OUTPUT: 1006 OUTPUT:
754 RETVAL 1007 RETVAL
755 1008
756void 1009void
757DESTROY (CFClient::Font self) 1010DESTROY (CFPlus::Font self)
758 CODE: 1011 CODE:
759 pango_font_description_free (self); 1012 pango_font_description_free (self);
760 1013
761void 1014void
762make_default (CFClient::Font self) 1015make_default (CFPlus::Font self)
1016 PROTOTYPE: $
763 CODE: 1017 CODE:
764 default_font = self; 1018 default_font = self;
765 1019
766MODULE = CFClient PACKAGE = CFClient::Layout 1020MODULE = CFPlus PACKAGE = CFPlus::Layout
767 1021
1022PROTOTYPES: DISABLE
1023
768void 1024void
769clear_font_cache () 1025reset_glyph_cache ()
1026 PROTOTYPE:
770 CODE: 1027 CODE:
771 tc_clear (); 1028 tc_clear ();
772 1029
773CFClient::Layout 1030CFPlus::Layout
774new (SV *class, int type = 0) 1031new (SV *class)
775 CODE: 1032 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 1033 New (0, RETVAL, 1, struct cf_layout);
777 1034
778 RETVAL->pl = pango_layout_new (opengl_context); 1035 RETVAL->pl = pango_layout_new (opengl_context);
779 RETVAL->r = 1.; 1036 RETVAL->r = 1.;
780 RETVAL->g = 1.; 1037 RETVAL->g = 1.;
781 RETVAL->b = 1.; 1038 RETVAL->b = 1.;
782 RETVAL->a = 1.; 1039 RETVAL->a = 1.;
783 RETVAL->base_height = MIN_FONT_HEIGHT; 1040 RETVAL->base_height = MIN_FONT_HEIGHT;
784 RETVAL->font = 0; 1041 RETVAL->font = 0;
1042 RETVAL->rc = rc_alloc ();
785 1043
786 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1044 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
787 layout_update_font (RETVAL); 1045 layout_update_font (RETVAL);
788 OUTPUT: 1046 OUTPUT:
789 RETVAL 1047 RETVAL
790 1048
791void 1049void
792DESTROY (CFClient::Layout self) 1050DESTROY (CFPlus::Layout self)
793 CODE: 1051 CODE:
794 g_object_unref (self->pl); 1052 g_object_unref (self->pl);
1053 rc_free (self->rc);
795 Safefree (self); 1054 Safefree (self);
796 1055
797void 1056void
798set_text (CFClient::Layout self, SV *text_) 1057set_text (CFPlus::Layout self, SV *text_)
799 CODE: 1058 CODE:
800{ 1059{
801 STRLEN textlen; 1060 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 1061 char *text = SvPVutf8 (text_, textlen);
803 1062
804 pango_layout_set_text (self->pl, text, textlen); 1063 pango_layout_set_text (self->pl, text, textlen);
805} 1064}
806 1065
807void 1066void
808set_markup (CFClient::Layout self, SV *text_) 1067set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 1068 CODE:
810{ 1069{
811 STRLEN textlen; 1070 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 1071 char *text = SvPVutf8 (text_, textlen);
813 1072
814 pango_layout_set_markup (self->pl, text, textlen); 1073 pango_layout_set_markup (self->pl, text, textlen);
815} 1074}
816 1075
817void 1076void
818set_shapes (CFClient::Layout self, ...) 1077set_shapes (CFPlus::Layout self, ...)
819 CODE: 1078 CODE:
820{ 1079{
821 PangoAttrList *attrs = 0; 1080 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 1081 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 1082 const char *pos = text;
858 if (attrs) 1117 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 1118 pango_layout_set_attributes (self->pl, attrs);
860} 1119}
861 1120
862void 1121void
863get_shapes (CFClient::Layout self) 1122get_shapes (CFPlus::Layout self)
864 PPCODE: 1123 PPCODE:
865{ 1124{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1125 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 1126
868 do 1127 do
872 if (run && shape_attr_p (run)) 1131 if (run && shape_attr_p (run))
873 { 1132 {
874 PangoRectangle extents; 1133 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 1134 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 1135
1136 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1137 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1138 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 1139 }
880 } 1140 }
881 while (pango_layout_iter_next_run (iter)); 1141 while (pango_layout_iter_next_run (iter));
882 1142
883 pango_layout_iter_free (iter); 1143 pango_layout_iter_free (iter);
884} 1144}
885 1145
886int 1146int
887has_wrapped (CFClient::Layout self) 1147has_wrapped (CFPlus::Layout self)
888 CODE: 1148 CODE:
889{ 1149{
890 int lines = 1; 1150 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 1151 const char *text = pango_layout_get_text (self->pl);
892 1152
897} 1157}
898 OUTPUT: 1158 OUTPUT:
899 RETVAL 1159 RETVAL
900 1160
901SV * 1161SV *
902get_text (CFClient::Layout self) 1162get_text (CFPlus::Layout self)
903 CODE: 1163 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1164 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 1165 sv_utf8_decode (RETVAL);
906 OUTPUT: 1166 OUTPUT:
907 RETVAL 1167 RETVAL
908 1168
909void 1169void
910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1170set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
911 CODE: 1171 CODE:
912 self->r = r; 1172 self->r = r;
913 self->g = g; 1173 self->g = g;
914 self->b = b; 1174 self->b = b;
915 self->a = a; 1175 self->a = a;
916 1176
917void 1177void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 1178set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 1179 CODE:
920 if (self->font != font) 1180 if (self->font != font)
921 { 1181 {
922 self->font = font; 1182 self->font = font;
923 layout_update_font (self); 1183 layout_update_font (self);
924 } 1184 }
925 1185
926void 1186void
927set_height (CFClient::Layout self, int base_height) 1187set_height (CFPlus::Layout self, int base_height)
928 CODE: 1188 CODE:
929 if (self->base_height != base_height) 1189 if (self->base_height != base_height)
930 { 1190 {
931 self->base_height = base_height; 1191 self->base_height = base_height;
932 layout_update_font (self); 1192 layout_update_font (self);
933 } 1193 }
934 1194
935void 1195void
936set_width (CFClient::Layout self, int max_width = -1) 1196set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 1197 CODE:
938 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1198 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939 1199
940void 1200void
941set_indent (CFClient::Layout self, int indent) 1201set_indent (CFPlus::Layout self, int indent)
942 CODE: 1202 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1203 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1204
945void 1205void
946set_spacing (CFClient::Layout self, int spacing) 1206set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1207 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1208 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1209
950void 1210void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1211set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1212 CODE:
953 pango_layout_set_ellipsize (self->pl, 1213 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1214 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1215 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1216 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1217 : PANGO_ELLIPSIZE_NONE
958 ); 1218 );
959 1219
960void 1220void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1221set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1222 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1223 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1224
965void 1225void
966size (CFClient::Layout self) 1226size (CFPlus::Layout self)
967 PPCODE: 1227 PPCODE:
968{ 1228{
969 int w, h; 1229 int w, h;
970 1230
971 layout_get_pixel_size (self, &w, &h); 1231 layout_get_pixel_size (self, &w, &h);
974 PUSHs (sv_2mortal (newSViv (w))); 1234 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1235 PUSHs (sv_2mortal (newSViv (h)));
976} 1236}
977 1237
978int 1238int
979descent (CFClient::Layout self) 1239descent (CFPlus::Layout self)
980 CODE: 1240 CODE:
981{ 1241{
982 PangoRectangle rect; 1242 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1243 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1244 pango_layout_line_get_pixel_extents (line, 0, &rect);
986} 1246}
987 OUTPUT: 1247 OUTPUT:
988 RETVAL 1248 RETVAL
989 1249
990int 1250int
991xy_to_index (CFClient::Layout self, int x, int y) 1251xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1252 CODE:
993{ 1253{
994 int index, trailing; 1254 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1255 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1256 RETVAL = index + trailing;
997} 1257}
998 OUTPUT: 1258 OUTPUT:
999 RETVAL 1259 RETVAL
1000 1260
1001void 1261void
1002cursor_pos (CFClient::Layout self, int index) 1262cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1263 PPCODE:
1004{ 1264{
1005 PangoRectangle strong_pos; 1265 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1266 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1267
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1270 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1271 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1272}
1013 1273
1014void 1274void
1015render (CFClient::Layout self, float x, float y) 1275index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016 PPCODE: 1276 PPCODE:
1277{
1278 int line, x;
1279
1280 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1281 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282
1283 EXTEND (SP, 2);
1284 PUSHs (sv_2mortal (newSViv (line - 1)));
1285 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286}
1287
1288void
1289line_x_to_index (CFPlus::Layout self, int line, int x)
1290 PPCODE:
1291{
1292 PangoLayoutLine *lp;
1293 int index, trailing;
1294
1295 if (line < 0)
1296 XSRETURN_EMPTY;
1297
1298 if (!(lp = pango_layout_get_line (self->pl, line)))
1299 XSRETURN_EMPTY; /* do better */
1300
1301 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302
1303 EXTEND (SP, 2);
1304 if (GIMME_V == G_SCALAR)
1305 PUSHs (sv_2mortal (newSViv (index + trailing)));
1306 else
1307 {
1308 PUSHs (sv_2mortal (newSViv (index)));
1309 PUSHs (sv_2mortal (newSViv (trailing)));
1310 }
1311}
1312
1313void
1314render (CFPlus::Layout self, float x, float y, int flags = 0)
1315 CODE:
1316 rc_clear (self->rc);
1017 pango_opengl_render_layout_subpixel ( 1317 pango_opengl_render_layout_subpixel (
1018 self->pl, 1318 self->pl,
1319 self->rc,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1320 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1321 self->r, self->g, self->b, self->a,
1322 flags
1021 ); 1323 );
1324 // we assume that context_change actually clears/frees stuff
1325 // and does not do any recomputation...
1326 pango_layout_context_changed (self->pl);
1022 1327
1328void
1329draw (CFPlus::Layout self)
1330 CODE:
1331{
1332 glEnable (GL_TEXTURE_2D);
1333 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334 glEnable (GL_BLEND);
1335 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1336 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1337 glEnable (GL_ALPHA_TEST);
1338 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1339
1340 rc_draw (self->rc);
1341
1342 glDisable (GL_ALPHA_TEST);
1343 glDisable (GL_BLEND);
1344 glDisable (GL_TEXTURE_2D);
1345}
1346
1023MODULE = CFClient PACKAGE = CFClient::Texture 1347MODULE = CFPlus PACKAGE = CFPlus::Texture
1024 1348
1025void 1349PROTOTYPES: ENABLE
1026pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE:
1028{
1029 int ow = SvIV (w_);
1030 int oh = SvIV (h_);
1031 1350
1032 if (ow && oh) 1351int minpot (int n)
1352
1353void
1354pad (SV *data_, int ow, int oh, int nw, int nh)
1355 CODE:
1356{
1357 if ((nw != ow || nh != oh) && SvOK (data_))
1033 { 1358 {
1034 int nw = minpot (ow);
1035 int nh = minpot (oh);
1036
1037 if (nw != ow || nh != oh)
1038 {
1039 if (SvOK (data_))
1040 {
1041 STRLEN datalen; 1359 STRLEN datalen;
1042 char *data = SvPVbyte (data_, datalen); 1360 char *data = SvPVbyte (data_, datalen);
1043 int bpp = datalen / (ow * oh); 1361 int bpp = datalen / (ow * oh);
1044 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1362 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1045 1363
1046 SvPOK_only (result_); 1364 SvPOK_only (result_);
1047 SvCUR_set (result_, nw * nh * bpp); 1365 SvCUR_set (result_, nw * nh * bpp);
1048 1366
1049 memset (SvPVX (result_), 0, nw * nh * bpp); 1367 memset (SvPVX (result_), 0, nw * nh * bpp);
1050 while (oh--) 1368 while (oh--)
1051 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1369 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1052 1370
1053 sv_setsv (data_, result_); 1371 sv_setsv (data_, result_);
1054 }
1055
1056 sv_setiv (w_, nw);
1057 sv_setiv (h_, nh);
1058 }
1059 } 1372 }
1060} 1373}
1061 1374
1062void 1375void
1063draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1376draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1069{ 1382{
1070 HV *hv = (HV *)SvRV (self); 1383 HV *hv = (HV *)SvRV (self);
1071 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1384 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1072 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1385 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1073 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1386 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1387
1388 if (name <= 0)
1389 XSRETURN_EMPTY;
1074 1390
1075 if (items < 5) 1391 if (items < 5)
1076 { 1392 {
1077 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1393 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1078 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1394 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1106 glDisable (GL_ALPHA_TEST); 1422 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1423 glDisable (GL_BLEND);
1108 } 1424 }
1109} 1425}
1110 1426
1427IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428 CODE:
1429{
1430 GLint width;
1431 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1432 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1433 RETVAL = width > 0;
1434}
1435 OUTPUT:
1436 RETVAL
1437
1111MODULE = CFClient PACKAGE = CFClient::Map 1438MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1439
1113CFClient::Map 1440PROTOTYPES: DISABLE
1114new (SV *class, int map_width, int map_height) 1441
1442CFPlus::Map
1443new (SV *class)
1115 CODE: 1444 CODE:
1116 New (0, RETVAL, 1, struct map); 1445 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1446 RETVAL->x = 0;
1118 RETVAL->y = 0; 1447 RETVAL->y = 0;
1119 RETVAL->w = map_width; 1448 RETVAL->w = 0;
1120 RETVAL->h = map_height; 1449 RETVAL->h = 0;
1121 RETVAL->ox = 0; 1450 RETVAL->ox = 0;
1122 RETVAL->oy = 0; 1451 RETVAL->oy = 0;
1123 RETVAL->faces = 8192; 1452 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1453 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125 RETVAL->texs = 8192;
1126 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127 RETVAL->rows = 0; 1454 RETVAL->rows = 0;
1128 RETVAL->row = 0; 1455 RETVAL->row = 0;
1129 OUTPUT: 1456 OUTPUT:
1130 RETVAL 1457 RETVAL
1131 1458
1132void 1459void
1133DESTROY (CFClient::Map self) 1460DESTROY (CFPlus::Map self)
1134 CODE: 1461 CODE:
1135{ 1462{
1136 map_clear (self); 1463 map_clear (self);
1137 Safefree (self->face); 1464 Safefree (self->face2tile);
1138 Safefree (self->tex); 1465 Safefree (self->tex);
1139 Safefree (self); 1466 Safefree (self);
1140} 1467}
1141 1468
1142void 1469void
1470resize (CFPlus::Map self, int map_width, int map_height)
1471 CODE:
1472 self->w = map_width;
1473 self->h = map_height;
1474
1475void
1143clear (CFClient::Map self) 1476clear (CFPlus::Map self)
1144 CODE: 1477 CODE:
1145 map_clear (self); 1478 map_clear (self);
1146 1479
1147void 1480void
1148set_face (CFClient::Map self, int face, int texid) 1481set_tileid (CFPlus::Map self, int face, int tile)
1149 CODE: 1482 CODE:
1150{ 1483{
1151 while (self->faces <= face) 1484 need_facenum (self, face); self->face2tile [face] = tile;
1152 { 1485 need_texid (self, tile);
1153 Append (mapface, self->face, self->faces, self->faces);
1154 self->faces *= 2;
1155 }
1156
1157 self->face [face] = texid;
1158} 1486}
1159 1487
1160void 1488void
1489set_smooth (CFPlus::Map self, int face, int smooth, int level)
1490 CODE:
1491{
1492 tileid texid;
1493 maptex *tex;
1494
1495 if (face < 0 || face >= self->faces)
1496 return;
1497
1498 if (smooth < 0 || smooth >= self->faces)
1499 return;
1500
1501 texid = self->face2tile [face];
1502
1503 if (!texid)
1504 return;
1505
1506 tex = self->tex + texid;
1507 tex->smoothtile = self->face2tile [smooth];
1508 tex->smoothlevel = level;
1509}
1510
1511void
1161set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1512set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1162 CODE: 1513 CODE:
1163{ 1514{
1164 while (self->texs <= texid) 1515 need_texid (self, texid);
1165 {
1166 Append (maptex, self->tex, self->texs, self->texs);
1167 self->texs *= 2;
1168 }
1169 1516
1170 { 1517 {
1171 maptex *tex = self->tex + texid; 1518 maptex *tex = self->tex + texid;
1172 1519
1173 tex->name = name; 1520 tex->name = name;
1190 // from transparent color bleeding and ugly wrapping effects. 1537 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1538 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1539}
1193 1540
1194int 1541int
1195ox (CFClient::Map self) 1542ox (CFPlus::Map self)
1196 ALIAS: 1543 ALIAS:
1197 oy = 1 1544 oy = 1
1198 x = 2 1545 x = 2
1199 y = 3 1546 y = 3
1200 w = 4 1547 w = 4
1211 } 1558 }
1212 OUTPUT: 1559 OUTPUT:
1213 RETVAL 1560 RETVAL
1214 1561
1215void 1562void
1216scroll (CFClient::Map self, int dx, int dy) 1563scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1564 CODE:
1218{ 1565{
1219 if (dx > 0) 1566 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1567 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1568 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1569 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1223 1570
1224 if (dy > 0) 1571 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1572 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1573 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1574 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1228 1575
1229 self->ox += dx; self->x += dx; 1576 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1577 self->oy += dy; self->y += dy;
1231 1578
1232 while (self->y < 0) 1579 while (self->y < 0)
1236 self->rows += MAP_EXTEND_Y; 1583 self->rows += MAP_EXTEND_Y;
1237 self->y += MAP_EXTEND_Y; 1584 self->y += MAP_EXTEND_Y;
1238 } 1585 }
1239} 1586}
1240 1587
1241void 1588SV *
1242map1a_update (CFClient::Map self, SV *data_) 1589map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1590 CODE:
1244{ 1591{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1592 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1593 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1594 mapcell *cell;
1248 int x, y, flags; 1595 int x, y, z, flags;
1596 AV *missing = newAV ();
1597 RETVAL = newRV_noinc ((SV *)missing);
1249 1598
1250 while (data < data_end) 1599 while (data < data_end - 1)
1251 { 1600 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1601 flags = (data [0] << 8) + data [1]; data += 2;
1253 1602
1254 x = self->x + ((flags >> 10) & 63); 1603 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1604 y = self->y + ((flags >> 4) & 63);
1256 1605
1257 cell = map_get_cell (self, x, y); 1606 cell = map_get_cell (self, x, y);
1258 1607
1259 if (flags & 15) 1608 if (flags & 15)
1260 { 1609 {
1261 if (cell->darkness < 0) 1610 if (!cell->darkness)
1262 { 1611 {
1612 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1613 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1614 }
1268 1615
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1616 //TODO: don't trust server data to be in-range(!)
1272 1617
1273 if (flags & 4) 1618 if (flags & 8)
1274 { 1619 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1620 if (extmap)
1621 {
1622 uint8_t ext, cmd;
1623
1624 do
1625 {
1626 ext = *data++;
1627 cmd = ext & 0x3f;
1628
1629 if (cmd < 4)
1630 cell->darkness = 255 - ext * 64 + 1;
1631 else if (cmd == 5) // health
1632 {
1633 cell->stat_width = 1;
1634 cell->stat_hp = *data++;
1635 }
1636 else if (cmd == 6) // monster width
1637 cell->stat_width = *data++ + 1;
1638 else if (cmd == 0x47)
1639 {
1640 if (*data == 4)
1641 ; // decode player count
1642
1643 data += *data + 1;
1644 }
1645 else if (cmd == 8) // cell flags
1646 cell->flags = *data++;
1647 else if (ext & 0x40) // unknown, multibyte => skip
1648 data += *data + 1;
1649 else
1650 data++;
1651 }
1652 while (ext & 0x80);
1653 }
1654 else
1655 cell->darkness = *data++ + 1;
1276 } 1656 }
1277 1657
1658 for (z = 0; z <= 2; ++z)
1278 if (flags & 2) 1659 if (flags & (4 >> z))
1279 { 1660 {
1280 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1661 faceid face = (data [0] << 8) + data [1]; data += 2;
1662 need_facenum (self, face);
1663 cell->tile [z] = self->face2tile [face];
1664
1665 if (cell->tile [z])
1666 {
1667 maptex *tex = self->tex + cell->tile [z];
1668 if (!tex->name)
1669 av_push (missing, newSViv (cell->tile [z]));
1670
1671 if (tex->smoothtile)
1672 {
1673 maptex *smooth = self->tex + tex->smoothtile;
1674 if (!smooth->name)
1675 av_push (missing, newSViv (tex->smoothtile));
1676 }
1677 }
1281 } 1678 }
1282
1283 if (flags & 1)
1284 {
1285 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1286 }
1287 } 1679 }
1288 else 1680 else
1289 cell->darkness = -1; 1681 cell->darkness = 0;
1290 } 1682 }
1291} 1683}
1684 OUTPUT:
1685 RETVAL
1292 1686
1293SV * 1687SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1688mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1689 CODE:
1296{ 1690{
1297 int x1, x; 1691 int x1, x;
1298 int y1, y; 1692 int y1, y;
1299 int z; 1693 int z;
1320 { 1714 {
1321 mapcell *cell = row->col + (x - row->c0); 1715 mapcell *cell = row->col + (x - row->c0);
1322 1716
1323 for (z = 0; z <= 0; z++) 1717 for (z = 0; z <= 0; z++)
1324 { 1718 {
1325 mapface face = cell->face [z];
1326
1327 if (face)
1328 {
1329 maptex tex = self->tex [face]; 1719 maptex tex = self->tex [cell->tile [z]];
1330 int a0 = 255 - tex.a; 1720 int a0 = 255 - tex.a;
1331 int a1 = tex.a; 1721 int a1 = tex.a;
1332 1722
1333 r = (r * a0 + tex.r * a1) / 255; 1723 r = (r * a0 + tex.r * a1) / 255;
1334 g = (g * a0 + tex.g * a1) / 255; 1724 g = (g * a0 + tex.g * a1) / 255;
1335 b = (b * a0 + tex.b * a1) / 255; 1725 b = (b * a0 + tex.b * a1) / 255;
1336 a = (a * a0 + tex.a * a1) / 255; 1726 a = (a * a0 + tex.a * a1) / 255;
1337 }
1338 } 1727 }
1339 } 1728 }
1340 1729
1341 *map++ = (r ) 1730 *map++ = (r )
1342 | (g << 8) 1731 | (g << 8)
1349} 1738}
1350 OUTPUT: 1739 OUTPUT:
1351 RETVAL 1740 RETVAL
1352 1741
1353void 1742void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1743draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1355 CODE: 1744 CODE:
1356{ 1745{
1357 int vx, vy;
1358 int x, y, z; 1746 int x, y, z;
1359 int last_name;
1360 mapface face;
1361 1747
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1748 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1749 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1751 smooth_key skey;
1364 1752
1365 /* 1753 rc_t *rc = rc_alloc ();
1366 int vx = self->vx = self->w >= sw 1754 rc_key_t key;
1367 ? self->x + (self->w - sw) / 2 1755 rc_array_t *arr;
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369 1756
1370 int vy = self->vy = self->h >= sh 1757 // thats current max. sorry.
1371 ? self->y + (self->h - sh) / 2 1758 if (sw > 255) sw = 255;
1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1759 if (sh > 255) sh = 255;
1373 */
1374 1760
1375 glColor4ub (255, 255, 255, 255); 1761 // clear key, in case of extra padding
1762 memset (&skey, 0, sizeof (skey));
1763
1764 memset (&key, 0, sizeof (key));
1765 key.r = 255;
1766 key.g = 255;
1767 key.b = 255;
1768 key.a = 255;
1769 key.mode = GL_QUADS;
1770 key.format = GL_T2F_V3F;
1771 key.texname = -1;
1772
1773 mx += self->x;
1774 my += self->y;
1775
1776 // first pass: determine smooth_max
1777 // rather ugly, if you ask me
1778 // could also be stored inside mapcell and updated on change
1779 memset (smooth_max, 0, sizeof (smooth_max));
1780
1781 for (y = 0; y < sh; y++)
1782 if (0 <= y + my && y + my < self->rows)
1783 {
1784 maprow *row = self->row + (y + my);
1785
1786 for (x = 0; x < sw; x++)
1787 if (row->c0 <= x + mx && x + mx < row->c1)
1788 {
1789 mapcell *cell = row->col + (x + mx - row->c0);
1790
1791 smooth_max[x + 1][y + 1] =
1792 MAX (self->tex [cell->tile [0]].smoothlevel,
1793 MAX (self->tex [cell->tile [1]].smoothlevel,
1794 self->tex [cell->tile [2]].smoothlevel));
1795 }
1796 }
1376 1797
1377 glEnable (GL_BLEND); 1798 glEnable (GL_BLEND);
1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1799 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1379 glEnable (GL_TEXTURE_2D);
1380 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1800 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1381 1801
1382 glBegin (GL_QUADS);
1383
1384 last_name = 0;
1385
1386 for (z = 0; z < 3; z++) 1802 for (z = 0; z <= 2; z++)
1803 {
1804 memset (smooth_level, 0, sizeof (smooth_level));
1805
1387 for (y = 0; y < sh; y++) 1806 for (y = 0; y < sh; y++)
1388 if (0 <= y + vy && y + vy < self->rows) 1807 if (0 <= y + my && y + my < self->rows)
1389 { 1808 {
1390 maprow *row = self->row + (y + vy); 1809 maprow *row = self->row + (y + my);
1391 1810
1392 for (x = 0; x < sw; x++) 1811 for (x = 0; x < sw; x++)
1393 if (row->c0 <= x + vx && x + vx < row->c1) 1812 if (row->c0 <= x + mx && x + mx < row->c1)
1394 { 1813 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1814 mapcell *cell = row->col + (x + mx - row->c0);
1396
1397 face = cell->face [z]; 1815 tileid tile = cell->tile [z];
1398 1816
1399 if (face) 1817 if (tile)
1818 {
1819 maptex tex = self->tex [tile];
1820 int px, py;
1821
1822 // suppressing texture state switches here
1823 // is only moderately effective, but worth the extra effort
1824 if (key.texname != tex.name)
1825 {
1826 if (!tex.name)
1827 tex = self->tex [2]; /* missing, replace by noface */
1828
1829 key.texname = tex.name;
1830 arr = rc_array (rc, &key);
1831 }
1832
1833 px = (x + 1) * T - tex.w;
1834 py = (y + 1) * T - tex.h;
1835
1836 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1837 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1838 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1839 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1840
1841 if (cell->flags && z == 2)
1842 {
1843 // overlays such as the speech bubble, probably more to come
1844 if (cell->flags & 1)
1845 {
1846 maptex tex = self->tex [1];
1847 int px = x * T + T * 2 / 32;
1848 int py = y * T - T * 6 / 32;
1849
1850 if (tex.name)
1851 {
1852 if (key.texname != tex.name)
1853 {
1854 key.texname = tex.name;
1855 arr = rc_array (rc, &key);
1856 }
1857
1858 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1859 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1860 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1861 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1862 }
1863 }
1864 }
1865
1866 // update smooth hash
1867 if (tex.smoothtile)
1868 {
1869 skey.tile = tex.smoothtile;
1870 skey.level = tex.smoothlevel;
1871
1872 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1873
1874 // add bits to current tile and all neighbours. skey.x|y is
1875 // shifted +1|+1 so we always stay positive.
1876
1877 // bits is ___n cccc CCCC bbbb
1878 // n do not draw borders&corners
1879 // c draw these corners, but...
1880 // C ... not these
1881 // b draw these borders
1882
1883 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1884 // ┃· ·· ·┃ ━━
1885
1886 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1887 // ·· ·· ·┏ ┓·
1888
1889 // full tile
1890 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1891
1892 // borders
1893 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1894 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1895 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1896 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1897
1898 // corners
1899 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1900 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1901 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1902 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1903 }
1904 }
1905 }
1906 }
1907
1908 rc_draw (rc);
1909 rc_clear (rc);
1910
1911 // go through all smoothlevels, lowest to highest, then draw.
1912 // this is basically counting sort
1913 {
1914 int w, b;
1915
1916 for (w = 0; w < 256 / 32; ++w)
1917 {
1918 uint32_t smask = smooth_level [w];
1919 if (smask)
1920 for (b = 0; b < 32; ++b)
1921 if (smask & (((uint32_t)1) << b))
1400 { 1922 {
1401 maptex tex = self->tex [face]; 1923 int level = (w << 5) | b;
1924 HE *he;
1402 1925
1403 int px = (x + 1) * 32 - tex.w; 1926 hv_iterinit (smooth);
1404 int py = (y + 1) * 32 - tex.h; 1927 while ((he = hv_iternext (smooth)))
1405
1406 if (last_name != tex.name)
1407 { 1928 {
1929 smooth_key *skey = (smooth_key *)HeKEY (he);
1930 IV bits = SvIVX (HeVAL (he));
1931
1932 if (!(bits & 0x1000)
1933 && skey->level == level
1934 && level > smooth_max [skey->x][skey->y])
1408 glEnd (); 1935 {
1936 maptex tex = self->tex [skey->tile];
1937 int px = (((int)skey->x) - 1) * T;
1938 int py = (((int)skey->y) - 1) * T;
1939 int border = bits & 15;
1940 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1941 float dx = tex.s * .0625f; // 16 images/row
1942 float dy = tex.t * .5f ; // 2 images/column
1943
1944 if (tex.name)
1945 {
1946 // this time avoiding texture state changes
1947 // save gobs of state changes.
1948 if (key.texname != tex.name)
1949 {
1409 last_name = tex.name; 1950 key.texname = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1951 arr = rc_array (rc, &key);
1411 glBegin (GL_QUADS); 1952 }
1953
1954 if (border)
1955 {
1956 float ox = border * dx;
1957
1958 rc_t2f_v3f (arr, ox , 0.f , px , py , 0);
1959 rc_t2f_v3f (arr, ox , dy , px , py + T, 0);
1960 rc_t2f_v3f (arr, ox + dx, dy , px + T, py + T, 0);
1961 rc_t2f_v3f (arr, ox + dx, 0.f , px + T, py , 0);
1962 }
1963
1964 if (corner)
1965 {
1966 float ox = corner * dx;
1967
1968 rc_t2f_v3f (arr, ox , dy , px , py , 0);
1969 rc_t2f_v3f (arr, ox , dy * 2.f, px , py + T, 0);
1970 rc_t2f_v3f (arr, ox + dx, dy * 2.f, px + T, py + T, 0);
1971 rc_t2f_v3f (arr, ox + dx, dy , px + T, py , 0);
1972 }
1973 }
1974 }
1412 } 1975 }
1413
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1976 }
1419 }
1420 } 1977 }
1978 }
1421 1979
1422 glEnd (); 1980 hv_clear (smooth);
1981 rc_draw (rc);
1982 rc_clear (rc);
1983 }
1423 1984
1424 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1985 glDisable (GL_BLEND);
1426} 1986 rc_free (rc);
1427 1987
1988 // top layer: overlays such as the health bar
1989 for (y = 0; y < sh; y++)
1990 if (0 <= y + my && y + my < self->rows)
1991 {
1992 maprow *row = self->row + (y + my);
1993
1994 for (x = 0; x < sw; x++)
1995 if (row->c0 <= x + mx && x + mx < row->c1)
1996 {
1997 mapcell *cell = row->col + (x + mx - row->c0);
1998
1999 int px = x * T;
2000 int py = y * T;
2001
2002 if (cell->stat_hp)
2003 {
2004 int width = cell->stat_width * T;
2005 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2006
2007 glColor3ub (0, 0, 0);
2008 glRectf (px + 1, py - thick - 2,
2009 px + width - 1, py);
2010
2011 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2012 glRectf (px + 2,
2013 py - thick - 1,
2014 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2015 }
2016 }
2017 }
2018}
2019
1428void 2020void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 2021draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 2022 CODE:
1431{ 2023{
1432 static float color[16][3] = { 2024 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 2025 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 2026 { 1.00F, 1.00F, 1.00F },
1484 glDisable (GL_BLEND); 2076 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 2077 glDisable (GL_TEXTURE_2D);
1486} 2078}
1487 2079
1488void 2080void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2081fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1490 PPCODE: 2082 PPCODE:
1491{ 2083{
1492 int vx, vy;
1493 int x, y; 2084 int x, y;
2085 int sw1 = sw + 2;
2086 int sh1 = sh + 2;
2087 int sh3 = sh * 3;
1494 int sw4 = (sw + 3) & ~3; 2088 int sw34 = (sw * 3 + 3) & ~3;
2089 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2090 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2091 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1497 2092
1498 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv); 2093 SvPOK_only (darkness3_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh); 2094 SvCUR_set (darkness3_sv, sw34 * sh3);
1501 2095
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2096 mx += self->x - 1;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2097 my += self->y - 1;
1504 2098
2099 memset (darkness1, 255, sw1 * sh1);
2100
1505 for (y = 0; y < sh; y++) 2101 for (y = 0; y < sh1; y++)
1506 if (0 <= y + vy && y + vy < self->rows) 2102 if (0 <= y + my && y + my < self->rows)
1507 { 2103 {
1508 maprow *row = self->row + (y + vy); 2104 maprow *row = self->row + (y + my);
1509 2105
1510 for (x = 0; x < sw; x++) 2106 for (x = 0; x < sw1; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 2107 if (row->c0 <= x + mx && x + mx < row->c1)
1512 { 2108 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 2109 mapcell *cell = row->col + (x + mx - row->c0);
1514 2110
1515 darkness[y * sw4 + x] = cell->darkness < 0 2111 darkness1 [y * sw1 + x] = cell->darkness
2112 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 2113 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 2114 }
1519 } 2115 }
1520 2116
2117 for (y = 0; y < sh; ++y)
2118 for (x = 0; x < sw; ++x)
2119 {
2120 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2121 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2122 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2123 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2124 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2125 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2126 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2127 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2128 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2129
2130 uint8_t r11 = (d11 + d21 + d12) / 3;
2131 uint8_t r21 = d21;
2132 uint8_t r31 = (d21 + d31 + d32) / 3;
2133
2134 uint8_t r12 = d12;
2135 uint8_t r22 = d22;
2136 uint8_t r32 = d32;
2137
2138 uint8_t r13 = (d13 + d23 + d12) / 3;
2139 uint8_t r23 = d23;
2140 uint8_t r33 = (d23 + d33 + d32) / 3;
2141
2142 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2143 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2144 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2145 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2146 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2147 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2148 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2149 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2150 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2151 }
2152
2153 free (darkness1);
2154
1521 EXTEND (SP, 3); 2155 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 2156 PUSHs (sv_2mortal (newSViv (sw34)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 2157 PUSHs (sv_2mortal (newSViv (sh3)));
1524 PUSHs (darkness_sv); 2158 PUSHs (darkness3_sv);
1525} 2159}
1526 2160
1527SV * 2161SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2162get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529 CODE: 2163 CODE:
1530{ 2164{
1531 int x, y, x1, y1; 2165 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 2166 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2167 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1558 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1559 { 2193 {
1560 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1561 uint8_t flags = 0; 2195 uint8_t flags = 0;
1562 2196
1563 if (cell->face [0]) flags |= 1; 2197 if (cell->tile [0]) flags |= 1;
1564 if (cell->face [1]) flags |= 2; 2198 if (cell->tile [1]) flags |= 2;
1565 if (cell->face [2]) flags |= 4; 2199 if (cell->tile [2]) flags |= 4;
1566 2200
1567 *data++ = flags; 2201 *data++ = flags;
1568 2202
1569 if (flags & 1) 2203 if (flags & 1)
1570 { 2204 {
2205 tileid tile = cell->tile [0];
1571 *data++ = cell->face [0] >> 8; 2206 *data++ = tile >> 8;
1572 *data++ = cell->face [0]; 2207 *data++ = tile;
1573 } 2208 }
1574 2209
1575 if (flags & 2) 2210 if (flags & 2)
1576 { 2211 {
2212 tileid tile = cell->tile [1];
1577 *data++ = cell->face [1] >> 8; 2213 *data++ = tile >> 8;
1578 *data++ = cell->face [1]; 2214 *data++ = tile;
1579 } 2215 }
1580 2216
1581 if (flags & 4) 2217 if (flags & 4)
1582 { 2218 {
2219 tileid tile = cell->tile [2];
1583 *data++ = cell->face [2] >> 8; 2220 *data++ = tile >> 8;
1584 *data++ = cell->face [2]; 2221 *data++ = tile;
1585 } 2222 }
1586 } 2223 }
1587 else 2224 else
1588 *data++ = 0; 2225 *data++ = 0;
1589 } 2226 }
1595} 2232}
1596 OUTPUT: 2233 OUTPUT:
1597 RETVAL 2234 RETVAL
1598 2235
1599void 2236void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2237set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 2238 PPCODE:
1602{ 2239{
1603 int x, y, z; 2240 int x, y, z;
1604 int w, h; 2241 int w, h;
1605 int x1, y1; 2242 int x1, y1;
1629 { 2266 {
1630 uint8_t flags = *data++; 2267 uint8_t flags = *data++;
1631 2268
1632 if (flags) 2269 if (flags)
1633 { 2270 {
1634 mapface face[3] = { 0, 0, 0 };
1635
1636 mapcell *cell = row_get_cell (row, x); 2271 mapcell *cell = row_get_cell (row, x);
2272 tileid tile[3] = { 0, 0, 0 };
1637 2273
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2274 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2275 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2276 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1641 2277
1642 if (cell->darkness <= 0) 2278 if (cell->darkness == 0)
1643 { 2279 {
1644 cell->darkness = -1; 2280 cell->darkness = 0;
1645 2281
1646 for (z = 0; z <= 2; z++) 2282 for (z = 0; z <= 2; z++)
1647 { 2283 {
1648 cell->face[z] = face[z]; 2284 tileid t = tile [z];
1649 2285
1650 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2286 if (t >= self->texs || (t && !self->tex [t].name))
2287 {
1651 XPUSHs (sv_2mortal (newSViv (face[z]))); 2288 XPUSHs (sv_2mortal (newSViv (t)));
2289 need_texid (self, t);
2290 }
2291
2292 cell->tile [z] = t;
1652 } 2293 }
1653 } 2294 }
1654 } 2295 }
1655 } 2296 }
1656 } 2297 }
1657} 2298}
1658 2299
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 2300MODULE = CFPlus PACKAGE = CFPlus::RW
1660 2301
1661CFClient::MixChunk 2302CFPlus::RW
1662new_from_file (SV *class, char *path) 2303new (SV *class, SV *data_sv)
1663 CODE: 2304 CODE:
1664 RETVAL = Mix_LoadWAV (path); 2305{
2306 STRLEN datalen;
2307 char *data = SvPVbyte (data_sv, datalen);
2308
2309 RETVAL = SDL_RWFromConstMem (data, datalen);
2310}
1665 OUTPUT: 2311 OUTPUT:
1666 RETVAL 2312 RETVAL
1667 2313
2314CFPlus::RW
2315new_from_file (SV *class, const char *path, const char *mode = "rb")
2316 CODE:
2317 RETVAL = SDL_RWFromFile (path, mode);
2318 OUTPUT:
2319 RETVAL
2320
2321# fails on win32:
2322# CFPlus.xs(2268) : error C2059: syntax error : '('
1668void 2323#void
2324#close (CFPlus::RW self)
2325# CODE:
2326# (self->(close)) (self);
2327
2328MODULE = CFPlus PACKAGE = CFPlus::Channel
2329
2330PROTOTYPES: DISABLE
2331
2332CFPlus::Channel
2333find ()
2334 CODE:
2335{
2336 RETVAL = Mix_GroupAvailable (-1);
2337
2338 if (RETVAL < 0)
2339 {
2340 RETVAL = Mix_GroupOldest (-1);
2341
2342 if (RETVAL < 0)
2343 XSRETURN_UNDEF;
2344
2345 Mix_HaltChannel (RETVAL);
2346 }
2347
2348 Mix_UnregisterAllEffects (RETVAL);
2349 Mix_Volume (RETVAL, 128);
2350}
2351 OUTPUT:
2352 RETVAL
2353
2354void
2355halt (CFPlus::Channel self)
2356 CODE:
2357 Mix_HaltChannel (self);
2358
2359void
2360expire (CFPlus::Channel self, int ticks = -1)
2361 CODE:
2362 Mix_ExpireChannel (self, ticks);
2363
2364void
2365fade_out (CFPlus::Channel self, int ticks = -1)
2366 CODE:
2367 Mix_FadeOutChannel (self, ticks);
2368
2369int
2370volume (CFPlus::Channel self, int volume)
2371 CODE:
2372 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2373 OUTPUT:
2374 RETVAL
2375
2376void
2377unregister_all_effects (CFPlus::Channel self)
2378 CODE:
2379 Mix_UnregisterAllEffects (self);
2380
2381void
2382set_panning (CFPlus::Channel self, int left, int right)
2383 CODE:
2384 left = CLAMP (left , 0, 255);
2385 right = CLAMP (right, 0, 255);
2386 Mix_SetPanning (self, left, right);
2387
2388void
2389set_distance (CFPlus::Channel self, int distance)
2390 CODE:
2391 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2392
2393void
2394set_position (CFPlus::Channel self, int angle, int distance)
2395 CODE:
2396
2397void
2398set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
2399 CODE:
2400{
2401 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2402 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2403 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2404}
2405
2406void
2407set_reverse_stereo (CFPlus::Channel self, int flip)
2408 CODE:
2409 Mix_SetReverseStereo (self, flip);
2410
2411MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2412
2413PROTOTYPES: DISABLE
2414
2415CFPlus::MixChunk
2416new (SV *class, CFPlus::RW rwops)
2417 CODE:
2418 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2419 OUTPUT:
2420 RETVAL
2421
2422void
1669DESTROY (CFClient::MixChunk self) 2423DESTROY (CFPlus::MixChunk self)
1670 CODE: 2424 CODE:
1671 Mix_FreeChunk (self); 2425 Mix_FreeChunk (self);
1672 2426
1673int 2427int
1674volume (CFClient::MixChunk self, int volume = -1) 2428volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 2429 CODE:
2430 if (items > 1)
2431 volume = CLAMP (volume, 0, 128);
1676 RETVAL = Mix_VolumeChunk (self, volume); 2432 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 2433 OUTPUT:
1678 RETVAL 2434 RETVAL
1679 2435
1680int 2436CFPlus::Channel
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2437play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 2438 CODE:
2439{
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2440 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2441
2442 if (RETVAL < 0)
2443 XSRETURN_UNDEF;
2444
2445 if (channel < 0)
2446 {
2447 Mix_UnregisterAllEffects (RETVAL);
2448 Mix_Volume (RETVAL, 128);
2449 }
2450}
1684 OUTPUT: 2451 OUTPUT:
1685 RETVAL 2452 RETVAL
1686 2453
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 2454MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 2455
1689int 2456int
1690volume (int volume = -1) 2457volume (int volume = -1)
2458 PROTOTYPE: ;$
1691 CODE: 2459 CODE:
2460 if (items > 0)
2461 volume = CLAMP (volume, 0, 128);
1692 RETVAL = Mix_VolumeMusic (volume); 2462 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 2463 OUTPUT:
1694 RETVAL 2464 RETVAL
1695 2465
2466void
2467fade_out (int ms)
2468 CODE:
2469 Mix_FadeOutMusic (ms);
2470
2471void
2472halt ()
2473 CODE:
2474 Mix_HaltMusic ();
2475
1696CFClient::MixMusic 2476CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 2477new (SV *class, CFPlus::RW rwops)
1698 CODE: 2478 CODE:
1699 RETVAL = Mix_LoadMUS (path); 2479 RETVAL = Mix_LoadMUS_RW (rwops);
1700 OUTPUT: 2480 OUTPUT:
1701 RETVAL 2481 RETVAL
1702 2482
1703void 2483void
1704DESTROY (CFClient::MixMusic self) 2484DESTROY (CFPlus::MixMusic self)
1705 CODE: 2485 CODE:
1706 Mix_FreeMusic (self); 2486 Mix_FreeMusic (self);
1707 2487
1708int 2488int
1709play (CFClient::MixMusic self, int loops = -1) 2489play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 2490 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 2491 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 2492 OUTPUT:
1713 RETVAL 2493 RETVAL
1714 2494
2495void
2496fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2497 CODE:
2498 Mix_FadeInMusicPos (self, loops, ms, position);
2499
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 2500MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2501
2502PROTOTYPES: ENABLE
1716 2503
1717BOOT: 2504BOOT:
1718{ 2505{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2506 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 2507 static const struct {
1721 const char *name; 2508 const char *name;
1722 IV iv; 2509 IV iv;
1723 } *civ, const_iv[] = { 2510 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 2511# define const_iv(name) { # name, (IV)name }
2512 const_iv (GL_VENDOR),
2513 const_iv (GL_VERSION),
2514 const_iv (GL_EXTENSIONS),
1725 const_iv (GL_COLOR_MATERIAL), 2515 const_iv (GL_COLOR_MATERIAL),
1726 const_iv (GL_SMOOTH), 2516 const_iv (GL_SMOOTH),
1727 const_iv (GL_FLAT), 2517 const_iv (GL_FLAT),
1728 const_iv (GL_DITHER), 2518 const_iv (GL_DITHER),
1729 const_iv (GL_BLEND), 2519 const_iv (GL_BLEND),
1733 const_iv (GL_ALPHA_TEST), 2523 const_iv (GL_ALPHA_TEST),
1734 const_iv (GL_NORMALIZE), 2524 const_iv (GL_NORMALIZE),
1735 const_iv (GL_RESCALE_NORMAL), 2525 const_iv (GL_RESCALE_NORMAL),
1736 const_iv (GL_FRONT), 2526 const_iv (GL_FRONT),
1737 const_iv (GL_BACK), 2527 const_iv (GL_BACK),
2528 const_iv (GL_AUX0),
1738 const_iv (GL_AND), 2529 const_iv (GL_AND),
1739 const_iv (GL_ONE), 2530 const_iv (GL_ONE),
1740 const_iv (GL_ZERO), 2531 const_iv (GL_ZERO),
1741 const_iv (GL_SRC_ALPHA), 2532 const_iv (GL_SRC_ALPHA),
1742 const_iv (GL_DST_ALPHA), 2533 const_iv (GL_DST_ALPHA),
1756 const_iv (GL_LUMINANCE), 2547 const_iv (GL_LUMINANCE),
1757 const_iv (GL_LUMINANCE_ALPHA), 2548 const_iv (GL_LUMINANCE_ALPHA),
1758 const_iv (GL_FLOAT), 2549 const_iv (GL_FLOAT),
1759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2550 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1760 const_iv (GL_COMPILE), 2551 const_iv (GL_COMPILE),
2552 const_iv (GL_PROXY_TEXTURE_1D),
2553 const_iv (GL_PROXY_TEXTURE_2D),
1761 const_iv (GL_TEXTURE_1D), 2554 const_iv (GL_TEXTURE_1D),
1762 const_iv (GL_TEXTURE_2D), 2555 const_iv (GL_TEXTURE_2D),
1763 const_iv (GL_TEXTURE_ENV), 2556 const_iv (GL_TEXTURE_ENV),
1764 const_iv (GL_TEXTURE_MAG_FILTER), 2557 const_iv (GL_TEXTURE_MAG_FILTER),
1765 const_iv (GL_TEXTURE_MIN_FILTER), 2558 const_iv (GL_TEXTURE_MIN_FILTER),
1786 const_iv (GL_COLOR_LOGIC_OP), 2579 const_iv (GL_COLOR_LOGIC_OP),
1787 const_iv (GL_SEPARABLE_2D), 2580 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 2581 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 2582 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 2583 const_iv (GL_CONSTANT_BORDER),
2584 const_iv (GL_POINTS),
1791 const_iv (GL_LINES), 2585 const_iv (GL_LINES),
2586 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 2587 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 2588 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 2589 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 2590 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 2591 const_iv (GL_TRIANGLE_STRIP),
1797 const_iv (GL_TRIANGLE_FAN), 2592 const_iv (GL_TRIANGLE_FAN),
2593 const_iv (GL_POLYGON),
1798 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2594 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2595 const_iv (GL_POINT_SMOOTH_HINT),
2596 const_iv (GL_LINE_SMOOTH_HINT),
2597 const_iv (GL_POLYGON_SMOOTH_HINT),
2598 const_iv (GL_GENERATE_MIPMAP_HINT),
1799 const_iv (GL_FASTEST), 2599 const_iv (GL_FASTEST),
2600 const_iv (GL_DONT_CARE),
2601 const_iv (GL_NICEST),
1800 const_iv (GL_V2F), 2602 const_iv (GL_V2F),
1801 const_iv (GL_V3F), 2603 const_iv (GL_V3F),
1802 const_iv (GL_T2F_V3F), 2604 const_iv (GL_T2F_V3F),
1803 const_iv (GL_T2F_N3F_V3F), 2605 const_iv (GL_T2F_N3F_V3F),
1804# undef const_iv 2606# undef const_iv
1805 }; 2607 };
1806 2608
1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2609 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2610 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2611
2612 texture_av = newAV ();
2613 AvREAL_off (texture_av);
1809} 2614}
1810 2615
1811char * 2616char *
1812gl_vendor () 2617gl_vendor ()
1813 CODE: 2618 CODE:
1827 CODE: 2632 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2633 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1829 OUTPUT: 2634 OUTPUT:
1830 RETVAL 2635 RETVAL
1831 2636
2637const char *glGetString (GLenum pname)
2638
2639GLint glGetInteger (GLenum pname)
2640 CODE:
2641 glGetIntegerv (pname, &RETVAL);
2642 OUTPUT:
2643 RETVAL
2644
2645GLdouble glGetDouble (GLenum pname)
2646 CODE:
2647 glGetDoublev (pname, &RETVAL);
2648 OUTPUT:
2649 RETVAL
2650
1832int glGetError () 2651int glGetError ()
1833 2652
1834void glFinish () 2653void glFinish ()
1835 2654
1836void glClear (int mask) 2655void glClear (int mask)
1873# near_ and far_ are due to microsofts buggy "c" compiler 2692# near_ and far_ are due to microsofts buggy "c" compiler
1874void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2693void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1875 2694
1876# near_ and far_ are due to microsofts buggy "c" compiler 2695# near_ and far_ are due to microsofts buggy "c" compiler
1877void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2696void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2697
2698PROTOTYPES: DISABLE
1878 2699
1879void glViewport (int x, int y, int width, int height) 2700void glViewport (int x, int y, int width, int height)
1880 2701
1881void glScissor (int x, int y, int width, int height) 2702void glScissor (int x, int y, int width, int height)
1882 2703
1890 2711
1891void glRotate (float angle, float x, float y, float z) 2712void glRotate (float angle, float x, float y, float z)
1892 CODE: 2713 CODE:
1893 glRotatef (angle, x, y, z); 2714 glRotatef (angle, x, y, z);
1894 2715
1895void glBegin (int mode)
1896
1897void glEnd ()
1898
1899void glColor (float r, float g, float b, float a = 1.0) 2716void glColor (float r, float g, float b, float a = 1.0)
1900 PROTOTYPE: @
1901 ALIAS: 2717 ALIAS:
1902 glColor_premultiply = 1 2718 glColor_premultiply = 1
1903 CODE: 2719 CODE:
1904 if (ix) 2720 if (ix)
1905 { 2721 {
1906 r *= a; 2722 r *= a;
1907 g *= a; 2723 g *= a;
1908 b *= a; 2724 b *= a;
1909 } 2725 }
1910 // microsoft visual "c" rounds instead of truncating... 2726 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2727 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915
1916void glInterleavedArrays (int format, int stride, char *data)
1917
1918void glDrawElements (int mode, int count, int type, char *indices)
1919
1920# 1.2 void glDrawRangeElements (int mode, int start, int end
1921 2728
1922void glRasterPos (float x, float y, float z = 0.) 2729void glRasterPos (float x, float y, float z = 0.)
1923 CODE: 2730 CODE:
1924 glRasterPos3f (0, 0, z); 2731 glRasterPos3f (0, 0, z);
1925 glBitmap (0, 0, 0, 0, x, y, 0); 2732 glBitmap (0, 0, 0, 0, x, y, 0);
1930 2737
1931void glTexCoord (float s, float t) 2738void glTexCoord (float s, float t)
1932 CODE: 2739 CODE:
1933 glTexCoord2f (s, t); 2740 glTexCoord2f (s, t);
1934 2741
2742void glRect (float x1, float y1, float x2, float y2)
2743 CODE:
2744 glRectf (x1, y1, x2, y2);
2745
2746PROTOTYPES: ENABLE
2747
2748void glBegin (int mode)
2749
2750void glEnd ()
2751
2752void glPointSize (GLfloat size)
2753
2754void glLineWidth (GLfloat width)
2755
2756void glInterleavedArrays (int format, int stride, char *data)
2757
2758void glDrawElements (int mode, int count, int type, char *indices)
2759
2760# 1.2 void glDrawRangeElements (int mode, int start, int end
2761
1935void glTexEnv (int target, int pname, float param) 2762void glTexEnv (int target, int pname, float param)
1936 CODE: 2763 CODE:
1937 glTexEnvf (target, pname, param); 2764 glTexEnvf (target, pname, param);
1938 2765
1939void glTexParameter (int target, int pname, float param) 2766void glTexParameter (int target, int pname, float param)
1961 2788
1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2789void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1963 2790
1964void glDrawPixels (int width, int height, int format, int type, char *pixels) 2791void glDrawPixels (int width, int height, int format, int type, char *pixels)
1965 2792
2793void glPixelZoom (float x, float y)
2794
1966void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2795void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967 2796
1968int glGenTexture () 2797int glGenTexture ()
1969 CODE: 2798 CODE:
1970{ 2799 RETVAL = gen_texture ();
1971 GLuint name;
1972 glGenTextures (1, &name);
1973 RETVAL = name;
1974}
1975 OUTPUT: 2800 OUTPUT:
1976 RETVAL 2801 RETVAL
1977 2802
1978void glDeleteTexture (int name) 2803void glDeleteTexture (int name)
1979 CODE: 2804 CODE:
1980{
1981 GLuint name_ = name;
1982 glDeleteTextures (1, &name_); 2805 del_texture (name);
1983} 2806
1984
1985int glGenList () 2807int glGenList ()
1986 CODE: 2808 CODE:
1987 RETVAL = glGenLists (1); 2809 RETVAL = glGenLists (1);
1988 OUTPUT: 2810 OUTPUT:
1989 RETVAL 2811 RETVAL
1996 2818
1997void glEndList () 2819void glEndList ()
1998 2820
1999void glCallList (int list) 2821void glCallList (int list)
2000 2822
2823MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2001 2824
2825PROTOTYPES: DISABLE
2826
2827void
2828find_widget (SV *self, NV x, NV y)
2829 PPCODE:
2830{
2831 if (within_widget (self, x, y))
2832 XPUSHs (self);
2833}
2834
2835BOOT:
2836{
2837 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2838
2839 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2840 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2841 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2842 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2843}
2844
2845void
2846draw (SV *self)
2847 CODE:
2848{
2849 HV *hv;
2850 SV **svp;
2851 NV x, y, w, h;
2852 SV *draw_x_sv = GvSV (draw_x_gv);
2853 SV *draw_y_sv = GvSV (draw_y_gv);
2854 SV *draw_w_sv = GvSV (draw_w_gv);
2855 SV *draw_h_sv = GvSV (draw_h_gv);
2856 SV *hover;
2857 double draw_x, draw_y, draw_w, draw_h;
2858
2859 if (!SvROK (self))
2860 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2861
2862 hv = (HV *)SvRV (self);
2863
2864 if (SvTYPE (hv) != SVt_PVHV)
2865 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2866
2867 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2868 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2869
2870 if (!h || !w)
2871 XSRETURN_EMPTY;
2872
2873 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2874 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2875
2876 draw_x = SvNV (draw_x_sv) + x;
2877 draw_y = SvNV (draw_y_sv) + y;
2878
2879 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2880 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2881 XSRETURN_EMPTY;
2882
2883 sv_setnv (draw_x_sv, draw_x);
2884 sv_setnv (draw_y_sv, draw_y);
2885
2886 glPushMatrix ();
2887 glTranslated (x, y, 0);
2888
2889 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2890 {
2891 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2892
2893 if (svp && SvTRUE (*svp))
2894 {
2895 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2896 glEnable (GL_BLEND);
2897 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2898 glBegin (GL_QUADS);
2899 glVertex2f (0, 0);
2900 glVertex2f (w, 0);
2901 glVertex2f (w, h);
2902 glVertex2f (0, h);
2903 glEnd ();
2904 glDisable (GL_BLEND);
2905 }
2906 }
2907#if 0
2908 if ($ENV{CFPLUS_DEBUG} & 1) {
2909 glPushMatrix;
2910 glColor 1, 1, 0, 1;
2911 glTranslate 0.375, 0.375;
2912 glBegin GL_LINE_LOOP;
2913 glVertex 0 , 0;
2914 glVertex $self->{w} - 1, 0;
2915 glVertex $self->{w} - 1, $self->{h} - 1;
2916 glVertex 0 , $self->{h} - 1;
2917 glEnd;
2918 glPopMatrix;
2919 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2920 }
2921#endif
2922 PUSHMARK (SP);
2923 XPUSHs (self);
2924 PUTBACK;
2925 call_method ("_draw", G_VOID | G_DISCARD);
2926 SPAGAIN;
2927
2928 glPopMatrix ();
2929
2930 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2931 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2932}
2933

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines