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.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.210 by root, Tue Jul 24 18:24:03 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#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
37#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS
39
23#include <glib/gmacros.h> 40#include <glib/gmacros.h>
24 41
25#include <pango/pango.h> 42#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 43
30#ifndef _WIN32 44#ifndef _WIN32
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# 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 50#endif
44 51
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
53 58
54#define MIN_FONT_HEIGHT 10 59#define MIN_FONT_HEIGHT 10
60
61#if 0
62# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else
64# define PARACHUTE 0
65#endif
66
67static AV *texture_av;
55 68
56static struct 69static struct
57{ 70{
58#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 72#include "glfunc.h"
60#undef GL_FUNC 73#undef GL_FUNC
61} gl; 74} gl;
62 75
76static void
63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64{ 78{
65 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
66 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
67 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 83 else
70 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
71} 85}
72 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
111#include "texcache.c"
112
113#include "pango-font.c"
114#include "pango-fontmap.c"
115#include "pango-render.c"
116
73typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
75 119
76typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
77 121
78static int 122static int
79shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
80{ 124{
81 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
… …
92 136
93 return 0; 137 return 0;
94} 138}
95 139
96typedef struct cf_layout { 140typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
100 int base_height; 143 int base_height;
101 CFClient__Font font; 144 CFPlus__Font font;
102} *CFClient__Layout; 145} *CFPlus__Layout;
103 146
104static CFClient__Font default_font; 147static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
107 150
108static void 151static void
109substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
110{ 153{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 155#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 157#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 159}
121 160
122static void 161static void
123layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
124{ 163{
125 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
126 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
127 */ 166 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
… …
132 171
133 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
134} 173}
135 174
136static void 175static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
140 182
141 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 185
144 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
145} 187 if (!rect.height) rect.height = 1;
146 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
147typedef uint16_t mapface; 194typedef uint16_t faceid;
148 195
149typedef struct { 196typedef struct {
150 GLint name; 197 int name;
151 int w, h; 198 int w, h;
152 float s, t; 199 float s, t;
153 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
154} maptex; 203} maptex;
155 204
156typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
157 int16_t darkness; 208 uint16_t darkness;
158 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 210} mapcell;
160 211
161typedef struct { 212typedef struct {
162 int32_t c0, c1; 213 int32_t c0, c1;
163 mapcell *col; 214 mapcell *col;
164} maprow; 215} maprow;
165 216
166typedef struct map { 217typedef struct map {
167 int x, y, w, h; 218 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 220 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 221 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 222
175 int32_t rows; 223 int32_t rows;
176 maprow *row; 224 maprow *row;
177} *CFClient__Map; 225} *CFPlus__Map;
178 226
179static char * 227static char *
180prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
181{ 229{
182 char *p; 230 char *p;
… …
199} 247}
200 248
201#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
204static maprow * 272static maprow *
205map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
206{ 274{
207 if (0 > y) 275 if (0 > y)
208 { 276 {
209 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
… …
248 316
249 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
250} 318}
251 319
252static mapcell * 320static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
254{ 322{
255 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
256} 324}
257 325
258static void 326static void
259map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
260{ 328{
261 int r; 329 int r;
262 330
263 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
… …
272 self->row = 0; 340 self->row = 0;
273 self->rows = 0; 341 self->rows = 0;
274} 342}
275 343
276static void 344static void
277map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278{ 346{
279 int x, y; 347 int x, y;
280 maprow *row; 348 maprow *row;
349 mapcell *cell;
281 350
282 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 352 if (y >= 0)
284 { 353 {
285 if (y >= self->rows) 354 if (y >= self->rows)
… …
291 if (x >= row->c0) 360 if (x >= row->c0)
292 { 361 {
293 if (x >= row->c1) 362 if (x >= row->c1)
294 break; 363 break;
295 364
296 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
297 } 371 }
298 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
299} 389}
300 390
301static void 391static void
302music_finished (void) 392music_finished (void)
303{ 393{
… …
339 n |= n >> 16; 429 n |= n >> 16;
340 430
341 return n + 1; 431 return n + 1;
342} 432}
343 433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
438/******************************************************************************/
439
440static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
441static GV *hover_gv;
442
443static int
444within_widget (SV *widget, NV x, NV y)
445{
446 HV *self;
447 SV **svp;
448 NV wx, ww, wy, wh;
449
450 if (!SvROK (widget))
451 return 0;
452
453 self = (HV *)SvRV (widget);
454
455 if (SvTYPE (self) != SVt_PVHV)
456 return 0;
457
458 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
459 if (y < wy)
460 return 0;
461
462 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
463 if (y >= wy + wh)
464 return 0;
465
466 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
467 if (x < wx)
468 return 0;
469
470 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
471 if (x >= wx + ww)
472 return 0;
473
474 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
475 if (!svp || !SvTRUE (*svp))
476 return 0;
477
478 return 1;
479}
480
344MODULE = CFClient PACKAGE = CFClient 481MODULE = CFPlus PACKAGE = CFPlus
345 482
346PROTOTYPES: ENABLE 483PROTOTYPES: ENABLE
347 484
348BOOT: 485BOOT:
349{ 486{
350 HV *stash = gv_stashpv ("CFClient", 1); 487 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 488 static const struct {
352 const char *name; 489 const char *name;
353 IV iv; 490 IV iv;
354 } *civ, const_iv[] = { 491 } *civ, const_iv[] = {
355# define const_iv(name) { # name, (IV)name } 492# define const_iv(name) { # name, (IV)name }
493 const_iv (SDLK_MODIFIER_MIN),
494 const_iv (SDLK_MODIFIER_MAX),
495
356 const_iv (SDL_ACTIVEEVENT), 496 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 497 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 498 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 499 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 500 const_iv (SDL_MOUSEBUTTONDOWN),
… …
369 const_iv (SDL_EVENT_RESERVEDA), 509 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 510 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 511 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 512 const_iv (SDL_VIDEOEXPOSE),
373 const_iv (SDL_USEREVENT), 513 const_iv (SDL_USEREVENT),
514
515 const_iv (SDL_APPINPUTFOCUS),
516 const_iv (SDL_APPMOUSEFOCUS),
517 const_iv (SDL_APPACTIVE),
518
374 const_iv (SDLK_KP0), 519 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 520 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 521 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 522 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 523 const_iv (SDLK_KP4),
… …
433 const_iv (SDLK_BREAK), 578 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 579 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 580 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 581 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 582 const_iv (SDLK_UNDO),
583
438 const_iv (KMOD_NONE), 584 const_iv (KMOD_NONE),
585 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 586 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 587 const_iv (KMOD_RSHIFT),
588 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 589 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 590 const_iv (KMOD_RCTRL),
591 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 592 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 593 const_iv (KMOD_RALT),
594 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 595 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 596 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 597 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 598 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 599 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 600# undef const_iv
455 }; 601 };
456 602
457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 603 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 604 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
605
606 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
607 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459} 608}
609
610void
611weaken (SV *rv)
612 PROTOTYPE: $
613 CODE:
614 sv_rvweaken (rv);
615
616int
617in_destruct ()
618 CODE:
619 RETVAL = PL_main_cv == Nullcv;
620 OUTPUT:
621 RETVAL
460 622
461NV floor (NV x) 623NV floor (NV x)
462 624
463NV ceil (NV x) 625NV ceil (NV x)
464 626
465void 627void
466pango_init () 628pango_init ()
467 CODE: 629 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 630{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 631 opengl_fontmap = pango_opengl_font_map_new ();
472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 632 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 634}
635
636char *
637SDL_GetError ()
491 638
492int 639int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 641
495void 642void
496SDL_Quit () 643SDL_Quit ()
497 644
498void 645void
499SDL_ListModes () 646SDL_ListModes (int rgb, int alpha)
500 PPCODE: 647 PPCODE:
501{ 648{
502 SDL_Rect **m; 649 SDL_Rect **m;
503 650
504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 651 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 652 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 653 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 654 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
508 655
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 656 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
511 658
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 663
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
518 665#if SDL_VERSION_ATLEAST(1,2,10)
519 SDL_EnableUNICODE (1); 666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
521 669
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
523 671
524 if (m && m != (SDL_Rect **)-1) 672 if (m && m != (SDL_Rect **)-1)
525 while (*m) 673 while (*m)
526 { 674 {
675 if ((*m)->w >= 640 && (*m)->h >= 480)
676 {
527 AV *av = newAV (); 677 AV *av = newAV ();
528 av_push (av, newSViv ((*m)->w)); 678 av_push (av, newSViv ((*m)->w));
529 av_push (av, newSViv ((*m)->h)); 679 av_push (av, newSViv ((*m)->h));
680 av_push (av, newSViv (rgb));
681 av_push (av, newSViv (alpha));
530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 682 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
683 }
531 684
532 ++m; 685 ++m;
533 } 686 }
534} 687}
535 688
536char *
537SDL_GetError ()
538
539int 689int
540SDL_SetVideoMode (int w, int h, int fullscreen) 690SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
541 CODE: 691 CODE:
692{
693 SDL_EnableUNICODE (1);
694 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
695
696 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
697 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
698 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
699 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
700
542 RETVAL = !!SDL_SetVideoMode ( 701 RETVAL = !!SDL_SetVideoMode (
543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 702 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544 ); 703 );
704
545 if (RETVAL) 705 if (RETVAL)
546 { 706 {
707 av_clear (texture_av);
708
547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 710#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h" 711#include "glfunc.h"
550# undef GL_FUNC 712#undef GL_FUNC
551 } 713 }
714}
552 OUTPUT: 715 OUTPUT:
553 RETVAL 716 RETVAL
554 717
555void 718void
556SDL_GL_SwapBuffers () 719SDL_GL_SwapBuffers ()
557 720
558char * 721char *
559SDL_GetKeyName (int sym) 722SDL_GetKeyName (int sym)
560 723
724int
725SDL_GetAppState ()
726
561void 727void
562SDL_PollEvent () 728poll_events ()
563 PPCODE: 729 PPCODE:
564{ 730{
565 SDL_Event ev; 731 SDL_Event ev;
566 732
567 while (SDL_PollEvent (&ev)) 733 SDL_PumpEvents ();
734 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568 { 735 {
569 HV *hv = newHV (); 736 HV *hv = newHV ();
570 hv_store (hv, "type", 4, newSViv (ev.type), 0); 737 hv_store (hv, "type", 4, newSViv (ev.type), 0);
571 738
572 switch (ev.type) 739 switch (ev.type)
… …
574 case SDL_KEYDOWN: 741 case SDL_KEYDOWN:
575 case SDL_KEYUP: 742 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 745 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
746 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 748 break;
581 749
582 case SDL_ACTIVEEVENT: 750 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 752 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585 break; 753 break;
586 754
587 case SDL_MOUSEMOTION: 755 case SDL_MOUSEMOTION:
756 {
757 int state = ev.motion.state;
758 int x = ev.motion.x;
759 int y = ev.motion.y;
760 int xrel = ev.motion.xrel;
761 int yrel = ev.motion.yrel;
762
763 /* do simplistic event compression */
764 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
765 && state == ev.motion.state)
766 {
767 xrel += ev.motion.xrel;
768 yrel += ev.motion.yrel;
769 x = ev.motion.x;
770 y = ev.motion.y;
771 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772 }
773
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 775 hv_store (hv, "state", 5, newSViv (state), 0);
591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 776 hv_store (hv, "x", 1, newSViv (x), 0);
592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 777 hv_store (hv, "y", 1, newSViv (y), 0);
593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 778 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 779 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 }
595 break; 781 break;
596 782
597 case SDL_MOUSEBUTTONDOWN: 783 case SDL_MOUSEBUTTONDOWN:
598 case SDL_MOUSEBUTTONUP: 784 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 797 break;
612 } 798 }
613 799
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 801 }
616} 802}
617 803
618int 804int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 805Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
… …
628Mix_AllocateChannels (int numchans = -1) 814Mix_AllocateChannels (int numchans = -1)
629 815
630void 816void
631lowdelay (int fd, int val = 1) 817lowdelay (int fd, int val = 1)
632 CODE: 818 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
820
821void
822win32_proxy_info ()
823 PPCODE:
824{
633#ifndef _WIN32 825#ifdef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 826 char buffer[2048];
827 DWORD buflen;
828
829 EXTEND (SP, 3);
830
831 buflen = sizeof (buffer);
832 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
833 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
834 {
835 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
836
837 buflen = sizeof (buffer);
838 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
839 {
840 PUSHs (newSVpv (buffer, 0));
841
842 buflen = sizeof (buffer);
843 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
844 PUSHs (newSVpv (buffer, 0));
845 }
846 }
635#endif 847#endif
848}
636 849
637void 850void
638add_font (char *file) 851add_font (char *file)
639 CODE: 852 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 853 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 854
646void 855void
647load_image_inline (SV *image_) 856load_image_inline (SV *image_)
648 ALIAS: 857 ALIAS:
649 load_image_file = 1 858 load_image_file = 1
… …
691 900
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 901 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 902
694 assert (surface2->pitch == surface2->w * 4); 903 assert (surface2->pitch == surface2->w * 4);
695 904
905 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 906 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 907 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 908 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 910 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 911 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2);
705 914
706 SDL_FreeSurface (surface); 915 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 916 SDL_FreeSurface (surface2);
708} 917}
709 918
… …
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 958#endif
750 _exit (1); 959 _exit (1);
751 960
752void 961void
753_exit (int retval) 962_exit (int retval = 0)
754 CODE: 963 CODE:
964#ifdef WIN32
965 ExitThread (retval); // unclean, please beam me up
966#else
755 _exit (retval); 967 _exit (retval);
968#endif
756 969
970void
971debug ()
972 CODE:
973{
974#if DEBUG
975 VALGRIND_DO_LEAK_CHECK;
976#endif
977}
978
757MODULE = CFClient PACKAGE = CFClient::Font 979MODULE = CFPlus PACKAGE = CFPlus::Font
758 980
759CFClient::Font 981PROTOTYPES: DISABLE
982
983CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 984new_from_file (SV *class, char *path, int id = 0)
761 CODE: 985 CODE:
762{ 986{
763 int count; 987 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
767} 991}
768 OUTPUT: 992 OUTPUT:
769 RETVAL 993 RETVAL
770 994
771void 995void
772DESTROY (CFClient::Font self) 996DESTROY (CFPlus::Font self)
773 CODE: 997 CODE:
774 pango_font_description_free (self); 998 pango_font_description_free (self);
775 999
776void 1000void
777make_default (CFClient::Font self) 1001make_default (CFPlus::Font self)
1002 PROTOTYPE: $
778 CODE: 1003 CODE:
779 default_font = self; 1004 default_font = self;
780 1005
781MODULE = CFClient PACKAGE = CFClient::Layout 1006MODULE = CFPlus PACKAGE = CFPlus::Layout
782 1007
783CFClient::Layout 1008PROTOTYPES: DISABLE
784new (SV *class, int rgba = 0) 1009
1010void
1011reset_glyph_cache ()
1012 PROTOTYPE:
1013 CODE:
1014 tc_clear ();
1015
1016CFPlus::Layout
1017new (SV *class)
785 CODE: 1018 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 1019 New (0, RETVAL, 1, struct cf_layout);
787 1020
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1021 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 1022 RETVAL->r = 1.;
791 RETVAL->g = 1.; 1023 RETVAL->g = 1.;
792 RETVAL->b = 1.; 1024 RETVAL->b = 1.;
793 RETVAL->a = 1.; 1025 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 1026 RETVAL->base_height = MIN_FONT_HEIGHT;
… …
798 layout_update_font (RETVAL); 1030 layout_update_font (RETVAL);
799 OUTPUT: 1031 OUTPUT:
800 RETVAL 1032 RETVAL
801 1033
802void 1034void
803DESTROY (CFClient::Layout self) 1035DESTROY (CFPlus::Layout self)
804 CODE: 1036 CODE:
805 g_object_unref (self->pl); 1037 g_object_unref (self->pl);
806 Safefree (self); 1038 Safefree (self);
807 1039
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 1040void
816set_text (CFClient::Layout self, SV *text_) 1041set_text (CFPlus::Layout self, SV *text_)
817 CODE: 1042 CODE:
818{ 1043{
819 STRLEN textlen; 1044 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 1045 char *text = SvPVutf8 (text_, textlen);
821 1046
822 pango_layout_set_text (self->pl, text, textlen); 1047 pango_layout_set_text (self->pl, text, textlen);
823} 1048}
824 1049
825void 1050void
826set_markup (CFClient::Layout self, SV *text_) 1051set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 1052 CODE:
828{ 1053{
829 STRLEN textlen; 1054 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 1055 char *text = SvPVutf8 (text_, textlen);
831 1056
832 pango_layout_set_markup (self->pl, text, textlen); 1057 pango_layout_set_markup (self->pl, text, textlen);
833} 1058}
834 1059
835void 1060void
836set_shapes (CFClient::Layout self, ...) 1061set_shapes (CFPlus::Layout self, ...)
837 CODE: 1062 CODE:
838{ 1063{
839 PangoAttrList *attrs = 0; 1064 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 1065 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 1066 const char *pos = text;
842 int arg = 2; 1067 int arg = 4;
843 1068
844 while (arg < items && (pos = strstr (pos, OBJ_STR))) 1069 while (arg < items && (pos = strstr (pos, OBJ_STR)))
845 { 1070 {
846 PangoRectangle rect; 1071 PangoRectangle inkrect, rect;
847 PangoAttribute *attr; 1072 PangoAttribute *attr;
848 1073
1074 int x = SvIV (ST (arg - 3));
1075 int y = SvIV (ST (arg - 2));
849 int w = SvIV (ST (arg - 1)); 1076 int w = SvIV (ST (arg - 1));
850 int h = SvIV (ST (arg)); 1077 int h = SvIV (ST (arg ));
851 1078
852 arg += 2;
853
854 rect.x = 0; 1079 inkrect.x = 0;
1080 inkrect.y = 0;
1081 inkrect.width = 0;
1082 inkrect.height = 0;
1083
1084 rect.x = x * PANGO_SCALE;
855 rect.y = -h * PANGO_SCALE; 1085 rect.y = y * PANGO_SCALE;
856 rect.width = w * PANGO_SCALE; 1086 rect.width = w * PANGO_SCALE;
857 rect.height = h * PANGO_SCALE; 1087 rect.height = h * PANGO_SCALE;
858 1088
859 if (!attrs) 1089 if (!attrs)
860 attrs = pango_layout_get_attributes (self->pl); 1090 attrs = pango_layout_get_attributes (self->pl);
861 1091
862 attr = pango_attr_shape_new (&rect, &rect); 1092 attr = pango_attr_shape_new (&inkrect, &rect);
863 attr->start_index = pos - text; 1093 attr->start_index = pos - text;
864 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1; 1094 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865 pango_attr_list_insert (attrs, attr); 1095 pango_attr_list_insert (attrs, attr);
866 1096
1097 arg += 4;
867 pos += sizeof (OBJ_STR) - 1; 1098 pos += sizeof (OBJ_STR) - 1;
868 } 1099 }
869 1100
870 if (attrs) 1101 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs); 1102 pango_layout_set_attributes (self->pl, attrs);
872} 1103}
873 1104
874void 1105void
875get_shapes (CFClient::Layout self) 1106get_shapes (CFPlus::Layout self)
876 PPCODE: 1107 PPCODE:
877{ 1108{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879 1110
880 do 1111 do
… …
884 if (run && shape_attr_p (run)) 1115 if (run && shape_attr_p (run))
885 { 1116 {
886 PangoRectangle extents; 1117 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents); 1118 pango_layout_iter_get_run_extents (iter, 0, &extents);
888 1119
1120 EXTEND (SP, 2);
889 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1121 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1122 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891 } 1123 }
892 } 1124 }
893 while (pango_layout_iter_next_run (iter)); 1125 while (pango_layout_iter_next_run (iter));
894 1126
895 pango_layout_iter_free (iter); 1127 pango_layout_iter_free (iter);
896} 1128}
897 1129
898int 1130int
899has_wrapped (CFClient::Layout self) 1131has_wrapped (CFPlus::Layout self)
900 CODE: 1132 CODE:
901{ 1133{
902 int lines = 1; 1134 int lines = 1;
903 const char *text = pango_layout_get_text (self->pl); 1135 const char *text = pango_layout_get_text (self->pl);
904 1136
… …
909} 1141}
910 OUTPUT: 1142 OUTPUT:
911 RETVAL 1143 RETVAL
912 1144
913SV * 1145SV *
914get_text (CFClient::Layout self) 1146get_text (CFPlus::Layout self)
915 CODE: 1147 CODE:
916 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917 sv_utf8_decode (RETVAL); 1149 sv_utf8_decode (RETVAL);
918 OUTPUT: 1150 OUTPUT:
919 RETVAL 1151 RETVAL
920 1152
921void 1153void
922set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1154set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923 CODE: 1155 CODE:
924 self->r = r; 1156 self->r = r;
925 self->g = g; 1157 self->g = g;
926 self->b = b; 1158 self->b = b;
927 self->a = a; 1159 self->a = a;
928 1160
929void 1161void
930set_font (CFClient::Layout self, CFClient::Font font = 0) 1162set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931 CODE: 1163 CODE:
932 if (self->font != font) 1164 if (self->font != font)
933 { 1165 {
934 self->font = font; 1166 self->font = font;
935 layout_update_font (self); 1167 layout_update_font (self);
936 } 1168 }
937 1169
938void 1170void
939set_height (CFClient::Layout self, int base_height) 1171set_height (CFPlus::Layout self, int base_height)
940 CODE: 1172 CODE:
941 if (self->base_height != base_height) 1173 if (self->base_height != base_height)
942 { 1174 {
943 self->base_height = base_height; 1175 self->base_height = base_height;
944 layout_update_font (self); 1176 layout_update_font (self);
945 } 1177 }
946 1178
947void 1179void
948set_width (CFClient::Layout self, int max_width = -1) 1180set_width (CFPlus::Layout self, int max_width = -1)
949 CODE: 1181 CODE:
950 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1182 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951 1183
952void 1184void
953set_indent (CFClient::Layout self, int indent) 1185set_indent (CFPlus::Layout self, int indent)
954 CODE: 1186 CODE:
955 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956 1188
957void 1189void
958set_spacing (CFClient::Layout self, int spacing) 1190set_spacing (CFPlus::Layout self, int spacing)
959 CODE: 1191 CODE:
960 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961 1193
962void 1194void
963set_ellipsise (CFClient::Layout self, int ellipsise) 1195set_ellipsise (CFPlus::Layout self, int ellipsise)
964 CODE: 1196 CODE:
965 pango_layout_set_ellipsize (self->pl, 1197 pango_layout_set_ellipsize (self->pl,
966 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START
967 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
969 : PANGO_ELLIPSIZE_NONE 1201 : PANGO_ELLIPSIZE_NONE
970 ); 1202 );
971 1203
972void 1204void
973set_single_paragraph_mode (CFClient::Layout self, int spm) 1205set_single_paragraph_mode (CFPlus::Layout self, int spm)
974 CODE: 1206 CODE:
975 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976 1208
977void 1209void
978size (CFClient::Layout self) 1210size (CFPlus::Layout self)
979 PPCODE: 1211 PPCODE:
980{ 1212{
981 int w, h; 1213 int w, h;
982 1214
983 layout_get_pixel_size (self, &w, &h); 1215 layout_get_pixel_size (self, &w, &h);
… …
986 PUSHs (sv_2mortal (newSViv (w))); 1218 PUSHs (sv_2mortal (newSViv (w)));
987 PUSHs (sv_2mortal (newSViv (h))); 1219 PUSHs (sv_2mortal (newSViv (h)));
988} 1220}
989 1221
990int 1222int
1223descent (CFPlus::Layout self)
1224 CODE:
1225{
1226 PangoRectangle rect;
1227 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1228 pango_layout_line_get_pixel_extents (line, 0, &rect);
1229 RETVAL = PANGO_DESCENT (rect);
1230}
1231 OUTPUT:
1232 RETVAL
1233
1234int
991xy_to_index (CFClient::Layout self, int x, int y) 1235xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1236 CODE:
993{ 1237{
994 int index, trailing; 1238 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1239 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1240 RETVAL = index + trailing;
997} 1241}
998 OUTPUT: 1242 OUTPUT:
999 RETVAL 1243 RETVAL
1000 1244
1001void 1245void
1002cursor_pos (CFClient::Layout self, int index) 1246cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1247 PPCODE:
1004{ 1248{
1005 PangoRectangle strong_pos; 1249 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1251
… …
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1256}
1013 1257
1014void 1258void
1015render (CFClient::Layout self) 1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1016 PPCODE: 1260 PPCODE:
1017{ 1261{
1018 SV *retval; 1262 int line, x;
1019 int w, h;
1020 1263
1021 layout_get_pixel_size (self, &w, &h); 1264 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1265 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1022 1266
1023 if (self->rgba)
1024 {
1025 cairo_surface_t *surface;
1026 cairo_t *cairo;
1027
1028 retval = newSV (w * h * 4);
1029 SvPOK_only (retval);
1030 SvCUR_set (retval, w * h * 4);
1031
1032 memset (SvPVX (retval), 0, w * h * 4);
1033
1034 surface = cairo_image_surface_create_for_data (
1035 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1036 cairo = cairo_create (surface);
1037 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039 pango_cairo_show_layout (cairo, self->pl);
1040
1041 cairo_destroy (cairo);
1042 cairo_surface_destroy (surface);
1043
1044 // what a mess, and its premultiplied, too :(
1045 {
1046 uint32_t *p = (uint32_t *)SvPVX (retval);
1047 uint32_t *e = p + w * h;
1048
1049 while (p < e)
1050 {
1051 uint32_t rgba = *p;
1052 rgba = (rgba >> 24) | (rgba << 8);
1053#if 0
1054#ifdef _WIN32
1055 {//D
1056 uint8_t r = rgba >> 24;
1057 uint8_t g = rgba >> 16;
1058 uint8_t b = rgba >> 8;
1059 uint8_t a = rgba >> 0;
1060
1061 rgba = (rgba & 0xffffff00) | a;
1062 }
1063#endif
1064#endif
1065 rgba = SDL_SwapBE32 (rgba);
1066 *p++ = rgba;
1067 }
1068 }
1069
1070 EXTEND (SP, 5); 1267 EXTEND (SP, 2);
1071 PUSHs (sv_2mortal (newSViv (w))); 1268 PUSHs (sv_2mortal (newSViv (line - 1)));
1269 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270}
1271
1272void
1273line_x_to_index (CFPlus::Layout self, int line, int x)
1274 PPCODE:
1275{
1276 PangoLayoutLine *lp;
1277 int index, trailing;
1278
1279 if (line < 0)
1280 XSRETURN_EMPTY;
1281
1282 if (!(lp = pango_layout_get_line (self->pl, line)))
1283 XSRETURN_EMPTY; /* do better */
1284
1285 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286
1287 EXTEND (SP, 2);
1288 if (GIMME_V == G_SCALAR)
1072 PUSHs (sv_2mortal (newSViv (h))); 1289 PUSHs (sv_2mortal (newSViv (index + trailing)));
1073 PUSHs (sv_2mortal (retval));
1074 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076 }
1077 else 1290 else
1078 { 1291 {
1079 FT_Bitmap bitmap;
1080
1081 retval = newSV (w * h);
1082 SvPOK_only (retval);
1083 SvCUR_set (retval, w * h);
1084
1085 bitmap.rows = h;
1086 bitmap.width = w;
1087 bitmap.pitch = w;
1088 bitmap.buffer = (unsigned char*)SvPVX (retval);
1089 bitmap.num_grays = 256;
1090 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092 memset (bitmap.buffer, 0, w * h);
1093
1094 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096 EXTEND (SP, 5);
1097 PUSHs (sv_2mortal (newSViv (w))); 1292 PUSHs (sv_2mortal (newSViv (index)));
1098 PUSHs (sv_2mortal (newSViv (h))); 1293 PUSHs (sv_2mortal (newSViv (trailing)));
1099 PUSHs (sv_2mortal (retval));
1100 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102 } 1294 }
1103} 1295}
1104 1296
1105MODULE = CFClient PACKAGE = CFClient::Texture
1106
1107void 1297void
1108pad2pot (SV *data_, SV *w_, SV *h_) 1298render (CFPlus::Layout self, float x, float y, int flags = 0)
1109 CODE: 1299 PPCODE:
1110{ 1300 pango_opengl_render_layout_subpixel (
1111 int ow = SvIV (w_); 1301 self->pl,
1112 int oh = SvIV (h_); 1302 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a,
1304 flags
1305 );
1113 1306
1114 if (ow && oh) 1307MODULE = CFPlus PACKAGE = CFPlus::Texture
1308
1309PROTOTYPES: ENABLE
1310
1311int minpot (int n)
1312
1313void
1314pad (SV *data_, int ow, int oh, int nw, int nh)
1315 CODE:
1316{
1317 if ((nw != ow || nh != oh) && SvOK (data_))
1115 { 1318 {
1116 int nw = minpot (ow);
1117 int nh = minpot (oh);
1118
1119 if (nw != ow || nh != oh)
1120 {
1121 if (SvOK (data_))
1122 {
1123 STRLEN datalen; 1319 STRLEN datalen;
1124 char *data = SvPVbyte (data_, datalen); 1320 char *data = SvPVbyte (data_, datalen);
1125 int bpp = datalen / (ow * oh); 1321 int bpp = datalen / (ow * oh);
1126 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1322 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1127 1323
1128 SvPOK_only (result_); 1324 SvPOK_only (result_);
1129 SvCUR_set (result_, nw * nh * bpp); 1325 SvCUR_set (result_, nw * nh * bpp);
1130 1326
1131 memset (SvPVX (result_), 0, nw * nh * bpp); 1327 memset (SvPVX (result_), 0, nw * nh * bpp);
1132 while (oh--) 1328 while (oh--)
1133 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1329 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1134 1330
1135 sv_setsv (data_, result_); 1331 sv_setsv (data_, result_);
1136 }
1137
1138 sv_setiv (w_, nw);
1139 sv_setiv (h_, nh);
1140 }
1141 } 1332 }
1142} 1333}
1143 1334
1144void 1335void
1145draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1336draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1188 glDisable (GL_ALPHA_TEST); 1379 glDisable (GL_ALPHA_TEST);
1189 glDisable (GL_BLEND); 1380 glDisable (GL_BLEND);
1190 } 1381 }
1191} 1382}
1192 1383
1384IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1385 CODE:
1386{
1387 GLint width;
1388 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1389 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1390 RETVAL = width > 0;
1391}
1392 OUTPUT:
1393 RETVAL
1394
1193MODULE = CFClient PACKAGE = CFClient::Map 1395MODULE = CFPlus PACKAGE = CFPlus::Map
1194 1396
1195CFClient::Map 1397PROTOTYPES: DISABLE
1196new (SV *class, int map_width, int map_height) 1398
1399CFPlus::Map
1400new (SV *class)
1197 CODE: 1401 CODE:
1198 New (0, RETVAL, 1, struct map); 1402 New (0, RETVAL, 1, struct map);
1199 RETVAL->x = 0; 1403 RETVAL->x = 0;
1200 RETVAL->y = 0; 1404 RETVAL->y = 0;
1201 RETVAL->w = map_width; 1405 RETVAL->w = 0;
1202 RETVAL->h = map_height; 1406 RETVAL->h = 0;
1203 RETVAL->ox = 0; 1407 RETVAL->ox = 0;
1204 RETVAL->oy = 0; 1408 RETVAL->oy = 0;
1205 RETVAL->faces = 8192; 1409 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1206 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1410 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1207 RETVAL->texs = 8192;
1208 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1209 RETVAL->rows = 0; 1411 RETVAL->rows = 0;
1210 RETVAL->row = 0; 1412 RETVAL->row = 0;
1211 OUTPUT: 1413 OUTPUT:
1212 RETVAL 1414 RETVAL
1213 1415
1214void 1416void
1215DESTROY (CFClient::Map self) 1417DESTROY (CFPlus::Map self)
1216 CODE: 1418 CODE:
1217{ 1419{
1218 map_clear (self); 1420 map_clear (self);
1219 Safefree (self->face); 1421 Safefree (self->face2tile);
1220 Safefree (self->tex); 1422 Safefree (self->tex);
1221 Safefree (self); 1423 Safefree (self);
1222} 1424}
1223 1425
1224void 1426void
1427resize (CFPlus::Map self, int map_width, int map_height)
1428 CODE:
1429 self->w = map_width;
1430 self->h = map_height;
1431
1432void
1225clear (CFClient::Map self) 1433clear (CFPlus::Map self)
1226 CODE: 1434 CODE:
1227 map_clear (self); 1435 map_clear (self);
1228 1436
1229void 1437void
1230set_face (CFClient::Map self, int face, int texid) 1438set_tileid (CFPlus::Map self, int face, int tile)
1231 CODE: 1439 CODE:
1232{ 1440{
1233 while (self->faces <= face) 1441 need_facenum (self, face); self->face2tile [face] = tile;
1234 { 1442 need_texid (self, tile);
1235 Append (mapface, self->face, self->faces, self->faces);
1236 self->faces *= 2;
1237 }
1238
1239 self->face [face] = texid;
1240} 1443}
1241 1444
1242void 1445void
1446set_smooth (CFPlus::Map self, int face, int smooth, int level)
1447 CODE:
1448{
1449 tileid texid;
1450 maptex *tex;
1451
1452 if (face < 0 || face >= self->faces)
1453 return;
1454
1455 if (smooth < 0 || smooth >= self->faces)
1456 return;
1457
1458 texid = self->face2tile [face];
1459
1460 if (!texid)
1461 return;
1462
1463 tex = self->tex + texid;
1464 tex->smoothtile = self->face2tile [smooth];
1465 tex->smoothlevel = level;
1466}
1467
1468void
1243set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1469set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1244 CODE: 1470 CODE:
1245{ 1471{
1246 while (self->texs <= texid) 1472 need_texid (self, texid);
1247 {
1248 Append (maptex, self->tex, self->texs, self->texs);
1249 self->texs *= 2;
1250 }
1251 1473
1252 { 1474 {
1253 maptex *tex = self->tex + texid; 1475 maptex *tex = self->tex + texid;
1254 1476
1255 tex->name = name; 1477 tex->name = name;
… …
1272 // from transparent color bleeding and ugly wrapping effects. 1494 // from transparent color bleeding and ugly wrapping effects.
1273 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274} 1496}
1275 1497
1276int 1498int
1277ox (CFClient::Map self) 1499ox (CFPlus::Map self)
1278 ALIAS: 1500 ALIAS:
1279 oy = 1 1501 oy = 1
1280 x = 2 1502 x = 2
1281 y = 3 1503 y = 3
1282 w = 4 1504 w = 4
… …
1293 } 1515 }
1294 OUTPUT: 1516 OUTPUT:
1295 RETVAL 1517 RETVAL
1296 1518
1297void 1519void
1298scroll (CFClient::Map self, int dx, int dy) 1520scroll (CFPlus::Map self, int dx, int dy)
1299 CODE: 1521 CODE:
1300{ 1522{
1301 if (dx > 0) 1523 if (dx > 0)
1302 map_blank (self, self->x, self->y, dx - 1, self->h); 1524 map_blank (self, self->x, self->y, dx, self->h);
1303 else if (dx < 0) 1525 else if (dx < 0)
1304 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1526 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1305 1527
1306 if (dy > 0) 1528 if (dy > 0)
1307 map_blank (self, self->x, self->y, self->w, dy - 1); 1529 map_blank (self, self->x, self->y, self->w, dy);
1308 else if (dy < 0) 1530 else if (dy < 0)
1309 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1531 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1310 1532
1311 self->ox += dx; self->x += dx; 1533 self->ox += dx; self->x += dx;
1312 self->oy += dy; self->y += dy; 1534 self->oy += dy; self->y += dy;
1313 1535
1314 while (self->y < 0) 1536 while (self->y < 0)
… …
1319 self->y += MAP_EXTEND_Y; 1541 self->y += MAP_EXTEND_Y;
1320 } 1542 }
1321} 1543}
1322 1544
1323void 1545void
1324map1a_update (CFClient::Map self, SV *data_) 1546map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325 CODE: 1547 CODE:
1326{ 1548{
1327 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1328 uint8_t *data_end = (uint8_t *)SvEND (data_); 1550 uint8_t *data_end = (uint8_t *)SvEND (data_);
1329 mapcell *cell; 1551 mapcell *cell;
1330 int x, y, flags; 1552 int x, y, flags;
1331 1553
1332 while (data < data_end) 1554 while (data < data_end - 1)
1333 { 1555 {
1334 flags = (data [0] << 8) + data [1]; data += 2; 1556 flags = (data [0] << 8) + data [1]; data += 2;
1335 1557
1336 x = self->x + ((flags >> 10) & 63); 1558 x = self->x + ((flags >> 10) & 63);
1337 y = self->y + ((flags >> 4) & 63); 1559 y = self->y + ((flags >> 4) & 63);
1338 1560
1339 cell = map_get_cell (self, x, y); 1561 cell = map_get_cell (self, x, y);
1340 1562
1341 if (flags & 15) 1563 if (flags & 15)
1342 { 1564 {
1343 if (cell->darkness < 0) 1565 if (!cell->darkness)
1344 { 1566 {
1567 memset (cell, 0, sizeof (*cell));
1345 cell->darkness = 0; 1568 cell->darkness = 256;
1346 cell->face [0] = 0;
1347 cell->face [1] = 0;
1348 cell->face [2] = 0;
1349 } 1569 }
1350 1570
1351 cell->darkness = flags & 8 ? *data++ : 255;
1352
1353 //TODO: don't trust server data to be in-range(!) 1571 //TODO: don't trust server data to be in-range(!)
1572
1573 if (flags & 8)
1574 {
1575 if (extmap)
1576 {
1577 uint8_t ext, cmd;
1578
1579 do
1580 {
1581 ext = *data++;
1582 cmd = ext & 0x3f;
1583
1584 if (cmd < 4)
1585 cell->darkness = 255 - ext * 64 + 1;
1586 else if (cmd == 5) // health
1587 {
1588 cell->stat_width = 1;
1589 cell->stat_hp = *data++;
1590 }
1591 else if (cmd == 6) // monster width
1592 cell->stat_width = *data++ + 1;
1593 else if (cmd == 0x47)
1594 {
1595 if (*data == 4)
1596 ; // decode player count
1597
1598 data += *data + 1;
1599 }
1600 else if (cmd == 8) // cell flags
1601 cell->flags = *data++;
1602 else if (ext & 0x40) // unknown, multibyte => skip
1603 data += *data + 1;
1604 else
1605 data++;
1606 }
1607 while (ext & 0x80);
1608 }
1609 else
1610 cell->darkness = *data++ + 1;
1611 }
1354 1612
1355 if (flags & 4) 1613 if (flags & 4)
1356 { 1614 {
1357 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1615 faceid face = (data [0] << 8) + data [1]; data += 2;
1616 need_facenum (self, face);
1617 cell->tile [0] = self->face2tile [face];
1358 } 1618 }
1359 1619
1360 if (flags & 2) 1620 if (flags & 2)
1361 { 1621 {
1362 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [1] = self->face2tile [face];
1363 } 1625 }
1364 1626
1365 if (flags & 1) 1627 if (flags & 1)
1366 { 1628 {
1367 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [2] = self->face2tile [face];
1368 } 1632 }
1369 } 1633 }
1370 else 1634 else
1371 cell->darkness = -1; 1635 cell->darkness = 0;
1372 } 1636 }
1373} 1637}
1374 1638
1375SV * 1639SV *
1376mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377 CODE: 1641 CODE:
1378{ 1642{
1379 int x1, x; 1643 int x1, x;
1380 int y1, y; 1644 int y1, y;
1381 int z; 1645 int z;
… …
1402 { 1666 {
1403 mapcell *cell = row->col + (x - row->c0); 1667 mapcell *cell = row->col + (x - row->c0);
1404 1668
1405 for (z = 0; z <= 0; z++) 1669 for (z = 0; z <= 0; z++)
1406 { 1670 {
1407 mapface face = cell->face [z];
1408
1409 if (face)
1410 {
1411 maptex tex = self->tex [face]; 1671 maptex tex = self->tex [cell->tile [z]];
1412 int a0 = 255 - tex.a; 1672 int a0 = 255 - tex.a;
1413 int a1 = tex.a; 1673 int a1 = tex.a;
1414 1674
1415 r = (r * a0 + tex.r * a1) / 255; 1675 r = (r * a0 + tex.r * a1) / 255;
1416 g = (g * a0 + tex.g * a1) / 255; 1676 g = (g * a0 + tex.g * a1) / 255;
1417 b = (b * a0 + tex.b * a1) / 255; 1677 b = (b * a0 + tex.b * a1) / 255;
1418 a = (a * a0 + tex.a * a1) / 255; 1678 a = (a * a0 + tex.a * a1) / 255;
1419 }
1420 } 1679 }
1421 } 1680 }
1422 1681
1423 *map++ = (r ) 1682 *map++ = (r )
1424 | (g << 8) 1683 | (g << 8)
… …
1431} 1690}
1432 OUTPUT: 1691 OUTPUT:
1433 RETVAL 1692 RETVAL
1434 1693
1435void 1694void
1436draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1695draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1437 CODE: 1696 CODE:
1438{ 1697{
1439 int vx, vy; 1698 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1700 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1701 smooth_key skey;
1440 int x, y, z; 1702 int x, y, z;
1441 int last_name; 1703 int last_name;
1442 mapface face;
1443 1704
1444 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1705 // thats current max. sorry.
1445 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1706 if (sw > 255) sw = 255;
1707 if (sh > 255) sh = 255;
1446 1708
1447 /* 1709 // clear key, in case of extra padding
1448 int vx = self->vx = self->w >= sw 1710 memset (&skey, 0, sizeof (skey));
1449 ? self->x + (self->w - sw) / 2
1450 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1451
1452 int vy = self->vy = self->h >= sh
1453 ? self->y + (self->h - sh) / 2
1454 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1455 */
1456 1711
1457 glColor4ub (255, 255, 255, 255); 1712 glColor4ub (255, 255, 255, 255);
1458 1713
1459 glEnable (GL_BLEND); 1714 glEnable (GL_BLEND);
1460 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1463 1718
1464 glBegin (GL_QUADS); 1719 glBegin (GL_QUADS);
1465 1720
1466 last_name = 0; 1721 last_name = 0;
1467 1722
1723 mx += self->x;
1724 my += self->y;
1725
1726 // first pass: determine smooth_max
1727 // rather ugly, if you ask me
1728 // could also be stored inside mapcell and updated on change
1729 memset (smooth_max, 0, sizeof (smooth_max));
1730
1731 for (y = 0; y < sh; y++)
1732 if (0 <= y + my && y + my < self->rows)
1733 {
1734 maprow *row = self->row + (y + my);
1735
1736 for (x = 0; x < sw; x++)
1737 if (row->c0 <= x + mx && x + mx < row->c1)
1738 {
1739 mapcell *cell = row->col + (x + mx - row->c0);
1740
1741 smooth_max[x + 1][y + 1] =
1742 MAX (self->tex [cell->tile [0]].smoothlevel,
1743 MAX (self->tex [cell->tile [1]].smoothlevel,
1744 self->tex [cell->tile [2]].smoothlevel));
1745 }
1746 }
1747
1468 for (z = 0; z < 3; z++) 1748 for (z = 0; z <= 2; z++)
1749 {
1750 memset (smooth_level, 0, sizeof (smooth_level));
1751
1469 for (y = 0; y < sh; y++) 1752 for (y = 0; y < sh; y++)
1470 if (0 <= y + vy && y + vy < self->rows) 1753 if (0 <= y + my && y + my < self->rows)
1471 { 1754 {
1472 maprow *row = self->row + (y + vy); 1755 maprow *row = self->row + (y + my);
1473 1756
1474 for (x = 0; x < sw; x++) 1757 for (x = 0; x < sw; x++)
1475 if (row->c0 <= x + vx && x + vx < row->c1) 1758 if (row->c0 <= x + mx && x + mx < row->c1)
1476 { 1759 {
1477 mapcell *cell = row->col + (x + vx - row->c0); 1760 mapcell *cell = row->col + (x + mx - row->c0);
1478
1479 face = cell->face [z]; 1761 tileid tile = cell->tile [z];
1480 1762
1481 if (face) 1763 if (tile)
1764 {
1765 maptex tex = self->tex [tile];
1766 int px = (x + 1) * T - tex.w;
1767 int py = (y + 1) * T - tex.h;
1768
1769 // suppressing texture state switches here
1770 // is only moderately effective, but worth the extra effort
1771 if (last_name != tex.name)
1772 {
1773 if (!tex.name)
1774 tex = self->tex [2]; /* missing, replace by noface */
1775
1776 glEnd ();
1777 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1778 glBegin (GL_QUADS);
1779 }
1780
1781 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1782 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786 if (cell->flags && z == 2)
1787 {
1788 if (cell->flags & 1)
1789 {
1790 maptex tex = self->tex [1];
1791 int px = x * T + T * 2 / 32;
1792 int py = y * T - T * 6 / 32;
1793
1794 glEnd ();
1795 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1796 glBegin (GL_QUADS);
1797
1798 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802 }
1803 }
1804
1805 // update smooth hash
1806 if (tex.smoothtile)
1807 {
1808 skey.tile = tex.smoothtile;
1809 skey.level = tex.smoothlevel;
1810
1811 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1812
1813 // add bits to current tile and all neighbours. skey.x|y is
1814 // shifted +1|+1 so we always stay positive.
1815
1816 // bits is ___n cccc CCCC bbbb
1817 // n do not draw borders&corners
1818 // c draw these corners, but...
1819 // C ... not these
1820 // b draw these borders
1821
1822 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1823 // ┃· ·· ·┃ ━━
1824
1825 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1826 // ·· ·· ·┏ ┓·
1827
1828 // full tile
1829 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1830
1831 // borders
1832 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1833 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1834 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1835 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1836
1837 // corners
1838 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1839 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1840 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1841 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1842 }
1843 }
1844 }
1845 }
1846
1847 // go through all smoothlevels, lowest to highest, then draw.
1848 // this is basically counting sort
1849 {
1850 int w, b;
1851
1852 for (w = 0; w < 256 / 32; ++w)
1853 {
1854 uint32_t smask = smooth_level [w];
1855 if (smask)
1856 for (b = 0; b < 32; ++b)
1857 if (smask & (((uint32_t)1) << b))
1482 { 1858 {
1483 maptex tex = self->tex [face]; 1859 int level = (w << 5) | b;
1860 HE *he;
1484 1861
1485 int px = (x + 1) * 32 - tex.w; 1862 hv_iterinit (smooth);
1486 int py = (y + 1) * 32 - tex.h; 1863 while ((he = hv_iternext (smooth)))
1487
1488 if (last_name != tex.name)
1489 { 1864 {
1865 smooth_key *skey = (smooth_key *)HeKEY (he);
1866 IV bits = SvIVX (HeVAL (he));
1867
1868 if (!(bits & 0x1000)
1869 && skey->level == level
1870 && level > smooth_max [skey->x][skey->y])
1871 {
1872 maptex tex = self->tex [skey->tile];
1873 int px = (((int)skey->x) - 1) * T;
1874 int py = (((int)skey->y) - 1) * T;
1875 int border = bits & 15;
1876 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877 float dx = tex.s * .0625f; // 16 images/row
1878 float dy = tex.t * .5f ; // 2 images/column
1879
1880 // this time naively avoiding texture state changes
1881 // save gobs of state changes.
1882 if (last_name != tex.name)
1883 {
1884 if (!tex.name)
1885 continue; // smoothing not yet available
1886
1490 glEnd (); 1887 glEnd ();
1491 last_name = tex.name;
1492 glBindTexture (GL_TEXTURE_2D, last_name); 1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493 glBegin (GL_QUADS); 1889 glBegin (GL_QUADS);
1890 }
1891
1892 if (border)
1893 {
1894 float ox = border * dx;
1895
1896 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1897 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1898 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1899 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1900 }
1901
1902 if (corner)
1903 {
1904 float ox = corner * dx;
1905
1906 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1907 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1908 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1909 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1910 }
1911 }
1494 } 1912 }
1495
1496 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500 } 1913 }
1501 }
1502 } 1914 }
1915 }
1916
1917 hv_clear (smooth);
1918 }
1503 1919
1504 glEnd (); 1920 glEnd ();
1505 1921
1506 glDisable (GL_TEXTURE_2D); 1922 glDisable (GL_TEXTURE_2D);
1507 glDisable (GL_BLEND); 1923 glDisable (GL_BLEND);
1508}
1509 1924
1925 // top layer: overlays such as the health bar
1926 for (y = 0; y < sh; y++)
1927 if (0 <= y + my && y + my < self->rows)
1928 {
1929 maprow *row = self->row + (y + my);
1930
1931 for (x = 0; x < sw; x++)
1932 if (row->c0 <= x + mx && x + mx < row->c1)
1933 {
1934 mapcell *cell = row->col + (x + mx - row->c0);
1935
1936 int px = x * T;
1937 int py = y * T;
1938
1939 if (cell->stat_hp)
1940 {
1941 int width = cell->stat_width * T;
1942 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1943
1944 glColor3ub (0, 0, 0);
1945 glRectf (px + 1, py - thick - 2,
1946 px + width - 1, py);
1947
1948 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1949 glRectf (px + 2,
1950 py - thick - 1,
1951 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1952 }
1953 }
1954 }
1955}
1956
1510void 1957void
1511draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512 CODE: 1959 CODE:
1513{ 1960{
1514 static float color[16][3] = { 1961 static float color[16][3] = {
1515 { 0.00, 0.00, 0.00 }, 1962 { 0.00F, 0.00F, 0.00F },
1516 { 1.00, 1.00, 1.00 }, 1963 { 1.00F, 1.00F, 1.00F },
1517 { 0.00, 0.00, 0.55 }, 1964 { 0.00F, 0.00F, 0.55F },
1518 { 1.00, 0.00, 0.00 }, 1965 { 1.00F, 0.00F, 0.00F },
1519 1966
1520 { 1.00, 0.54, 0.00 }, 1967 { 1.00F, 0.54F, 0.00F },
1521 { 0.11, 0.56, 1.00 }, 1968 { 0.11F, 0.56F, 1.00F },
1522 { 0.93, 0.46, 0.00 }, 1969 { 0.93F, 0.46F, 0.00F },
1523 { 0.18, 0.54, 0.34 }, 1970 { 0.18F, 0.54F, 0.34F },
1524 1971
1525 { 0.56, 0.73, 0.56 }, 1972 { 0.56F, 0.73F, 0.56F },
1526 { 0.80, 0.80, 0.80 }, 1973 { 0.80F, 0.80F, 0.80F },
1527 { 0.55, 0.41, 0.13 }, 1974 { 0.55F, 0.41F, 0.13F },
1528 { 0.99, 0.77, 0.26 }, 1975 { 0.99F, 0.77F, 0.26F },
1529 1976
1530 { 0.74, 0.65, 0.41 }, 1977 { 0.74F, 0.65F, 0.41F },
1531 1978
1532 { 0.00, 1.00, 1.00 }, 1979 { 0.00F, 1.00F, 1.00F },
1533 { 1.00, 0.00, 1.00 }, 1980 { 1.00F, 0.00F, 1.00F },
1534 { 1.00, 1.00, 0.00 }, 1981 { 1.00F, 1.00F, 0.00F },
1535 }; 1982 };
1536 1983
1537 int x, y; 1984 int x, y;
1538 1985
1539 glEnable (GL_TEXTURE_2D); 1986 glEnable (GL_TEXTURE_2D);
… …
1566 glDisable (GL_BLEND); 2013 glDisable (GL_BLEND);
1567 glDisable (GL_TEXTURE_2D); 2014 glDisable (GL_TEXTURE_2D);
1568} 2015}
1569 2016
1570void 2017void
1571fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1572 PPCODE: 2019 PPCODE:
1573{ 2020{
1574 int vx, vy;
1575 int x, y; 2021 int x, y;
2022 int sw1 = sw + 2;
2023 int sh1 = sh + 2;
2024 int sh3 = sh * 3;
1576 int sw4 = (sw + 3) & ~3; 2025 int sw34 = (sw * 3 + 3) & ~3;
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1577 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1578 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1579 2029
1580 memset (darkness, 255, sw4 * sh);
1581 SvPOK_only (darkness_sv); 2030 SvPOK_only (darkness3_sv);
1582 SvCUR_set (darkness_sv, sw4 * sh); 2031 SvCUR_set (darkness3_sv, sw34 * sh3);
1583 2032
1584 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2033 mx += self->x - 1;
1585 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2034 my += self->y - 1;
1586 2035
2036 memset (darkness1, 255, sw1 * sh1);
2037
1587 for (y = 0; y < sh; y++) 2038 for (y = 0; y < sh1; y++)
1588 if (0 <= y + vy && y + vy < self->rows) 2039 if (0 <= y + my && y + my < self->rows)
1589 { 2040 {
1590 maprow *row = self->row + (y + vy); 2041 maprow *row = self->row + (y + my);
1591 2042
1592 for (x = 0; x < sw; x++) 2043 for (x = 0; x < sw1; x++)
1593 if (row->c0 <= x + vx && x + vx < row->c1) 2044 if (row->c0 <= x + mx && x + mx < row->c1)
1594 { 2045 {
1595 mapcell *cell = row->col + (x + vx - row->c0); 2046 mapcell *cell = row->col + (x + mx - row->c0);
1596 2047
1597 darkness[y * sw4 + x] = cell->darkness < 0 2048 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1)
1598 ? 255 - FOW_DARKNESS 2050 : 255 - FOW_DARKNESS;
1599 : 255 - cell->darkness;
1600 } 2051 }
1601 } 2052 }
1602 2053
2054 for (y = 0; y < sh; ++y)
2055 for (x = 0; x < sw; ++x)
2056 {
2057 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2058 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2059 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2060 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2061 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2062 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2063 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2064 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2065 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2066
2067 uint8_t r11 = (d11 + d21 + d12) / 3;
2068 uint8_t r21 = d21;
2069 uint8_t r31 = (d21 + d31 + d32) / 3;
2070
2071 uint8_t r12 = d12;
2072 uint8_t r22 = d22;
2073 uint8_t r32 = d32;
2074
2075 uint8_t r13 = (d13 + d23 + d12) / 3;
2076 uint8_t r23 = d23;
2077 uint8_t r33 = (d23 + d33 + d32) / 3;
2078
2079 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2080 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2081 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2082 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2083 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2084 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2085 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2086 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2087 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2088 }
2089
2090 free (darkness1);
2091
1603 EXTEND (SP, 3); 2092 EXTEND (SP, 3);
1604 PUSHs (sv_2mortal (newSViv (sw4))); 2093 PUSHs (sv_2mortal (newSViv (sw34)));
1605 PUSHs (sv_2mortal (newSViv (sh))); 2094 PUSHs (sv_2mortal (newSViv (sh3)));
1606 PUSHs (darkness_sv); 2095 PUSHs (darkness3_sv);
1607} 2096}
1608 2097
1609SV * 2098SV *
1610get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2099get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611 CODE: 2100 CODE:
1612{ 2101{
1613 int x, y, x1, y1; 2102 int x, y, x1, y1;
1614 SV *data_sv = newSV (w * h * 7 + 5); 2103 SV *data_sv = newSV (w * h * 7 + 5);
1615 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2104 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1640 if (row && row->c0 <= x && x < row->c1) 2129 if (row && row->c0 <= x && x < row->c1)
1641 { 2130 {
1642 mapcell *cell = row->col + (x - row->c0); 2131 mapcell *cell = row->col + (x - row->c0);
1643 uint8_t flags = 0; 2132 uint8_t flags = 0;
1644 2133
1645 if (cell->face [0]) flags |= 1; 2134 if (cell->tile [0]) flags |= 1;
1646 if (cell->face [1]) flags |= 2; 2135 if (cell->tile [1]) flags |= 2;
1647 if (cell->face [2]) flags |= 4; 2136 if (cell->tile [2]) flags |= 4;
1648 2137
1649 *data++ = flags; 2138 *data++ = flags;
1650 2139
1651 if (flags & 1) 2140 if (flags & 1)
1652 { 2141 {
2142 tileid tile = cell->tile [0];
1653 *data++ = cell->face [0] >> 8; 2143 *data++ = tile >> 8;
1654 *data++ = cell->face [0]; 2144 *data++ = tile;
1655 } 2145 }
1656 2146
1657 if (flags & 2) 2147 if (flags & 2)
1658 { 2148 {
2149 tileid tile = cell->tile [1];
1659 *data++ = cell->face [1] >> 8; 2150 *data++ = tile >> 8;
1660 *data++ = cell->face [1]; 2151 *data++ = tile;
1661 } 2152 }
1662 2153
1663 if (flags & 4) 2154 if (flags & 4)
1664 { 2155 {
2156 tileid tile = cell->tile [2];
1665 *data++ = cell->face [2] >> 8; 2157 *data++ = tile >> 8;
1666 *data++ = cell->face [2]; 2158 *data++ = tile;
1667 } 2159 }
1668 } 2160 }
1669 else 2161 else
1670 *data++ = 0; 2162 *data++ = 0;
1671 } 2163 }
… …
1677} 2169}
1678 OUTPUT: 2170 OUTPUT:
1679 RETVAL 2171 RETVAL
1680 2172
1681void 2173void
1682set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683 PPCODE: 2175 PPCODE:
1684{ 2176{
1685 int x, y, z; 2177 int x, y, z;
1686 int w, h; 2178 int w, h;
1687 int x1, y1; 2179 int x1, y1;
… …
1711 { 2203 {
1712 uint8_t flags = *data++; 2204 uint8_t flags = *data++;
1713 2205
1714 if (flags) 2206 if (flags)
1715 { 2207 {
1716 mapface face[3] = { 0, 0, 0 };
1717
1718 mapcell *cell = row_get_cell (row, x); 2208 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 };
1719 2210
1720 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2211 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1721 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1722 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1723 2214
1724 if (cell->darkness <= 0) 2215 if (cell->darkness == 0)
1725 { 2216 {
1726 cell->darkness = -1; 2217 cell->darkness = 0;
1727 2218
1728 for (z = 0; z <= 2; z++) 2219 for (z = 0; z <= 2; z++)
1729 { 2220 {
1730 cell->face[z] = face[z]; 2221 tileid t = tile [z];
1731 2222
1732 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2223 if (t >= self->texs || (t && !self->tex [t].name))
2224 {
1733 XPUSHs (sv_2mortal (newSViv (face[z]))); 2225 XPUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t);
2227 }
2228
2229 cell->tile [z] = t;
1734 } 2230 }
1735 } 2231 }
1736 } 2232 }
1737 } 2233 }
1738 } 2234 }
1739} 2235}
1740 2236
1741MODULE = CFClient PACKAGE = CFClient::MixChunk 2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742 2238
2239PROTOTYPES: DISABLE
2240
1743CFClient::MixChunk 2241CFPlus::MixChunk
1744new_from_file (SV *class, char *path) 2242new_from_file (SV *class, char *path)
1745 CODE: 2243 CODE:
1746 RETVAL = Mix_LoadWAV (path); 2244 RETVAL = Mix_LoadWAV (path);
1747 OUTPUT: 2245 OUTPUT:
1748 RETVAL 2246 RETVAL
1749 2247
1750void 2248void
1751DESTROY (CFClient::MixChunk self) 2249DESTROY (CFPlus::MixChunk self)
1752 CODE: 2250 CODE:
1753 Mix_FreeChunk (self); 2251 Mix_FreeChunk (self);
1754 2252
1755int 2253int
1756volume (CFClient::MixChunk self, int volume = -1) 2254volume (CFPlus::MixChunk self, int volume = -1)
1757 CODE: 2255 CODE:
1758 RETVAL = Mix_VolumeChunk (self, volume); 2256 RETVAL = Mix_VolumeChunk (self, volume);
1759 OUTPUT: 2257 OUTPUT:
1760 RETVAL 2258 RETVAL
1761 2259
1762int 2260int
1763play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2261play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764 CODE: 2262 CODE:
1765 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2263 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766 OUTPUT: 2264 OUTPUT:
1767 RETVAL 2265 RETVAL
1768 2266
1769MODULE = CFClient PACKAGE = CFClient::MixMusic 2267MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770 2268
1771int 2269int
1772volume (int volume = -1) 2270volume (int volume = -1)
2271 PROTOTYPE: ;$
1773 CODE: 2272 CODE:
1774 RETVAL = Mix_VolumeMusic (volume); 2273 RETVAL = Mix_VolumeMusic (volume);
1775 OUTPUT: 2274 OUTPUT:
1776 RETVAL 2275 RETVAL
1777 2276
2277int
2278fade_out (int ms)
2279 CODE:
2280 RETVAL = Mix_FadeOutMusic (ms);
2281 OUTPUT:
2282 RETVAL
2283
1778CFClient::MixMusic 2284CFPlus::MixMusic
1779new_from_file (SV *class, char *path) 2285new_from_file (SV *class, char *path)
1780 CODE: 2286 CODE:
1781 RETVAL = Mix_LoadMUS (path); 2287 RETVAL = Mix_LoadMUS (path);
1782 OUTPUT: 2288 OUTPUT:
1783 RETVAL 2289 RETVAL
1784 2290
1785void 2291void
1786DESTROY (CFClient::MixMusic self) 2292DESTROY (CFPlus::MixMusic self)
1787 CODE: 2293 CODE:
1788 Mix_FreeMusic (self); 2294 Mix_FreeMusic (self);
1789 2295
1790int 2296int
1791play (CFClient::MixMusic self, int loops = -1) 2297play (CFPlus::MixMusic self, int loops = -1)
1792 CODE: 2298 CODE:
1793 RETVAL = Mix_PlayMusic (self, loops); 2299 RETVAL = Mix_PlayMusic (self, loops);
1794 OUTPUT: 2300 OUTPUT:
1795 RETVAL 2301 RETVAL
1796 2302
2303int
2304fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2305 CODE:
2306 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2307 OUTPUT:
2308 RETVAL
2309
1797MODULE = CFClient PACKAGE = CFClient::OpenGL 2310MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2311
2312PROTOTYPES: ENABLE
1798 2313
1799BOOT: 2314BOOT:
1800{ 2315{
1801 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2316 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802 static const struct { 2317 static const struct {
1803 const char *name; 2318 const char *name;
1804 IV iv; 2319 IV iv;
1805 } *civ, const_iv[] = { 2320 } *civ, const_iv[] = {
1806# define const_iv(name) { # name, (IV)name } 2321# define const_iv(name) { # name, (IV)name }
2322 const_iv (GL_VENDOR),
2323 const_iv (GL_VERSION),
2324 const_iv (GL_EXTENSIONS),
1807 const_iv (GL_COLOR_MATERIAL), 2325 const_iv (GL_COLOR_MATERIAL),
1808 const_iv (GL_SMOOTH), 2326 const_iv (GL_SMOOTH),
1809 const_iv (GL_FLAT), 2327 const_iv (GL_FLAT),
1810 const_iv (GL_DITHER), 2328 const_iv (GL_DITHER),
1811 const_iv (GL_BLEND), 2329 const_iv (GL_BLEND),
… …
1815 const_iv (GL_ALPHA_TEST), 2333 const_iv (GL_ALPHA_TEST),
1816 const_iv (GL_NORMALIZE), 2334 const_iv (GL_NORMALIZE),
1817 const_iv (GL_RESCALE_NORMAL), 2335 const_iv (GL_RESCALE_NORMAL),
1818 const_iv (GL_FRONT), 2336 const_iv (GL_FRONT),
1819 const_iv (GL_BACK), 2337 const_iv (GL_BACK),
2338 const_iv (GL_AUX0),
1820 const_iv (GL_AND), 2339 const_iv (GL_AND),
1821 const_iv (GL_ONE), 2340 const_iv (GL_ONE),
1822 const_iv (GL_ZERO), 2341 const_iv (GL_ZERO),
1823 const_iv (GL_SRC_ALPHA), 2342 const_iv (GL_SRC_ALPHA),
1824 const_iv (GL_DST_ALPHA), 2343 const_iv (GL_DST_ALPHA),
… …
1838 const_iv (GL_LUMINANCE), 2357 const_iv (GL_LUMINANCE),
1839 const_iv (GL_LUMINANCE_ALPHA), 2358 const_iv (GL_LUMINANCE_ALPHA),
1840 const_iv (GL_FLOAT), 2359 const_iv (GL_FLOAT),
1841 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2360 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1842 const_iv (GL_COMPILE), 2361 const_iv (GL_COMPILE),
2362 const_iv (GL_PROXY_TEXTURE_1D),
2363 const_iv (GL_PROXY_TEXTURE_2D),
1843 const_iv (GL_TEXTURE_1D), 2364 const_iv (GL_TEXTURE_1D),
1844 const_iv (GL_TEXTURE_2D), 2365 const_iv (GL_TEXTURE_2D),
1845 const_iv (GL_TEXTURE_ENV), 2366 const_iv (GL_TEXTURE_ENV),
1846 const_iv (GL_TEXTURE_MAG_FILTER), 2367 const_iv (GL_TEXTURE_MAG_FILTER),
1847 const_iv (GL_TEXTURE_MIN_FILTER), 2368 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1868 const_iv (GL_COLOR_LOGIC_OP), 2389 const_iv (GL_COLOR_LOGIC_OP),
1869 const_iv (GL_SEPARABLE_2D), 2390 const_iv (GL_SEPARABLE_2D),
1870 const_iv (GL_CONVOLUTION_2D), 2391 const_iv (GL_CONVOLUTION_2D),
1871 const_iv (GL_CONVOLUTION_BORDER_MODE), 2392 const_iv (GL_CONVOLUTION_BORDER_MODE),
1872 const_iv (GL_CONSTANT_BORDER), 2393 const_iv (GL_CONSTANT_BORDER),
2394 const_iv (GL_POINTS),
1873 const_iv (GL_LINES), 2395 const_iv (GL_LINES),
2396 const_iv (GL_LINE_STRIP),
1874 const_iv (GL_LINE_LOOP), 2397 const_iv (GL_LINE_LOOP),
1875 const_iv (GL_QUADS), 2398 const_iv (GL_QUADS),
1876 const_iv (GL_QUAD_STRIP), 2399 const_iv (GL_QUAD_STRIP),
1877 const_iv (GL_TRIANGLES), 2400 const_iv (GL_TRIANGLES),
1878 const_iv (GL_TRIANGLE_STRIP), 2401 const_iv (GL_TRIANGLE_STRIP),
1879 const_iv (GL_TRIANGLE_FAN), 2402 const_iv (GL_TRIANGLE_FAN),
2403 const_iv (GL_POLYGON),
1880 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2404 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405 const_iv (GL_POINT_SMOOTH_HINT),
2406 const_iv (GL_LINE_SMOOTH_HINT),
2407 const_iv (GL_POLYGON_SMOOTH_HINT),
2408 const_iv (GL_GENERATE_MIPMAP_HINT),
1881 const_iv (GL_FASTEST), 2409 const_iv (GL_FASTEST),
2410 const_iv (GL_DONT_CARE),
2411 const_iv (GL_NICEST),
1882 const_iv (GL_V2F), 2412 const_iv (GL_V2F),
1883 const_iv (GL_V3F), 2413 const_iv (GL_V3F),
1884 const_iv (GL_T2F_V3F), 2414 const_iv (GL_T2F_V3F),
1885 const_iv (GL_T2F_N3F_V3F), 2415 const_iv (GL_T2F_N3F_V3F),
1886# undef const_iv 2416# undef const_iv
1887 }; 2417 };
1888 2418
1889 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2419 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1890 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2420 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2421
2422 texture_av = newAV ();
2423 AvREAL_off (texture_av);
1891} 2424}
1892 2425
1893char * 2426char *
1894gl_vendor () 2427gl_vendor ()
1895 CODE: 2428 CODE:
… …
1909 CODE: 2442 CODE:
1910 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2443 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1911 OUTPUT: 2444 OUTPUT:
1912 RETVAL 2445 RETVAL
1913 2446
2447const char *glGetString (GLenum pname)
2448
2449GLint glGetInteger (GLenum pname)
2450 CODE:
2451 glGetIntegerv (pname, &RETVAL);
2452 OUTPUT:
2453 RETVAL
2454
2455GLdouble glGetDouble (GLenum pname)
2456 CODE:
2457 glGetDoublev (pname, &RETVAL);
2458 OUTPUT:
2459 RETVAL
2460
1914int glGetError () 2461int glGetError ()
1915 2462
1916void glFinish () 2463void glFinish ()
1917 2464
1918void glClear (int mask) 2465void glClear (int mask)
… …
1955# near_ and far_ are due to microsofts buggy "c" compiler 2502# near_ and far_ are due to microsofts buggy "c" compiler
1956void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2503void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1957 2504
1958# near_ and far_ are due to microsofts buggy "c" compiler 2505# near_ and far_ are due to microsofts buggy "c" compiler
1959void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2506void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2507
2508PROTOTYPES: DISABLE
1960 2509
1961void glViewport (int x, int y, int width, int height) 2510void glViewport (int x, int y, int width, int height)
1962 2511
1963void glScissor (int x, int y, int width, int height) 2512void glScissor (int x, int y, int width, int height)
1964 2513
… …
1972 2521
1973void glRotate (float angle, float x, float y, float z) 2522void glRotate (float angle, float x, float y, float z)
1974 CODE: 2523 CODE:
1975 glRotatef (angle, x, y, z); 2524 glRotatef (angle, x, y, z);
1976 2525
1977void glBegin (int mode)
1978
1979void glEnd ()
1980
1981void glColor (float r, float g, float b, float a = 1.0) 2526void glColor (float r, float g, float b, float a = 1.0)
1982 PROTOTYPE: @
1983 ALIAS: 2527 ALIAS:
1984 glColor_premultiply = 1 2528 glColor_premultiply = 1
1985 CODE: 2529 CODE:
1986 if (ix) 2530 if (ix)
1987 { 2531 {
1988 r *= a; 2532 r *= a;
1989 g *= a; 2533 g *= a;
1990 b *= a; 2534 b *= a;
1991 } 2535 }
1992 // microsoft visual "c" rounds instead of truncating... 2536 // microsoft visual "c" rounds instead of truncating...
1993 glColor4ub (MIN ((int)(r * 256.f), 255), 2537 glColor4f (r, g, b, a);
1994 MIN ((int)(g * 256.f), 255),
1995 MIN ((int)(b * 256.f), 255),
1996 MIN ((int)(a * 256.f), 255));
1997
1998void glInterleavedArrays (int format, int stride, char *data)
1999
2000void glDrawElements (int mode, int count, int type, char *indices)
2001
2002# 1.2 void glDrawRangeElements (int mode, int start, int end
2003 2538
2004void glRasterPos (float x, float y, float z = 0.) 2539void glRasterPos (float x, float y, float z = 0.)
2005 CODE: 2540 CODE:
2006 glRasterPos3f (0, 0, z); 2541 glRasterPos3f (0, 0, z);
2007 glBitmap (0, 0, 0, 0, x, y, 0); 2542 glBitmap (0, 0, 0, 0, x, y, 0);
… …
2012 2547
2013void glTexCoord (float s, float t) 2548void glTexCoord (float s, float t)
2014 CODE: 2549 CODE:
2015 glTexCoord2f (s, t); 2550 glTexCoord2f (s, t);
2016 2551
2552void glRect (float x1, float y1, float x2, float y2)
2553 CODE:
2554 glRectf (x1, y1, x2, y2);
2555
2556PROTOTYPES: ENABLE
2557
2558void glBegin (int mode)
2559
2560void glEnd ()
2561
2562void glPointSize (GLfloat size)
2563
2564void glLineWidth (GLfloat width)
2565
2566void glInterleavedArrays (int format, int stride, char *data)
2567
2568void glDrawElements (int mode, int count, int type, char *indices)
2569
2570# 1.2 void glDrawRangeElements (int mode, int start, int end
2571
2017void glTexEnv (int target, int pname, float param) 2572void glTexEnv (int target, int pname, float param)
2018 CODE: 2573 CODE:
2019 glTexEnvf (target, pname, param); 2574 glTexEnvf (target, pname, param);
2020 2575
2021void glTexParameter (int target, int pname, float param) 2576void glTexParameter (int target, int pname, float param)
… …
2043 2598
2044void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2599void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2045 2600
2046void glDrawPixels (int width, int height, int format, int type, char *pixels) 2601void glDrawPixels (int width, int height, int format, int type, char *pixels)
2047 2602
2603void glPixelZoom (float x, float y)
2604
2048void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2605void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2049 2606
2050int glGenTexture () 2607int glGenTexture ()
2051 CODE: 2608 CODE:
2052{ 2609 RETVAL = gen_texture ();
2053 GLuint name;
2054 glGenTextures (1, &name);
2055 RETVAL = name;
2056}
2057 OUTPUT: 2610 OUTPUT:
2058 RETVAL 2611 RETVAL
2059 2612
2060void glDeleteTexture (int name) 2613void glDeleteTexture (int name)
2061 CODE: 2614 CODE:
2062{
2063 GLuint name_ = name;
2064 glDeleteTextures (1, &name_); 2615 del_texture (name);
2065} 2616
2066
2067int glGenList () 2617int glGenList ()
2068 CODE: 2618 CODE:
2069 RETVAL = glGenLists (1); 2619 RETVAL = glGenLists (1);
2070 OUTPUT: 2620 OUTPUT:
2071 RETVAL 2621 RETVAL
… …
2078 2628
2079void glEndList () 2629void glEndList ()
2080 2630
2081void glCallList (int list) 2631void glCallList (int list)
2082 2632
2633MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2083 2634
2635PROTOTYPES: DISABLE
2636
2637void
2638find_widget (SV *self, NV x, NV y)
2639 PPCODE:
2640{
2641 if (within_widget (self, x, y))
2642 XPUSHs (self);
2643}
2644
2645BOOT:
2646{
2647 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2648
2649 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2650 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2651 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2652 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2653}
2654
2655void
2656draw (SV *self)
2657 CODE:
2658{
2659 HV *hv;
2660 SV **svp;
2661 NV x, y, w, h;
2662 SV *draw_x_sv = GvSV (draw_x_gv);
2663 SV *draw_y_sv = GvSV (draw_y_gv);
2664 SV *draw_w_sv = GvSV (draw_w_gv);
2665 SV *draw_h_sv = GvSV (draw_h_gv);
2666 SV *hover;
2667 double draw_x, draw_y, draw_w, draw_h;
2668
2669 if (!SvROK (self))
2670 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2671
2672 hv = (HV *)SvRV (self);
2673
2674 if (SvTYPE (hv) != SVt_PVHV)
2675 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2676
2677 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2678 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2679
2680 if (!h || !w)
2681 XSRETURN_EMPTY;
2682
2683 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2684 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2685
2686 draw_x = SvNV (draw_x_sv) + x;
2687 draw_y = SvNV (draw_y_sv) + y;
2688
2689 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2690 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2691 XSRETURN_EMPTY;
2692
2693 sv_setnv (draw_x_sv, draw_x);
2694 sv_setnv (draw_y_sv, draw_y);
2695
2696 glPushMatrix ();
2697 glTranslated (x, y, 0);
2698
2699 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2700 {
2701 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702
2703 if (svp && SvTRUE (*svp))
2704 {
2705 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2706 glEnable (GL_BLEND);
2707 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708 glBegin (GL_QUADS);
2709 glVertex2f (0, 0);
2710 glVertex2f (w, 0);
2711 glVertex2f (w, h);
2712 glVertex2f (0, h);
2713 glEnd ();
2714 glDisable (GL_BLEND);
2715 }
2716 }
2717#if 0
2718 if ($ENV{CFPLUS_DEBUG} & 1) {
2719 glPushMatrix;
2720 glColor 1, 1, 0, 1;
2721 glTranslate 0.375, 0.375;
2722 glBegin GL_LINE_LOOP;
2723 glVertex 0 , 0;
2724 glVertex $self->{w} - 1, 0;
2725 glVertex $self->{w} - 1, $self->{h} - 1;
2726 glVertex 0 , $self->{h} - 1;
2727 glEnd;
2728 glPopMatrix;
2729 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730 }
2731#endif
2732 PUSHMARK (SP);
2733 XPUSHs (self);
2734 PUTBACK;
2735 call_method ("_draw", G_VOID | G_DISCARD);
2736 SPAGAIN;
2737
2738 glPopMatrix ();
2739
2740 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2741 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2742}
2743

Diff Legend

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