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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.211 by root, Sat Jul 28 00:45:28 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" 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 53
47#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
48 55
49#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
51 58
52#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;
53 68
54static struct 69static struct
55{ 70{
56#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 72#include "glfunc.h"
58#undef GL_FUNC 73#undef GL_FUNC
59} gl; 74} gl;
60 75
76static void
61static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
62{ 78{
63 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
64 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
65 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 83 else
68 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
69} 85}
70 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
71typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
73 119
74typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
121
122static int
123shape_attr_p (PangoLayoutRun *run)
124{
125 GSList *attrs = run->item->analysis.extra_attrs;
126
127 while (attrs)
128 {
129 PangoAttribute *attr = attrs->data;
130
131 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1;
133
134 attrs = attrs->next;
135 }
136
137 return 0;
138}
75 139
76typedef struct cf_layout { 140typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
80 int base_height; 143 int base_height;
81 CFClient__Font font; 144 CFPlus__Font font;
82} *CFClient__Layout; 145} *CFPlus__Layout;
83 146
84static CFClient__Font default_font; 147static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
87 150
88static void 151static void
89substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
90{ 153{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 155#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 157#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 159}
101 160
102static void 161static void
103layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
104{ 163{
105 /* 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
106 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
107 */ 166 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
112 171
113 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
114} 173}
115 174
116static void 175static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
120 182
121 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 185
124 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
125} 187 if (!rect.height) rect.height = 1;
126 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
127typedef uint16_t mapface; 194typedef uint16_t faceid;
128 195
129typedef struct { 196typedef struct {
130 GLint name; 197 int name;
131 int w, h; 198 int w, h;
132 float s, t; 199 float s, t;
133 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
134} maptex; 203} maptex;
135 204
136typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
137 int16_t darkness; 208 uint16_t darkness;
138 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
139} mapcell; 210} mapcell;
140 211
141typedef struct { 212typedef struct {
142 int32_t c0, c1; 213 int32_t c0, c1;
143 mapcell *col; 214 mapcell *col;
144} maprow; 215} maprow;
145 216
146typedef struct map { 217typedef struct map {
147 int x, y, w, h; 218 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 220 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 221 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 222
155 int32_t rows; 223 int32_t rows;
156 maprow *row; 224 maprow *row;
157} *CFClient__Map; 225} *CFPlus__Map;
158 226
159static char * 227static char *
160prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
161{ 229{
162 char *p; 230 char *p;
179} 247}
180 248
181#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))
182#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))
183 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
184static maprow * 272static maprow *
185map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
186{ 274{
187 if (0 > y) 275 if (0 > y)
188 { 276 {
189 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
228 316
229 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
230} 318}
231 319
232static mapcell * 320static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
234{ 322{
235 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
236} 324}
237 325
238static void 326static void
239map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
240{ 328{
241 int r; 329 int r;
242 330
243 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
252 self->row = 0; 340 self->row = 0;
253 self->rows = 0; 341 self->rows = 0;
254} 342}
255 343
256static void 344static void
257map_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)
258{ 346{
259 int x, y; 347 int x, y;
260 maprow *row; 348 maprow *row;
349 mapcell *cell;
261 350
262 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 352 if (y >= 0)
264 { 353 {
265 if (y >= self->rows) 354 if (y >= self->rows)
271 if (x >= row->c0) 360 if (x >= row->c0)
272 { 361 {
273 if (x >= row->c1) 362 if (x >= row->c1)
274 break; 363 break;
275 364
276 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;
277 } 371 }
278 } 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);
279} 389}
280 390
281static void 391static void
282music_finished (void) 392music_finished (void)
283{ 393{
319 n |= n >> 16; 429 n |= n >> 16;
320 430
321 return n + 1; 431 return n + 1;
322} 432}
323 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
324MODULE = CFClient PACKAGE = CFClient 481MODULE = CFPlus PACKAGE = CFPlus
325 482
326PROTOTYPES: ENABLE 483PROTOTYPES: ENABLE
327 484
328BOOT: 485BOOT:
329{ 486{
330 HV *stash = gv_stashpv ("CFClient", 1); 487 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 488 static const struct {
332 const char *name; 489 const char *name;
333 IV iv; 490 IV iv;
334 } *civ, const_iv[] = { 491 } *civ, const_iv[] = {
335# 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
336 const_iv (SDL_ACTIVEEVENT), 496 const_iv (SDL_ACTIVEEVENT),
337 const_iv (SDL_KEYDOWN), 497 const_iv (SDL_KEYDOWN),
338 const_iv (SDL_KEYUP), 498 const_iv (SDL_KEYUP),
339 const_iv (SDL_MOUSEMOTION), 499 const_iv (SDL_MOUSEMOTION),
340 const_iv (SDL_MOUSEBUTTONDOWN), 500 const_iv (SDL_MOUSEBUTTONDOWN),
349 const_iv (SDL_EVENT_RESERVEDA), 509 const_iv (SDL_EVENT_RESERVEDA),
350 const_iv (SDL_EVENT_RESERVEDB), 510 const_iv (SDL_EVENT_RESERVEDB),
351 const_iv (SDL_VIDEORESIZE), 511 const_iv (SDL_VIDEORESIZE),
352 const_iv (SDL_VIDEOEXPOSE), 512 const_iv (SDL_VIDEOEXPOSE),
353 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
354 const_iv (SDLK_KP0), 519 const_iv (SDLK_KP0),
355 const_iv (SDLK_KP1), 520 const_iv (SDLK_KP1),
356 const_iv (SDLK_KP2), 521 const_iv (SDLK_KP2),
357 const_iv (SDLK_KP3), 522 const_iv (SDLK_KP3),
358 const_iv (SDLK_KP4), 523 const_iv (SDLK_KP4),
413 const_iv (SDLK_BREAK), 578 const_iv (SDLK_BREAK),
414 const_iv (SDLK_MENU), 579 const_iv (SDLK_MENU),
415 const_iv (SDLK_POWER), 580 const_iv (SDLK_POWER),
416 const_iv (SDLK_EURO), 581 const_iv (SDLK_EURO),
417 const_iv (SDLK_UNDO), 582 const_iv (SDLK_UNDO),
583
418 const_iv (KMOD_NONE), 584 const_iv (KMOD_NONE),
585 const_iv (KMOD_SHIFT),
419 const_iv (KMOD_LSHIFT), 586 const_iv (KMOD_LSHIFT),
420 const_iv (KMOD_RSHIFT), 587 const_iv (KMOD_RSHIFT),
588 const_iv (KMOD_CTRL),
421 const_iv (KMOD_LCTRL), 589 const_iv (KMOD_LCTRL),
422 const_iv (KMOD_RCTRL), 590 const_iv (KMOD_RCTRL),
591 const_iv (KMOD_ALT),
423 const_iv (KMOD_LALT), 592 const_iv (KMOD_LALT),
424 const_iv (KMOD_RALT), 593 const_iv (KMOD_RALT),
594 const_iv (KMOD_META),
425 const_iv (KMOD_LMETA), 595 const_iv (KMOD_LMETA),
426 const_iv (KMOD_RMETA), 596 const_iv (KMOD_RMETA),
427 const_iv (KMOD_NUM), 597 const_iv (KMOD_NUM),
428 const_iv (KMOD_CAPS), 598 const_iv (KMOD_CAPS),
429 const_iv (KMOD_MODE), 599 const_iv (KMOD_MODE),
430 const_iv (KMOD_CTRL),
431 const_iv (KMOD_SHIFT),
432 const_iv (KMOD_ALT),
433 const_iv (KMOD_META)
434# undef const_iv 600# undef const_iv
435 }; 601 };
436 602
437 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; )
438 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);
439} 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
622
623NV floor (NV x)
624
625NV ceil (NV x)
440 626
441void 627void
442pango_init () 628pango_init ()
443 CODE: 629 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 630{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 631 opengl_fontmap = pango_opengl_font_map_new ();
448 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);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 633 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 634}
635
636char *
637SDL_GetError ()
467 638
468int 639int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 640SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 641
471void 642void
472SDL_Quit () 643SDL_Quit ()
473 644
474void 645void
475SDL_ListModes () 646SDL_ListModes (int rgb, int alpha)
476 PPCODE: 647 PPCODE:
477{ 648{
478 SDL_Rect **m; 649 SDL_Rect **m;
479 650
480 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 651 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 652 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 653 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 654 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
484 655
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 656 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 657 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
487 658
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 660 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 662 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 663
493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 664 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
494 665#if SDL_VERSION_ATLEAST(1,2,10)
495 SDL_EnableUNICODE (1); 666 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 667 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
668#endif
497 669
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 670 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
499 671
500 if (m && m != (SDL_Rect **)-1) 672 if (m && m != (SDL_Rect **)-1)
501 while (*m) 673 while (*m)
502 { 674 {
675 if ((*m)->w >= 640 && (*m)->h >= 480)
676 {
503 AV *av = newAV (); 677 AV *av = newAV ();
504 av_push (av, newSViv ((*m)->w)); 678 av_push (av, newSViv ((*m)->w));
505 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));
506 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 682 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
683 }
507 684
508 ++m; 685 ++m;
509 } 686 }
510} 687}
511 688
512char *
513SDL_GetError ()
514
515int 689int
516SDL_SetVideoMode (int w, int h, int fullscreen) 690SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
517 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
518 RETVAL = !!SDL_SetVideoMode ( 701 RETVAL = !!SDL_SetVideoMode (
519 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 702 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
520 ); 703 );
704
521 if (RETVAL) 705 if (RETVAL)
522 { 706 {
707 av_clear (texture_av);
708
523 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 709 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
524# 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);
525# include "glfunc.h" 711#include "glfunc.h"
526# undef GL_FUNC 712#undef GL_FUNC
527 } 713 }
714}
528 OUTPUT: 715 OUTPUT:
529 RETVAL 716 RETVAL
530 717
531void 718void
532SDL_GL_SwapBuffers () 719SDL_GL_SwapBuffers ()
533 720
534char * 721char *
535SDL_GetKeyName (int sym) 722SDL_GetKeyName (int sym)
536 723
724int
725SDL_GetAppState ()
726
537void 727void
538SDL_PollEvent () 728poll_events ()
539 PPCODE: 729 PPCODE:
540{ 730{
541 SDL_Event ev; 731 SDL_Event ev;
542 732
543 while (SDL_PollEvent (&ev)) 733 SDL_PumpEvents ();
734 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
544 { 735 {
545 HV *hv = newHV (); 736 HV *hv = newHV ();
546 hv_store (hv, "type", 4, newSViv (ev.type), 0); 737 hv_store (hv, "type", 4, newSViv (ev.type), 0);
547 738
548 switch (ev.type) 739 switch (ev.type)
550 case SDL_KEYDOWN: 741 case SDL_KEYDOWN:
551 case SDL_KEYUP: 742 case SDL_KEYUP:
552 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 743 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
553 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 744 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
554 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 */
555 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 747 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
556 break; 748 break;
557 749
558 case SDL_ACTIVEEVENT: 750 case SDL_ACTIVEEVENT:
559 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 751 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
560 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 752 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
561 break; 753 break;
562 754
563 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
564 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 774 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
565
566 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 775 hv_store (hv, "state", 5, newSViv (state), 0);
567 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 776 hv_store (hv, "x", 1, newSViv (x), 0);
568 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 777 hv_store (hv, "y", 1, newSViv (y), 0);
569 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 778 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
570 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 779 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780 }
571 break; 781 break;
572 782
573 case SDL_MOUSEBUTTONDOWN: 783 case SDL_MOUSEBUTTONDOWN:
574 case SDL_MOUSEBUTTONUP: 784 case SDL_MOUSEBUTTONUP:
575 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 785 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 795 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 796 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 797 break;
588 } 798 }
589 799
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 800 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 801 }
592} 802}
593 803
594int 804int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 805Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
596 POSTCALL: 806 POSTCALL:
597 Mix_HookMusicFinished (music_finished); 807 Mix_HookMusicFinished (music_finished);
598 Mix_ChannelFinished (channel_finished); 808 Mix_ChannelFinished (channel_finished);
599 809
600void 810void
604Mix_AllocateChannels (int numchans = -1) 814Mix_AllocateChannels (int numchans = -1)
605 815
606void 816void
607lowdelay (int fd, int val = 1) 817lowdelay (int fd, int val = 1)
608 CODE: 818 CODE:
819 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
820
821void
822win32_proxy_info ()
823 PPCODE:
824{
609#ifndef _WIN32 825#ifdef _WIN32
610 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 }
611#endif 847#endif
848}
612 849
613void 850void
614add_font (char *file) 851add_font (char *file)
615 CODE: 852 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 853 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 854
622void 855void
623load_image_inline (SV *image_) 856load_image_inline (SV *image_)
624 ALIAS: 857 ALIAS:
625 load_image_file = 1 858 load_image_file = 1
667 900
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 901 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 902
670 assert (surface2->pitch == surface2->w * 4); 903 assert (surface2->pitch == surface2->w * 4);
671 904
905 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 906 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 907 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 908 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 909 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 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)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 911 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 912 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
913 SDL_UnlockSurface (surface2);
681 914
682 SDL_FreeSurface (surface); 915 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 916 SDL_FreeSurface (surface2);
684} 917}
685 918
724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 957 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725#endif 958#endif
726 _exit (1); 959 _exit (1);
727 960
728void 961void
729_exit (int retval) 962_exit (int retval = 0)
730 CODE: 963 CODE:
964#ifdef WIN32
965 ExitThread (retval); // unclean, please beam me up
966#else
731 _exit (retval); 967 _exit (retval);
968#endif
732 969
970void
971debug ()
972 CODE:
973{
974#if DEBUG
975 VALGRIND_DO_LEAK_CHECK;
976#endif
977}
978
733MODULE = CFClient PACKAGE = CFClient::Font 979MODULE = CFPlus PACKAGE = CFPlus::Font
734 980
735CFClient::Font 981PROTOTYPES: DISABLE
982
983CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 984new_from_file (SV *class, char *path, int id = 0)
737 CODE: 985 CODE:
738{ 986{
739 int count; 987 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 988 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 991}
744 OUTPUT: 992 OUTPUT:
745 RETVAL 993 RETVAL
746 994
747void 995void
748DESTROY (CFClient::Font self) 996DESTROY (CFPlus::Font self)
749 CODE: 997 CODE:
750 pango_font_description_free (self); 998 pango_font_description_free (self);
751 999
752void 1000void
753make_default (CFClient::Font self) 1001make_default (CFPlus::Font self)
1002 PROTOTYPE: $
754 CODE: 1003 CODE:
755 default_font = self; 1004 default_font = self;
756 1005
757MODULE = CFClient PACKAGE = CFClient::Layout 1006MODULE = CFPlus PACKAGE = CFPlus::Layout
758 1007
759CFClient::Layout 1008PROTOTYPES: DISABLE
760new (SV *class, int rgba = 0) 1009
1010void
1011reset_glyph_cache ()
1012 PROTOTYPE:
1013 CODE:
1014 tc_clear ();
1015
1016CFPlus::Layout
1017new (SV *class)
761 CODE: 1018 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 1019 New (0, RETVAL, 1, struct cf_layout);
763 1020
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1021 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 1022 RETVAL->r = 1.;
767 RETVAL->g = 1.; 1023 RETVAL->g = 1.;
768 RETVAL->b = 1.; 1024 RETVAL->b = 1.;
769 RETVAL->a = 1.; 1025 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 1026 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 1030 layout_update_font (RETVAL);
775 OUTPUT: 1031 OUTPUT:
776 RETVAL 1032 RETVAL
777 1033
778void 1034void
779DESTROY (CFClient::Layout self) 1035DESTROY (CFPlus::Layout self)
780 CODE: 1036 CODE:
781 g_object_unref (self->pl); 1037 g_object_unref (self->pl);
782 Safefree (self); 1038 Safefree (self);
783 1039
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 1040void
792set_text (CFClient::Layout self, SV *text_) 1041set_text (CFPlus::Layout self, SV *text_)
793 CODE: 1042 CODE:
794{ 1043{
795 STRLEN textlen; 1044 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 1045 char *text = SvPVutf8 (text_, textlen);
797 1046
798 pango_layout_set_text (self->pl, text, textlen); 1047 pango_layout_set_text (self->pl, text, textlen);
799} 1048}
800 1049
801void 1050void
802set_markup (CFClient::Layout self, SV *text_) 1051set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 1052 CODE:
804{ 1053{
805 STRLEN textlen; 1054 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 1055 char *text = SvPVutf8 (text_, textlen);
807 1056
808 pango_layout_set_markup (self->pl, text, textlen); 1057 pango_layout_set_markup (self->pl, text, textlen);
809} 1058}
810 1059
1060void
1061set_shapes (CFPlus::Layout self, ...)
1062 CODE:
1063{
1064 PangoAttrList *attrs = 0;
1065 const char *text = pango_layout_get_text (self->pl);
1066 const char *pos = text;
1067 int arg = 4;
1068
1069 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1070 {
1071 PangoRectangle inkrect, rect;
1072 PangoAttribute *attr;
1073
1074 int x = SvIV (ST (arg - 3));
1075 int y = SvIV (ST (arg - 2));
1076 int w = SvIV (ST (arg - 1));
1077 int h = SvIV (ST (arg ));
1078
1079 inkrect.x = 0;
1080 inkrect.y = 0;
1081 inkrect.width = 0;
1082 inkrect.height = 0;
1083
1084 rect.x = x * PANGO_SCALE;
1085 rect.y = y * PANGO_SCALE;
1086 rect.width = w * PANGO_SCALE;
1087 rect.height = h * PANGO_SCALE;
1088
1089 if (!attrs)
1090 attrs = pango_layout_get_attributes (self->pl);
1091
1092 attr = pango_attr_shape_new (&inkrect, &rect);
1093 attr->start_index = pos - text;
1094 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1095 pango_attr_list_insert (attrs, attr);
1096
1097 arg += 4;
1098 pos += sizeof (OBJ_STR) - 1;
1099 }
1100
1101 if (attrs)
1102 pango_layout_set_attributes (self->pl, attrs);
1103}
1104
1105void
1106get_shapes (CFPlus::Layout self)
1107 PPCODE:
1108{
1109 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110
1111 do
1112 {
1113 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1114
1115 if (run && shape_attr_p (run))
1116 {
1117 PangoRectangle extents;
1118 pango_layout_iter_get_run_extents (iter, 0, &extents);
1119
1120 EXTEND (SP, 2);
1121 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1122 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1123 }
1124 }
1125 while (pango_layout_iter_next_run (iter));
1126
1127 pango_layout_iter_free (iter);
1128}
1129
1130int
1131has_wrapped (CFPlus::Layout self)
1132 CODE:
1133{
1134 int lines = 1;
1135 const char *text = pango_layout_get_text (self->pl);
1136
1137 while (*text)
1138 lines += *text++ == '\n';
1139
1140 RETVAL = lines < pango_layout_get_line_count (self->pl);
1141}
1142 OUTPUT:
1143 RETVAL
1144
811SV * 1145SV *
812get_text (CFClient::Layout self) 1146get_text (CFPlus::Layout self)
813 CODE: 1147 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1148 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 1149 sv_utf8_decode (RETVAL);
816 OUTPUT: 1150 OUTPUT:
817 RETVAL 1151 RETVAL
818 1152
819void 1153void
820set_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.)
821 CODE: 1155 CODE:
822 self->r = r; 1156 self->r = r;
823 self->g = g; 1157 self->g = g;
824 self->b = b; 1158 self->b = b;
825 self->a = a; 1159 self->a = a;
826 1160
827void 1161void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 1162set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 1163 CODE:
830 if (self->font != font) 1164 if (self->font != font)
831 { 1165 {
832 self->font = font; 1166 self->font = font;
833 layout_update_font (self); 1167 layout_update_font (self);
834 } 1168 }
835 1169
836void 1170void
837set_height (CFClient::Layout self, int base_height) 1171set_height (CFPlus::Layout self, int base_height)
838 CODE: 1172 CODE:
839 if (self->base_height != base_height) 1173 if (self->base_height != base_height)
840 { 1174 {
841 self->base_height = base_height; 1175 self->base_height = base_height;
842 layout_update_font (self); 1176 layout_update_font (self);
843 } 1177 }
844 1178
845void 1179void
846set_width (CFClient::Layout self, int max_width = -1) 1180set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 1181 CODE:
848 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);
849 1183
850void 1184void
851set_indent (CFClient::Layout self, int indent) 1185set_indent (CFPlus::Layout self, int indent)
852 CODE: 1186 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1187 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 1188
855void 1189void
856set_spacing (CFClient::Layout self, int spacing) 1190set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 1191 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1192 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 1193
860void 1194void
861set_ellipsise (CFClient::Layout self, int ellipsise) 1195set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 1196 CODE:
863 pango_layout_set_ellipsize (self->pl, 1197 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1198 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1199 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1200 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 1201 : PANGO_ELLIPSIZE_NONE
868 ); 1202 );
869 1203
870void 1204void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 1205set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 1206 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1207 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 1208
875void 1209void
876size (CFClient::Layout self) 1210size (CFPlus::Layout self)
877 PPCODE: 1211 PPCODE:
878{ 1212{
879 int w, h; 1213 int w, h;
880 1214
881 layout_get_pixel_size (self, &w, &h); 1215 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 1218 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 1219 PUSHs (sv_2mortal (newSViv (h)));
886} 1220}
887 1221
888int 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
889xy_to_index (CFClient::Layout self, int x, int y) 1235xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1236 CODE:
891{ 1237{
892 int index, trailing; 1238 int index, trailing;
893 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);
894 RETVAL = index; 1240 RETVAL = index + trailing;
895} 1241}
896 OUTPUT: 1242 OUTPUT:
897 RETVAL 1243 RETVAL
898 1244
899void 1245void
900cursor_pos (CFClient::Layout self, int index) 1246cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1247 PPCODE:
902{ 1248{
903 PangoRectangle strong_pos; 1249 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1250 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1251
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1254 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1255 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1256}
911 1257
912void 1258void
913render (CFClient::Layout self) 1259index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
914 PPCODE: 1260 PPCODE:
915{ 1261{
916 SV *retval; 1262 int line, x;
917 int w, h;
918 1263
919 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 */
920 1266
921 if (self->rgba)
922 {
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5); 1267 EXTEND (SP, 2);
969 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)
970 PUSHs (sv_2mortal (newSViv (h))); 1289 PUSHs (sv_2mortal (newSViv (index + trailing)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 }
975 else 1290 else
976 { 1291 {
977 FT_Bitmap bitmap;
978
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w))); 1292 PUSHs (sv_2mortal (newSViv (index)));
996 PUSHs (sv_2mortal (newSViv (h))); 1293 PUSHs (sv_2mortal (newSViv (trailing)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 } 1294 }
1001} 1295}
1002 1296
1003MODULE = CFClient PACKAGE = CFClient::Texture
1004
1005void 1297void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1298render (CFPlus::Layout self, float x, float y, int flags = 0)
1007 CODE: 1299 PPCODE:
1008{ 1300 pango_opengl_render_layout_subpixel (
1009 int ow = SvIV (w_); 1301 self->pl,
1010 int oh = SvIV (h_); 1302 x * PANGO_SCALE, y * PANGO_SCALE,
1303 self->r, self->g, self->b, self->a,
1304 flags
1305 );
1011 1306
1012 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_))
1013 { 1318 {
1014 int nw = minpot (ow);
1015 int nh = minpot (oh);
1016
1017 if (nw != ow || nh != oh)
1018 {
1019 if (SvOK (data_))
1020 {
1021 STRLEN datalen; 1319 STRLEN datalen;
1022 char *data = SvPVbyte (data_, datalen); 1320 char *data = SvPVbyte (data_, datalen);
1023 int bpp = datalen / (ow * oh); 1321 int bpp = datalen / (ow * oh);
1024 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1322 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1025 1323
1026 SvPOK_only (result_); 1324 SvPOK_only (result_);
1027 SvCUR_set (result_, nw * nh * bpp); 1325 SvCUR_set (result_, nw * nh * bpp);
1028 1326
1029 memset (SvPVX (result_), 0, nw * nh * bpp); 1327 memset (SvPVX (result_), 0, nw * nh * bpp);
1030 while (oh--) 1328 while (oh--)
1031 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);
1032 1330
1033 sv_setsv (data_, result_); 1331 sv_setsv (data_, result_);
1034 }
1035
1036 sv_setiv (w_, nw);
1037 sv_setiv (h_, nh);
1038 }
1039 } 1332 }
1040} 1333}
1041 1334
1042void 1335void
1043draw_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.)
1044 PROTOTYPE: $$$;$$ 1337 PROTOTYPE: $$$;$$
1045 ALIAS: 1338 ALIAS:
1046 draw_quad_alpha = 1 1339 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1340 draw_quad_alpha_premultiplied = 2
1048 CODE: 1341 CODE:
1086 glDisable (GL_ALPHA_TEST); 1379 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1380 glDisable (GL_BLEND);
1088 } 1381 }
1089} 1382}
1090 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
1091MODULE = CFClient PACKAGE = CFClient::Map 1395MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1396
1093CFClient::Map 1397PROTOTYPES: DISABLE
1094new (SV *class, int map_width, int map_height) 1398
1399CFPlus::Map
1400new (SV *class)
1095 CODE: 1401 CODE:
1096 New (0, RETVAL, 1, struct map); 1402 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1403 RETVAL->x = 0;
1098 RETVAL->y = 0; 1404 RETVAL->y = 0;
1099 RETVAL->w = map_width; 1405 RETVAL->w = 0;
1100 RETVAL->h = map_height; 1406 RETVAL->h = 0;
1101 RETVAL->ox = 0; 1407 RETVAL->ox = 0;
1102 RETVAL->oy = 0; 1408 RETVAL->oy = 0;
1103 RETVAL->faces = 8192; 1409 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1104 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1410 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1105 RETVAL->texs = 8192;
1106 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1107 RETVAL->rows = 0; 1411 RETVAL->rows = 0;
1108 RETVAL->row = 0; 1412 RETVAL->row = 0;
1109 OUTPUT: 1413 OUTPUT:
1110 RETVAL 1414 RETVAL
1111 1415
1112void 1416void
1113DESTROY (CFClient::Map self) 1417DESTROY (CFPlus::Map self)
1114 CODE: 1418 CODE:
1115{ 1419{
1116 map_clear (self); 1420 map_clear (self);
1117 Safefree (self->face); 1421 Safefree (self->face2tile);
1118 Safefree (self->tex); 1422 Safefree (self->tex);
1119 Safefree (self); 1423 Safefree (self);
1120} 1424}
1121 1425
1122void 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
1123clear (CFClient::Map self) 1433clear (CFPlus::Map self)
1124 CODE: 1434 CODE:
1125 map_clear (self); 1435 map_clear (self);
1126 1436
1127void 1437void
1128set_face (CFClient::Map self, int face, int texid) 1438set_tileid (CFPlus::Map self, int face, int tile)
1129 CODE: 1439 CODE:
1130{ 1440{
1131 while (self->faces <= face) 1441 need_facenum (self, face); self->face2tile [face] = tile;
1132 { 1442 need_texid (self, tile);
1133 Append (mapface, self->face, self->faces, self->faces);
1134 self->faces *= 2;
1135 }
1136
1137 self->face [face] = texid;
1138} 1443}
1139 1444
1140void 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
1141set_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)
1142 CODE: 1470 CODE:
1143{ 1471{
1144 while (self->texs <= texid) 1472 need_texid (self, texid);
1145 {
1146 Append (maptex, self->tex, self->texs, self->texs);
1147 self->texs *= 2;
1148 }
1149 1473
1150 { 1474 {
1151 maptex *tex = self->tex + texid; 1475 maptex *tex = self->tex + texid;
1152 1476
1153 tex->name = name; 1477 tex->name = name;
1170 // from transparent color bleeding and ugly wrapping effects. 1494 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1495 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1496}
1173 1497
1174int 1498int
1175ox (CFClient::Map self) 1499ox (CFPlus::Map self)
1176 ALIAS: 1500 ALIAS:
1177 oy = 1 1501 oy = 1
1178 x = 2 1502 x = 2
1179 y = 3 1503 y = 3
1180 w = 4 1504 w = 4
1191 } 1515 }
1192 OUTPUT: 1516 OUTPUT:
1193 RETVAL 1517 RETVAL
1194 1518
1195void 1519void
1196scroll (CFClient::Map self, int dx, int dy) 1520scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1521 CODE:
1198{ 1522{
1199 if (dx > 0) 1523 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1524 map_blank (self, self->x, self->y, dx, self->h);
1201 else if (dx < 0) 1525 else if (dx < 0)
1202 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);
1203 1527
1204 if (dy > 0) 1528 if (dy > 0)
1205 map_blank (self, self->x, self->y, self->w, dy - 1); 1529 map_blank (self, self->x, self->y, self->w, dy);
1206 else if (dy < 0) 1530 else if (dy < 0)
1207 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);
1208 1532
1209 self->ox += dx; self->x += dx; 1533 self->ox += dx; self->x += dx;
1210 self->oy += dy; self->y += dy; 1534 self->oy += dy; self->y += dy;
1211 1535
1212 while (self->y < 0) 1536 while (self->y < 0)
1217 self->y += MAP_EXTEND_Y; 1541 self->y += MAP_EXTEND_Y;
1218 } 1542 }
1219} 1543}
1220 1544
1221void 1545void
1222map1a_update (CFClient::Map self, SV *data_) 1546map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1547 CODE:
1224{ 1548{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1549 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1550 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1551 mapcell *cell;
1228 int x, y, flags; 1552 int x, y, flags;
1229 1553
1230 while (data < data_end) 1554 while (data < data_end - 1)
1231 { 1555 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1556 flags = (data [0] << 8) + data [1]; data += 2;
1233 1557
1234 x = ((flags >> 10) & 63) + self->x; 1558 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1559 y = self->y + ((flags >> 4) & 63);
1236 1560
1237 cell = map_get_cell (self, x, y); 1561 cell = map_get_cell (self, x, y);
1238 1562
1239 if (flags & 15) 1563 if (flags & 15)
1240 { 1564 {
1241 if (cell->darkness < 0) 1565 if (!cell->darkness)
1242 { 1566 {
1567 memset (cell, 0, sizeof (*cell));
1243 cell->darkness = 0; 1568 cell->darkness = 256;
1244 cell->face [0] = 0;
1245 cell->face [1] = 0;
1246 cell->face [2] = 0;
1247 } 1569 }
1248 1570
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //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 }
1252 1612
1253 if (flags & 4) 1613 if (flags & 4)
1254 { 1614 {
1255 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];
1256 } 1618 }
1257 1619
1258 if (flags & 2) 1620 if (flags & 2)
1259 { 1621 {
1260 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];
1261 } 1625 }
1262 1626
1263 if (flags & 1) 1627 if (flags & 1)
1264 { 1628 {
1265 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];
1266 } 1632 }
1267 } 1633 }
1268 else 1634 else
1269 cell->darkness = -1; 1635 cell->darkness = 0;
1270 } 1636 }
1271} 1637}
1272 1638
1273SV * 1639SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1640mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1641 CODE:
1276{ 1642{
1277 int x1, x; 1643 int x1, x;
1278 int y1, y; 1644 int y1, y;
1279 int z; 1645 int z;
1300 { 1666 {
1301 mapcell *cell = row->col + (x - row->c0); 1667 mapcell *cell = row->col + (x - row->c0);
1302 1668
1303 for (z = 0; z <= 0; z++) 1669 for (z = 0; z <= 0; z++)
1304 { 1670 {
1305 mapface face = cell->face [z];
1306
1307 if (face)
1308 {
1309 maptex tex = self->tex [face]; 1671 maptex tex = self->tex [cell->tile [z]];
1310 int a0 = 255 - tex.a; 1672 int a0 = 255 - tex.a;
1311 int a1 = tex.a; 1673 int a1 = tex.a;
1312 1674
1313 r = (r * a0 + tex.r * a1) / 255; 1675 r = (r * a0 + tex.r * a1) / 255;
1314 g = (g * a0 + tex.g * a1) / 255; 1676 g = (g * a0 + tex.g * a1) / 255;
1315 b = (b * a0 + tex.b * a1) / 255; 1677 b = (b * a0 + tex.b * a1) / 255;
1316 a = (a * a0 + tex.a * a1) / 255; 1678 a = (a * a0 + tex.a * a1) / 255;
1317 }
1318 } 1679 }
1319 } 1680 }
1320 1681
1321 *map++ = (r ) 1682 *map++ = (r )
1322 | (g << 8) 1683 | (g << 8)
1329} 1690}
1330 OUTPUT: 1691 OUTPUT:
1331 RETVAL 1692 RETVAL
1332 1693
1333void 1694void
1334draw (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)
1335 PPCODE: 1696 CODE:
1336{ 1697{
1337 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;
1338 int x, y, z; 1702 int x, y, z;
1339 int last_name; 1703 int last_name;
1340 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344 1704
1345 memset (darkness, 255, sw4 * sh); 1705 // thats current max. sorry.
1346 SvPOK_only (darkness_sv); 1706 if (sw > 255) sw = 255;
1347 SvCUR_set (darkness_sv, sw4 * sh); 1707 if (sh > 255) sh = 255;
1348 1708
1349 vx = self->x + (self->w - sw) / 2 - shift_x; 1709 // clear key, in case of extra padding
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1710 memset (&skey, 0, sizeof (skey));
1351
1352 /*
1353 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357 int vy = self->vy = self->h >= sh
1358 ? self->y + (self->h - sh) / 2
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */
1361 1711
1362 glColor4ub (255, 255, 255, 255); 1712 glColor4ub (255, 255, 255, 255);
1363 1713
1714 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1715 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1716 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1717 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1718
1369 glBegin (GL_QUADS); 1719 glBegin (GL_QUADS);
1370 1720
1371 last_name = 0; 1721 last_name = 0;
1372 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
1373 for (z = 0; z < 3; z++) 1748 for (z = 0; z <= 2; z++)
1749 {
1750 memset (smooth_level, 0, sizeof (smooth_level));
1751
1374 for (y = 0; y < sh; y++) 1752 for (y = 0; y < sh; y++)
1375 if (0 <= y + vy && y + vy < self->rows) 1753 if (0 <= y + my && y + my < self->rows)
1376 { 1754 {
1377 maprow *row = self->row + (y + vy); 1755 maprow *row = self->row + (y + my);
1378 1756
1379 for (x = 0; x < sw; x++) 1757 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1758 if (row->c0 <= x + mx && x + mx < row->c1)
1381 { 1759 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1760 mapcell *cell = row->col + (x + mx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387
1388 face = cell->face [z]; 1761 tileid tile = cell->tile [z];
1389 1762
1390 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))
1391 { 1858 {
1392 maptex tex = self->tex [face]; 1859 int level = (w << 5) | b;
1860 HE *he;
1393 1861
1394 int px = (x + 1) * 32 - tex.w; 1862 hv_iterinit (smooth);
1395 int py = (y + 1) * 32 - tex.h; 1863 while ((he = hv_iternext (smooth)))
1396
1397 if (last_name != tex.name)
1398 { 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
1399 glEnd (); 1887 glEnd ();
1400 last_name = tex.name;
1401 glBindTexture (GL_TEXTURE_2D, last_name); 1888 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402 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 }
1403 } 1912 }
1404
1405 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409 } 1913 }
1410 }
1411 } 1914 }
1915 }
1916
1917 hv_clear (smooth);
1918 }
1412 1919
1413 glEnd (); 1920 glEnd ();
1414 1921
1415 glDisable (GL_TEXTURE_2D); 1922 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1923 glDisable (GL_BLEND);
1417 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
1957void
1958draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959 CODE:
1960{
1961 static float color[16][3] = {
1962 { 0.00F, 0.00F, 0.00F },
1963 { 1.00F, 1.00F, 1.00F },
1964 { 0.00F, 0.00F, 0.55F },
1965 { 1.00F, 0.00F, 0.00F },
1966
1967 { 1.00F, 0.54F, 0.00F },
1968 { 0.11F, 0.56F, 1.00F },
1969 { 0.93F, 0.46F, 0.00F },
1970 { 0.18F, 0.54F, 0.34F },
1971
1972 { 0.56F, 0.73F, 0.56F },
1973 { 0.80F, 0.80F, 0.80F },
1974 { 0.55F, 0.41F, 0.13F },
1975 { 0.99F, 0.77F, 0.26F },
1976
1977 { 0.74F, 0.65F, 0.41F },
1978
1979 { 0.00F, 1.00F, 1.00F },
1980 { 1.00F, 0.00F, 1.00F },
1981 { 1.00F, 1.00F, 0.00F },
1982 };
1983
1984 int x, y;
1985
1986 glEnable (GL_TEXTURE_2D);
1987 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1988 glEnable (GL_BLEND);
1989 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1990 glBegin (GL_QUADS);
1991
1992 for (y = 0; y < h; y++)
1993 for (x = 0; x < w; x++)
1994 {
1995 unsigned char m = data [x + y * w];
1996
1997 if (m)
1998 {
1999 float *c = color [m & 15];
2000
2001 float tx1 = m & 0x40 ? 0.5 : 0.;
2002 float tx2 = tx1 + 0.5;
2003
2004 glColor4f (c[0], c[1], c[2], 0.75);
2005 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2006 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2007 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2008 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2009 }
2010 }
2011
2012 glEnd ();
2013 glDisable (GL_BLEND);
2014 glDisable (GL_TEXTURE_2D);
2015}
2016
2017void
2018fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
2019 PPCODE:
2020{
2021 int x, y;
2022 int sw1 = sw + 2;
2023 int sh1 = sh + 2;
2024 int sh3 = sh * 3;
2025 int sw34 = (sw * 3 + 3) & ~3;
2026 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2027 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
2028 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2029
2030 SvPOK_only (darkness3_sv);
2031 SvCUR_set (darkness3_sv, sw34 * sh3);
2032
2033 mx += self->x - 1;
2034 my += self->y - 1;
2035
2036 memset (darkness1, 255, sw1 * sh1);
2037
2038 for (y = 0; y < sh1; y++)
2039 if (0 <= y + my && y + my < self->rows)
2040 {
2041 maprow *row = self->row + (y + my);
2042
2043 for (x = 0; x < sw1; x++)
2044 if (row->c0 <= x + mx && x + mx < row->c1)
2045 {
2046 mapcell *cell = row->col + (x + mx - row->c0);
2047
2048 darkness1 [y * sw1 + x] = cell->darkness
2049 ? 255 - (cell->darkness - 1)
2050 : 255 - FOW_DARKNESS;
2051 }
2052 }
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
1418 EXTEND (SP, 3); 2092 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 2093 PUSHs (sv_2mortal (newSViv (sw34)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 2094 PUSHs (sv_2mortal (newSViv (sh3)));
1421 PUSHs (darkness_sv); 2095 PUSHs (darkness3_sv);
1422} 2096}
1423 2097
1424SV * 2098SV *
1425get_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)
1426 CODE: 2100 CODE:
1427{ 2101{
1428 int x, y, x1, y1; 2102 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 2103 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2104 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1455 if (row && row->c0 <= x && x < row->c1) 2129 if (row && row->c0 <= x && x < row->c1)
1456 { 2130 {
1457 mapcell *cell = row->col + (x - row->c0); 2131 mapcell *cell = row->col + (x - row->c0);
1458 uint8_t flags = 0; 2132 uint8_t flags = 0;
1459 2133
1460 if (cell->face [0]) flags |= 1; 2134 if (cell->tile [0]) flags |= 1;
1461 if (cell->face [1]) flags |= 2; 2135 if (cell->tile [1]) flags |= 2;
1462 if (cell->face [2]) flags |= 4; 2136 if (cell->tile [2]) flags |= 4;
1463 2137
1464 *data++ = flags; 2138 *data++ = flags;
1465 2139
1466 if (flags & 1) 2140 if (flags & 1)
1467 { 2141 {
2142 tileid tile = cell->tile [0];
1468 *data++ = cell->face [0] >> 8; 2143 *data++ = tile >> 8;
1469 *data++ = cell->face [0]; 2144 *data++ = tile;
1470 } 2145 }
1471 2146
1472 if (flags & 2) 2147 if (flags & 2)
1473 { 2148 {
2149 tileid tile = cell->tile [1];
1474 *data++ = cell->face [1] >> 8; 2150 *data++ = tile >> 8;
1475 *data++ = cell->face [1]; 2151 *data++ = tile;
1476 } 2152 }
1477 2153
1478 if (flags & 4) 2154 if (flags & 4)
1479 { 2155 {
2156 tileid tile = cell->tile [2];
1480 *data++ = cell->face [2] >> 8; 2157 *data++ = tile >> 8;
1481 *data++ = cell->face [2]; 2158 *data++ = tile;
1482 } 2159 }
1483 } 2160 }
1484 else 2161 else
1485 *data++ = 0; 2162 *data++ = 0;
1486 } 2163 }
1492} 2169}
1493 OUTPUT: 2170 OUTPUT:
1494 RETVAL 2171 RETVAL
1495 2172
1496void 2173void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2174set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 2175 PPCODE:
1499{ 2176{
1500 int x, y, z; 2177 int x, y, z;
1501 int w, h; 2178 int w, h;
1502 int x1, y1; 2179 int x1, y1;
1526 { 2203 {
1527 uint8_t flags = *data++; 2204 uint8_t flags = *data++;
1528 2205
1529 if (flags) 2206 if (flags)
1530 { 2207 {
1531 mapface face[3] = { 0, 0, 0 };
1532
1533 mapcell *cell = row_get_cell (row, x); 2208 mapcell *cell = row_get_cell (row, x);
2209 tileid tile[3] = { 0, 0, 0 };
1534 2210
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2211 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2212 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2213 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1538 2214
1539 if (cell->darkness <= 0) 2215 if (cell->darkness == 0)
1540 { 2216 {
1541 cell->darkness = -1; 2217 cell->darkness = 0;
1542 2218
1543 for (z = 0; z <= 2; z++) 2219 for (z = 0; z <= 2; z++)
1544 { 2220 {
1545 cell->face[z] = face[z]; 2221 tileid t = tile [z];
1546 2222
1547 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2223 if (t >= self->texs || (t && !self->tex [t].name))
2224 {
1548 XPUSHs (sv_2mortal (newSViv (face[z]))); 2225 XPUSHs (sv_2mortal (newSViv (t)));
2226 need_texid (self, t);
2227 }
2228
2229 cell->tile [z] = t;
1549 } 2230 }
1550 } 2231 }
1551 } 2232 }
1552 } 2233 }
1553 } 2234 }
1554} 2235}
1555 2236
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 2237MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 2238
2239PROTOTYPES: DISABLE
2240
1558CFClient::MixChunk 2241CFPlus::MixChunk
2242new (SV *class, SV *data_sv)
2243 CODE:
2244{
2245 STRLEN datalen;
2246 char *data = SvPVbyte (data_sv, datalen);
2247
2248 RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1);
2249}
2250 OUTPUT:
2251 RETVAL
2252
2253CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 2254new_from_file (SV *class, char *path)
1560 CODE: 2255 CODE:
1561 RETVAL = Mix_LoadWAV (path); 2256 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 2257 OUTPUT:
1563 RETVAL 2258 RETVAL
1564 2259
1565void 2260void
1566DESTROY (CFClient::MixChunk self) 2261DESTROY (CFPlus::MixChunk self)
1567 CODE: 2262 CODE:
1568 Mix_FreeChunk (self); 2263 Mix_FreeChunk (self);
1569 2264
1570int 2265int
1571volume (CFClient::MixChunk self, int volume = -1) 2266volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 2267 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 2268 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 2269 OUTPUT:
1575 RETVAL 2270 RETVAL
1576 2271
1577int 2272int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2273play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 2274 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2275 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 2276 OUTPUT:
1582 RETVAL 2277 RETVAL
1583 2278
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 2279MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 2280
1586int 2281int
1587volume (int volume = -1) 2282volume (int volume = -1)
2283 PROTOTYPE: ;$
1588 CODE: 2284 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 2285 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 2286 OUTPUT:
1591 RETVAL 2287 RETVAL
1592 2288
2289int
2290fade_out (int ms)
2291 CODE:
2292 RETVAL = Mix_FadeOutMusic (ms);
2293 OUTPUT:
2294 RETVAL
2295
1593CFClient::MixMusic 2296CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 2297new_from_file (SV *class, char *path)
1595 CODE: 2298 CODE:
1596 RETVAL = Mix_LoadMUS (path); 2299 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 2300 OUTPUT:
1598 RETVAL 2301 RETVAL
1599 2302
1600void 2303void
1601DESTROY (CFClient::MixMusic self) 2304DESTROY (CFPlus::MixMusic self)
1602 CODE: 2305 CODE:
1603 Mix_FreeMusic (self); 2306 Mix_FreeMusic (self);
1604 2307
1605int 2308int
1606play (CFClient::MixMusic self, int loops = -1) 2309play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 2310 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 2311 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 2312 OUTPUT:
1610 RETVAL 2313 RETVAL
1611 2314
2315int
2316fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2317 CODE:
2318 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2319 OUTPUT:
2320 RETVAL
2321
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 2322MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2323
2324PROTOTYPES: ENABLE
1613 2325
1614BOOT: 2326BOOT:
1615{ 2327{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2328 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 2329 static const struct {
1618 const char *name; 2330 const char *name;
1619 IV iv; 2331 IV iv;
1620 } *civ, const_iv[] = { 2332 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 2333# define const_iv(name) { # name, (IV)name }
2334 const_iv (GL_VENDOR),
2335 const_iv (GL_VERSION),
2336 const_iv (GL_EXTENSIONS),
1622 const_iv (GL_COLOR_MATERIAL), 2337 const_iv (GL_COLOR_MATERIAL),
1623 const_iv (GL_SMOOTH), 2338 const_iv (GL_SMOOTH),
1624 const_iv (GL_FLAT), 2339 const_iv (GL_FLAT),
1625 const_iv (GL_DITHER), 2340 const_iv (GL_DITHER),
1626 const_iv (GL_BLEND), 2341 const_iv (GL_BLEND),
1628 const_iv (GL_SCISSOR_TEST), 2343 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 2344 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 2345 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 2346 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 2347 const_iv (GL_RESCALE_NORMAL),
2348 const_iv (GL_FRONT),
2349 const_iv (GL_BACK),
2350 const_iv (GL_AUX0),
1633 const_iv (GL_AND), 2351 const_iv (GL_AND),
1634 const_iv (GL_ONE), 2352 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 2353 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 2354 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 2355 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2356 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 2357 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 2358 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 2359 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 2360 const_iv (GL_RGBA),
2361 const_iv (GL_RGBA4),
2362 const_iv (GL_RGBA8),
2363 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 2364 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 2365 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 2366 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 2367 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 2368 const_iv (GL_INTENSITY),
1648 const_iv (GL_LUMINANCE), 2369 const_iv (GL_LUMINANCE),
1649 const_iv (GL_LUMINANCE_ALPHA), 2370 const_iv (GL_LUMINANCE_ALPHA),
1650 const_iv (GL_FLOAT), 2371 const_iv (GL_FLOAT),
1651 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2372 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1652 const_iv (GL_COMPILE), 2373 const_iv (GL_COMPILE),
2374 const_iv (GL_PROXY_TEXTURE_1D),
2375 const_iv (GL_PROXY_TEXTURE_2D),
1653 const_iv (GL_TEXTURE_1D), 2376 const_iv (GL_TEXTURE_1D),
1654 const_iv (GL_TEXTURE_2D), 2377 const_iv (GL_TEXTURE_2D),
1655 const_iv (GL_TEXTURE_ENV), 2378 const_iv (GL_TEXTURE_ENV),
1656 const_iv (GL_TEXTURE_MAG_FILTER), 2379 const_iv (GL_TEXTURE_MAG_FILTER),
1657 const_iv (GL_TEXTURE_MIN_FILTER), 2380 const_iv (GL_TEXTURE_MIN_FILTER),
1678 const_iv (GL_COLOR_LOGIC_OP), 2401 const_iv (GL_COLOR_LOGIC_OP),
1679 const_iv (GL_SEPARABLE_2D), 2402 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 2403 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 2404 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 2405 const_iv (GL_CONSTANT_BORDER),
2406 const_iv (GL_POINTS),
1683 const_iv (GL_LINES), 2407 const_iv (GL_LINES),
2408 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 2409 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 2410 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 2411 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 2412 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 2413 const_iv (GL_TRIANGLE_STRIP),
1689 const_iv (GL_TRIANGLE_FAN), 2414 const_iv (GL_TRIANGLE_FAN),
2415 const_iv (GL_POLYGON),
1690 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2416 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2417 const_iv (GL_POINT_SMOOTH_HINT),
2418 const_iv (GL_LINE_SMOOTH_HINT),
2419 const_iv (GL_POLYGON_SMOOTH_HINT),
2420 const_iv (GL_GENERATE_MIPMAP_HINT),
1691 const_iv (GL_FASTEST), 2421 const_iv (GL_FASTEST),
2422 const_iv (GL_DONT_CARE),
2423 const_iv (GL_NICEST),
1692 const_iv (GL_V2F), 2424 const_iv (GL_V2F),
1693 const_iv (GL_V3F), 2425 const_iv (GL_V3F),
1694 const_iv (GL_T2F_V3F), 2426 const_iv (GL_T2F_V3F),
1695 const_iv (GL_T2F_N3F_V3F), 2427 const_iv (GL_T2F_N3F_V3F),
1696# undef const_iv 2428# undef const_iv
1697 }; 2429 };
1698 2430
1699 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2431 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1700 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2432 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2433
2434 texture_av = newAV ();
2435 AvREAL_off (texture_av);
1701} 2436}
1702 2437
1703char * 2438char *
1704gl_vendor () 2439gl_vendor ()
1705 CODE: 2440 CODE:
1719 CODE: 2454 CODE:
1720 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2455 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1721 OUTPUT: 2456 OUTPUT:
1722 RETVAL 2457 RETVAL
1723 2458
2459const char *glGetString (GLenum pname)
2460
2461GLint glGetInteger (GLenum pname)
2462 CODE:
2463 glGetIntegerv (pname, &RETVAL);
2464 OUTPUT:
2465 RETVAL
2466
2467GLdouble glGetDouble (GLenum pname)
2468 CODE:
2469 glGetDoublev (pname, &RETVAL);
2470 OUTPUT:
2471 RETVAL
2472
1724int glGetError () 2473int glGetError ()
2474
2475void glFinish ()
1725 2476
1726void glClear (int mask) 2477void glClear (int mask)
1727 2478
1728void glClearColor (float r, float g, float b, float a = 1.0) 2479void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 2480 PROTOTYPE: @
1754 2505
1755void glPopMatrix () 2506void glPopMatrix ()
1756 2507
1757void glLoadIdentity () 2508void glLoadIdentity ()
1758 2509
2510void glDrawBuffer (int buffer)
2511
2512void glReadBuffer (int buffer)
2513
1759# near_ and far_ are due to microsofts buggy "c" compiler 2514# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2515void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761 2516
1762# near_ and far_ are due to microsofts buggy "c" compiler 2517# near_ and far_ are due to microsofts buggy "c" compiler
1763void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2518void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2519
2520PROTOTYPES: DISABLE
1764 2521
1765void glViewport (int x, int y, int width, int height) 2522void glViewport (int x, int y, int width, int height)
1766 2523
1767void glScissor (int x, int y, int width, int height) 2524void glScissor (int x, int y, int width, int height)
1768 2525
1776 2533
1777void glRotate (float angle, float x, float y, float z) 2534void glRotate (float angle, float x, float y, float z)
1778 CODE: 2535 CODE:
1779 glRotatef (angle, x, y, z); 2536 glRotatef (angle, x, y, z);
1780 2537
1781void glBegin (int mode)
1782
1783void glEnd ()
1784
1785void glColor (float r, float g, float b, float a = 1.0) 2538void glColor (float r, float g, float b, float a = 1.0)
1786 PROTOTYPE: @
1787 ALIAS: 2539 ALIAS:
1788 glColor_premultiply = 1 2540 glColor_premultiply = 1
1789 CODE: 2541 CODE:
1790 if (ix) 2542 if (ix)
1791 { 2543 {
1792 r *= a; 2544 r *= a;
1793 g *= a; 2545 g *= a;
1794 b *= a; 2546 b *= a;
1795 } 2547 }
1796 // microsoft visual "c" rounds instead of truncating... 2548 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255), 2549 glColor4f (r, g, b, a);
1798 MIN ((int)(g * 256.f), 255),
1799 MIN ((int)(b * 256.f), 255),
1800 MIN ((int)(a * 256.f), 255));
1801
1802void glInterleavedArrays (int format, int stride, char *data)
1803
1804void glDrawElements (int mode, int count, int type, char *indices)
1805
1806# 1.2 void glDrawRangeElements (int mode, int start, int end
1807 2550
1808void glRasterPos (float x, float y, float z = 0.) 2551void glRasterPos (float x, float y, float z = 0.)
1809 CODE: 2552 CODE:
1810 glRasterPos3f (0, 0, z); 2553 glRasterPos3f (0, 0, z);
1811 glBitmap (0, 0, 0, 0, x, y, 0); 2554 glBitmap (0, 0, 0, 0, x, y, 0);
1816 2559
1817void glTexCoord (float s, float t) 2560void glTexCoord (float s, float t)
1818 CODE: 2561 CODE:
1819 glTexCoord2f (s, t); 2562 glTexCoord2f (s, t);
1820 2563
2564void glRect (float x1, float y1, float x2, float y2)
2565 CODE:
2566 glRectf (x1, y1, x2, y2);
2567
2568PROTOTYPES: ENABLE
2569
2570void glBegin (int mode)
2571
2572void glEnd ()
2573
2574void glPointSize (GLfloat size)
2575
2576void glLineWidth (GLfloat width)
2577
2578void glInterleavedArrays (int format, int stride, char *data)
2579
2580void glDrawElements (int mode, int count, int type, char *indices)
2581
2582# 1.2 void glDrawRangeElements (int mode, int start, int end
2583
1821void glTexEnv (int target, int pname, float param) 2584void glTexEnv (int target, int pname, float param)
1822 CODE: 2585 CODE:
1823 glTexEnvf (target, pname, param); 2586 glTexEnvf (target, pname, param);
1824 2587
1825void glTexParameter (int target, int pname, float param) 2588void glTexParameter (int target, int pname, float param)
1847 2610
1848void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2611void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1849 2612
1850void glDrawPixels (int width, int height, int format, int type, char *pixels) 2613void glDrawPixels (int width, int height, int format, int type, char *pixels)
1851 2614
2615void glPixelZoom (float x, float y)
2616
1852void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2617void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1853 2618
1854int glGenTexture () 2619int glGenTexture ()
1855 CODE: 2620 CODE:
1856{ 2621 RETVAL = gen_texture ();
1857 GLuint name;
1858 glGenTextures (1, &name);
1859 RETVAL = name;
1860}
1861 OUTPUT: 2622 OUTPUT:
1862 RETVAL 2623 RETVAL
1863 2624
1864void glDeleteTexture (int name) 2625void glDeleteTexture (int name)
1865 CODE: 2626 CODE:
1866{
1867 GLuint name_ = name;
1868 glDeleteTextures (1, &name_); 2627 del_texture (name);
1869} 2628
1870
1871int glGenList () 2629int glGenList ()
1872 CODE: 2630 CODE:
1873 RETVAL = glGenLists (1); 2631 RETVAL = glGenLists (1);
1874 OUTPUT: 2632 OUTPUT:
1875 RETVAL 2633 RETVAL
1882 2640
1883void glEndList () 2641void glEndList ()
1884 2642
1885void glCallList (int list) 2643void glCallList (int list)
1886 2644
2645MODULE = CFPlus PACKAGE = CFPlus::UI::Base
1887 2646
2647PROTOTYPES: DISABLE
2648
2649void
2650find_widget (SV *self, NV x, NV y)
2651 PPCODE:
2652{
2653 if (within_widget (self, x, y))
2654 XPUSHs (self);
2655}
2656
2657BOOT:
2658{
2659 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2660
2661 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2662 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2663 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2664 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2665}
2666
2667void
2668draw (SV *self)
2669 CODE:
2670{
2671 HV *hv;
2672 SV **svp;
2673 NV x, y, w, h;
2674 SV *draw_x_sv = GvSV (draw_x_gv);
2675 SV *draw_y_sv = GvSV (draw_y_gv);
2676 SV *draw_w_sv = GvSV (draw_w_gv);
2677 SV *draw_h_sv = GvSV (draw_h_gv);
2678 SV *hover;
2679 double draw_x, draw_y, draw_w, draw_h;
2680
2681 if (!SvROK (self))
2682 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2683
2684 hv = (HV *)SvRV (self);
2685
2686 if (SvTYPE (hv) != SVt_PVHV)
2687 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2688
2689 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2690 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2691
2692 if (!h || !w)
2693 XSRETURN_EMPTY;
2694
2695 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2696 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2697
2698 draw_x = SvNV (draw_x_sv) + x;
2699 draw_y = SvNV (draw_y_sv) + y;
2700
2701 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2702 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2703 XSRETURN_EMPTY;
2704
2705 sv_setnv (draw_x_sv, draw_x);
2706 sv_setnv (draw_y_sv, draw_y);
2707
2708 glPushMatrix ();
2709 glTranslated (x, y, 0);
2710
2711 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2712 {
2713 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2714
2715 if (svp && SvTRUE (*svp))
2716 {
2717 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2718 glEnable (GL_BLEND);
2719 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2720 glBegin (GL_QUADS);
2721 glVertex2f (0, 0);
2722 glVertex2f (w, 0);
2723 glVertex2f (w, h);
2724 glVertex2f (0, h);
2725 glEnd ();
2726 glDisable (GL_BLEND);
2727 }
2728 }
2729#if 0
2730 if ($ENV{CFPLUS_DEBUG} & 1) {
2731 glPushMatrix;
2732 glColor 1, 1, 0, 1;
2733 glTranslate 0.375, 0.375;
2734 glBegin GL_LINE_LOOP;
2735 glVertex 0 , 0;
2736 glVertex $self->{w} - 1, 0;
2737 glVertex $self->{w} - 1, $self->{h} - 1;
2738 glVertex 0 , $self->{h} - 1;
2739 glEnd;
2740 glPopMatrix;
2741 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2742 }
2743#endif
2744 PUSHMARK (SP);
2745 XPUSHs (self);
2746 PUTBACK;
2747 call_method ("_draw", G_VOID | G_DISCARD);
2748 SPAGAIN;
2749
2750 glPopMatrix ();
2751
2752 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2753 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2754}
2755

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines