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.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 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 int
441within_widget (SV *widget, NV x, NV y)
442{
443 HV *self;
444 SV **svp;
445 NV wx, ww, wy, wh;
446
447 if (!SvROK (widget))
448 return 0;
449
450 self = (HV *)SvRV (widget);
451
452 if (SvTYPE (self) != SVt_PVHV)
453 return 0;
454
455 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
456 if (y < wy)
457 return 0;
458
459 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
460 if (y >= wy + wh)
461 return 0;
462
463 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
464 if (x < wx)
465 return 0;
466
467 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
468 if (x >= wx + ww)
469 return 0;
470
471 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
472 if (!svp || !SvTRUE (*svp))
473 return 0;
474
475 return 1;
476}
477
324MODULE = CFClient PACKAGE = CFClient 478MODULE = CFPlus PACKAGE = CFPlus
325 479
326PROTOTYPES: ENABLE 480PROTOTYPES: ENABLE
327 481
328BOOT: 482BOOT:
329{ 483{
330 HV *stash = gv_stashpv ("CFClient", 1); 484 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 485 static const struct {
332 const char *name; 486 const char *name;
333 IV iv; 487 IV iv;
334 } *civ, const_iv[] = { 488 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 489# define const_iv(name) { # name, (IV)name }
490 const_iv (SDLK_MODIFIER_MIN),
491 const_iv (SDLK_MODIFIER_MAX),
492
336 const_iv (SDL_ACTIVEEVENT), 493 const_iv (SDL_ACTIVEEVENT),
337 const_iv (SDL_KEYDOWN), 494 const_iv (SDL_KEYDOWN),
338 const_iv (SDL_KEYUP), 495 const_iv (SDL_KEYUP),
339 const_iv (SDL_MOUSEMOTION), 496 const_iv (SDL_MOUSEMOTION),
340 const_iv (SDL_MOUSEBUTTONDOWN), 497 const_iv (SDL_MOUSEBUTTONDOWN),
349 const_iv (SDL_EVENT_RESERVEDA), 506 const_iv (SDL_EVENT_RESERVEDA),
350 const_iv (SDL_EVENT_RESERVEDB), 507 const_iv (SDL_EVENT_RESERVEDB),
351 const_iv (SDL_VIDEORESIZE), 508 const_iv (SDL_VIDEORESIZE),
352 const_iv (SDL_VIDEOEXPOSE), 509 const_iv (SDL_VIDEOEXPOSE),
353 const_iv (SDL_USEREVENT), 510 const_iv (SDL_USEREVENT),
511
512 const_iv (SDL_APPINPUTFOCUS),
513 const_iv (SDL_APPMOUSEFOCUS),
514 const_iv (SDL_APPACTIVE),
515
354 const_iv (SDLK_KP0), 516 const_iv (SDLK_KP0),
355 const_iv (SDLK_KP1), 517 const_iv (SDLK_KP1),
356 const_iv (SDLK_KP2), 518 const_iv (SDLK_KP2),
357 const_iv (SDLK_KP3), 519 const_iv (SDLK_KP3),
358 const_iv (SDLK_KP4), 520 const_iv (SDLK_KP4),
413 const_iv (SDLK_BREAK), 575 const_iv (SDLK_BREAK),
414 const_iv (SDLK_MENU), 576 const_iv (SDLK_MENU),
415 const_iv (SDLK_POWER), 577 const_iv (SDLK_POWER),
416 const_iv (SDLK_EURO), 578 const_iv (SDLK_EURO),
417 const_iv (SDLK_UNDO), 579 const_iv (SDLK_UNDO),
580
418 const_iv (KMOD_NONE), 581 const_iv (KMOD_NONE),
582 const_iv (KMOD_SHIFT),
419 const_iv (KMOD_LSHIFT), 583 const_iv (KMOD_LSHIFT),
420 const_iv (KMOD_RSHIFT), 584 const_iv (KMOD_RSHIFT),
585 const_iv (KMOD_CTRL),
421 const_iv (KMOD_LCTRL), 586 const_iv (KMOD_LCTRL),
422 const_iv (KMOD_RCTRL), 587 const_iv (KMOD_RCTRL),
588 const_iv (KMOD_ALT),
423 const_iv (KMOD_LALT), 589 const_iv (KMOD_LALT),
424 const_iv (KMOD_RALT), 590 const_iv (KMOD_RALT),
591 const_iv (KMOD_META),
425 const_iv (KMOD_LMETA), 592 const_iv (KMOD_LMETA),
426 const_iv (KMOD_RMETA), 593 const_iv (KMOD_RMETA),
427 const_iv (KMOD_NUM), 594 const_iv (KMOD_NUM),
428 const_iv (KMOD_CAPS), 595 const_iv (KMOD_CAPS),
429 const_iv (KMOD_MODE), 596 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 597# undef const_iv
435 }; 598 };
436 599
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 600 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 601 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
602
603 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
604 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
439} 605}
606
607void
608weaken (SV *rv)
609 PROTOTYPE: $
610 CODE:
611 sv_rvweaken (rv);
612
613int
614in_destruct ()
615 CODE:
616 RETVAL = PL_main_cv == Nullcv;
617 OUTPUT:
618 RETVAL
440 619
441NV floor (NV x) 620NV floor (NV x)
442 621
443NV ceil (NV x) 622NV ceil (NV x)
444 623
445void 624void
446pango_init () 625pango_init ()
447 CODE: 626 CODE:
448 // delayed, so it can pick up new fonts added by AddFontResourceEx
449{ 627{
450 {
451 ft2_fontmap = pango_ft2_font_map_new (); 628 opengl_fontmap = pango_opengl_font_map_new ();
452 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 629 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 630 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454 }
455 {
456 cairo_font_options_t *fopt = cairo_font_options_create ();
457 cairo_fontmap = pango_cairo_font_map_get_default ();
458 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459#ifdef _WIN32
460 // cairo looks like shit eaten twice on windows
461 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462#else
463 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464#endif
465 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467 pango_cairo_context_set_font_options (cairo_context, fopt);
468 cairo_font_options_destroy (fopt);
469 }
470} 631}
632
633char *
634SDL_GetError ()
471 635
472int 636int
473SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 637SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
474 638
475void 639void
476SDL_Quit () 640SDL_Quit ()
477 641
478void 642void
479SDL_ListModes () 643SDL_ListModes (int rgb, int alpha)
480 PPCODE: 644 PPCODE:
481{ 645{
482 SDL_Rect **m; 646 SDL_Rect **m;
483 647
484 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 648 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
485 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 649 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
486 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 650 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
487 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 651 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
488 652
489 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 653 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
490 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 654 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
491 655
492 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 656 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
493 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 657 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 658 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
495 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 659 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496 660
497 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 661 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
498 662#if SDL_VERSION_ATLEAST(1,2,10)
499 SDL_EnableUNICODE (1); 663 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
500 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 664 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
665#endif
501 666
502 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 667 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
503 668
504 if (m && m != (SDL_Rect **)-1) 669 if (m && m != (SDL_Rect **)-1)
505 while (*m) 670 while (*m)
506 { 671 {
672 if ((*m)->w >= 640 && (*m)->h >= 480)
673 {
507 AV *av = newAV (); 674 AV *av = newAV ();
508 av_push (av, newSViv ((*m)->w)); 675 av_push (av, newSViv ((*m)->w));
509 av_push (av, newSViv ((*m)->h)); 676 av_push (av, newSViv ((*m)->h));
677 av_push (av, newSViv (rgb));
678 av_push (av, newSViv (alpha));
510 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 679 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
680 }
511 681
512 ++m; 682 ++m;
513 } 683 }
514} 684}
515 685
516char *
517SDL_GetError ()
518
519int 686int
520SDL_SetVideoMode (int w, int h, int fullscreen) 687SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
521 CODE: 688 CODE:
689{
690 SDL_EnableUNICODE (1);
691 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
692
693 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
694 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
695 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
696 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
697
522 RETVAL = !!SDL_SetVideoMode ( 698 RETVAL = !!SDL_SetVideoMode (
523 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 699 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
524 ); 700 );
701
525 if (RETVAL) 702 if (RETVAL)
526 { 703 {
704 av_clear (texture_av);
705
527 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 706 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
528# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 707#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
529# include "glfunc.h" 708#include "glfunc.h"
530# undef GL_FUNC 709#undef GL_FUNC
531 } 710 }
711}
532 OUTPUT: 712 OUTPUT:
533 RETVAL 713 RETVAL
534 714
535void 715void
536SDL_GL_SwapBuffers () 716SDL_GL_SwapBuffers ()
537 717
538char * 718char *
539SDL_GetKeyName (int sym) 719SDL_GetKeyName (int sym)
540 720
721int
722SDL_GetAppState ()
723
541void 724void
542SDL_PollEvent () 725poll_events ()
543 PPCODE: 726 PPCODE:
544{ 727{
545 SDL_Event ev; 728 SDL_Event ev;
546 729
547 while (SDL_PollEvent (&ev)) 730 SDL_PumpEvents ();
731 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
548 { 732 {
549 HV *hv = newHV (); 733 HV *hv = newHV ();
550 hv_store (hv, "type", 4, newSViv (ev.type), 0); 734 hv_store (hv, "type", 4, newSViv (ev.type), 0);
551 735
552 switch (ev.type) 736 switch (ev.type)
554 case SDL_KEYDOWN: 738 case SDL_KEYDOWN:
555 case SDL_KEYUP: 739 case SDL_KEYUP:
556 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 740 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
557 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 741 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
558 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 742 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
743 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
559 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 744 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
560 break; 745 break;
561 746
562 case SDL_ACTIVEEVENT: 747 case SDL_ACTIVEEVENT:
563 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 748 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
564 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 749 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
565 break; 750 break;
566 751
567 case SDL_MOUSEMOTION: 752 case SDL_MOUSEMOTION:
753 {
754 int state = ev.motion.state;
755 int x = ev.motion.x;
756 int y = ev.motion.y;
757 int xrel = ev.motion.xrel;
758 int yrel = ev.motion.yrel;
759
760 /* do simplistic event compression */
761 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
762 && state == ev.motion.state)
763 {
764 xrel += ev.motion.xrel;
765 yrel += ev.motion.yrel;
766 x = ev.motion.x;
767 y = ev.motion.y;
768 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
769 }
770
568 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 771 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
569
570 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 772 hv_store (hv, "state", 5, newSViv (state), 0);
571 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 773 hv_store (hv, "x", 1, newSViv (x), 0);
572 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 774 hv_store (hv, "y", 1, newSViv (y), 0);
573 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 775 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
574 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 776 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
777 }
575 break; 778 break;
576 779
577 case SDL_MOUSEBUTTONDOWN: 780 case SDL_MOUSEBUTTONDOWN:
578 case SDL_MOUSEBUTTONUP: 781 case SDL_MOUSEBUTTONUP:
579 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 782 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 792 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 793 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591 break; 794 break;
592 } 795 }
593 796
594 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 797 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595 } 798 }
596} 799}
597 800
598int 801int
599Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 802Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
608Mix_AllocateChannels (int numchans = -1) 811Mix_AllocateChannels (int numchans = -1)
609 812
610void 813void
611lowdelay (int fd, int val = 1) 814lowdelay (int fd, int val = 1)
612 CODE: 815 CODE:
816 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
817
818void
819win32_proxy_info ()
820 PPCODE:
821{
613#ifndef _WIN32 822#ifdef _WIN32
614 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 823 char buffer[2048];
824 DWORD buflen;
825
826 EXTEND (SP, 3);
827
828 buflen = sizeof (buffer);
829 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
830 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
831 {
832 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
833
834 buflen = sizeof (buffer);
835 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
836 {
837 PUSHs (newSVpv (buffer, 0));
838
839 buflen = sizeof (buffer);
840 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
841 PUSHs (newSVpv (buffer, 0));
842 }
843 }
615#endif 844#endif
845}
616 846
617void 847void
618add_font (char *file) 848add_font (char *file)
619 CODE: 849 CODE:
620 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 850 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621#ifdef _WIN32
622 // cairo... sigh... requires win2000
623 AddFontResourceEx (file, FR_PRIVATE, 0);
624#endif
625 851
626void 852void
627load_image_inline (SV *image_) 853load_image_inline (SV *image_)
628 ALIAS: 854 ALIAS:
629 load_image_file = 1 855 load_image_file = 1
671 897
672 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 898 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673 899
674 assert (surface2->pitch == surface2->w * 4); 900 assert (surface2->pitch == surface2->w * 4);
675 901
902 SDL_LockSurface (surface2);
676 EXTEND (SP, 5); 903 EXTEND (SP, 6);
677 PUSHs (sv_2mortal (newSViv (surface2->w))); 904 PUSHs (sv_2mortal (newSViv (surface2->w)));
678 PUSHs (sv_2mortal (newSViv (surface2->h))); 905 PUSHs (sv_2mortal (newSViv (surface2->h)));
679 SDL_LockSurface (surface2);
680 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 906 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681 SDL_UnlockSurface (surface2);
682 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 907 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 908 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 909 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
910 SDL_UnlockSurface (surface2);
685 911
686 SDL_FreeSurface (surface); 912 SDL_FreeSurface (surface);
687 SDL_FreeSurface (surface2); 913 SDL_FreeSurface (surface2);
688} 914}
689 915
728 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 954 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
729#endif 955#endif
730 _exit (1); 956 _exit (1);
731 957
732void 958void
733_exit (int retval) 959_exit (int retval = 0)
734 CODE: 960 CODE:
961#ifdef WIN32
962 ExitThread (retval); // unclean, please beam me up
963#else
735 _exit (retval); 964 _exit (retval);
965#endif
736 966
967void
968debug ()
969 CODE:
970{
971#if DEBUG
972 VALGRIND_DO_LEAK_CHECK;
973#endif
974}
975
737MODULE = CFClient PACKAGE = CFClient::Font 976MODULE = CFPlus PACKAGE = CFPlus::Font
738 977
739CFClient::Font 978PROTOTYPES: DISABLE
979
980CFPlus::Font
740new_from_file (SV *class, char *path, int id = 0) 981new_from_file (SV *class, char *path, int id = 0)
741 CODE: 982 CODE:
742{ 983{
743 int count; 984 int count;
744 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 985 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
747} 988}
748 OUTPUT: 989 OUTPUT:
749 RETVAL 990 RETVAL
750 991
751void 992void
752DESTROY (CFClient::Font self) 993DESTROY (CFPlus::Font self)
753 CODE: 994 CODE:
754 pango_font_description_free (self); 995 pango_font_description_free (self);
755 996
756void 997void
757make_default (CFClient::Font self) 998make_default (CFPlus::Font self)
999 PROTOTYPE: $
758 CODE: 1000 CODE:
759 default_font = self; 1001 default_font = self;
760 1002
761MODULE = CFClient PACKAGE = CFClient::Layout 1003MODULE = CFPlus PACKAGE = CFPlus::Layout
762 1004
763CFClient::Layout 1005PROTOTYPES: DISABLE
764new (SV *class, int rgba = 0) 1006
1007void
1008reset_glyph_cache ()
1009 PROTOTYPE:
1010 CODE:
1011 tc_clear ();
1012
1013CFPlus::Layout
1014new (SV *class)
765 CODE: 1015 CODE:
766 New (0, RETVAL, 1, struct cf_layout); 1016 New (0, RETVAL, 1, struct cf_layout);
767 1017
768 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 1018 RETVAL->pl = pango_layout_new (opengl_context);
769 RETVAL->rgba = rgba;
770 RETVAL->r = 1.; 1019 RETVAL->r = 1.;
771 RETVAL->g = 1.; 1020 RETVAL->g = 1.;
772 RETVAL->b = 1.; 1021 RETVAL->b = 1.;
773 RETVAL->a = 1.; 1022 RETVAL->a = 1.;
774 RETVAL->base_height = MIN_FONT_HEIGHT; 1023 RETVAL->base_height = MIN_FONT_HEIGHT;
778 layout_update_font (RETVAL); 1027 layout_update_font (RETVAL);
779 OUTPUT: 1028 OUTPUT:
780 RETVAL 1029 RETVAL
781 1030
782void 1031void
783DESTROY (CFClient::Layout self) 1032DESTROY (CFPlus::Layout self)
784 CODE: 1033 CODE:
785 g_object_unref (self->pl); 1034 g_object_unref (self->pl);
786 Safefree (self); 1035 Safefree (self);
787 1036
788int
789is_rgba (CFClient::Layout self)
790 CODE:
791 RETVAL = self->rgba;
792 OUTPUT:
793 RETVAL
794
795void 1037void
796set_text (CFClient::Layout self, SV *text_) 1038set_text (CFPlus::Layout self, SV *text_)
797 CODE: 1039 CODE:
798{ 1040{
799 STRLEN textlen; 1041 STRLEN textlen;
800 char *text = SvPVutf8 (text_, textlen); 1042 char *text = SvPVutf8 (text_, textlen);
801 1043
802 pango_layout_set_text (self->pl, text, textlen); 1044 pango_layout_set_text (self->pl, text, textlen);
803} 1045}
804 1046
805void 1047void
806set_markup (CFClient::Layout self, SV *text_) 1048set_markup (CFPlus::Layout self, SV *text_)
807 CODE: 1049 CODE:
808{ 1050{
809 STRLEN textlen; 1051 STRLEN textlen;
810 char *text = SvPVutf8 (text_, textlen); 1052 char *text = SvPVutf8 (text_, textlen);
811 1053
812 pango_layout_set_markup (self->pl, text, textlen); 1054 pango_layout_set_markup (self->pl, text, textlen);
813} 1055}
814 1056
1057void
1058set_shapes (CFPlus::Layout self, ...)
1059 CODE:
1060{
1061 PangoAttrList *attrs = 0;
1062 const char *text = pango_layout_get_text (self->pl);
1063 const char *pos = text;
1064 int arg = 4;
1065
1066 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1067 {
1068 PangoRectangle inkrect, rect;
1069 PangoAttribute *attr;
1070
1071 int x = SvIV (ST (arg - 3));
1072 int y = SvIV (ST (arg - 2));
1073 int w = SvIV (ST (arg - 1));
1074 int h = SvIV (ST (arg ));
1075
1076 inkrect.x = 0;
1077 inkrect.y = 0;
1078 inkrect.width = 0;
1079 inkrect.height = 0;
1080
1081 rect.x = x * PANGO_SCALE;
1082 rect.y = y * PANGO_SCALE;
1083 rect.width = w * PANGO_SCALE;
1084 rect.height = h * PANGO_SCALE;
1085
1086 if (!attrs)
1087 attrs = pango_layout_get_attributes (self->pl);
1088
1089 attr = pango_attr_shape_new (&inkrect, &rect);
1090 attr->start_index = pos - text;
1091 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1092 pango_attr_list_insert (attrs, attr);
1093
1094 arg += 4;
1095 pos += sizeof (OBJ_STR) - 1;
1096 }
1097
1098 if (attrs)
1099 pango_layout_set_attributes (self->pl, attrs);
1100}
1101
1102void
1103get_shapes (CFPlus::Layout self)
1104 PPCODE:
1105{
1106 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1107
1108 do
1109 {
1110 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1111
1112 if (run && shape_attr_p (run))
1113 {
1114 PangoRectangle extents;
1115 pango_layout_iter_get_run_extents (iter, 0, &extents);
1116
1117 EXTEND (SP, 2);
1118 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1119 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1120 }
1121 }
1122 while (pango_layout_iter_next_run (iter));
1123
1124 pango_layout_iter_free (iter);
1125}
1126
1127int
1128has_wrapped (CFPlus::Layout self)
1129 CODE:
1130{
1131 int lines = 1;
1132 const char *text = pango_layout_get_text (self->pl);
1133
1134 while (*text)
1135 lines += *text++ == '\n';
1136
1137 RETVAL = lines < pango_layout_get_line_count (self->pl);
1138}
1139 OUTPUT:
1140 RETVAL
1141
815SV * 1142SV *
816get_text (CFClient::Layout self) 1143get_text (CFPlus::Layout self)
817 CODE: 1144 CODE:
818 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1145 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819 sv_utf8_decode (RETVAL); 1146 sv_utf8_decode (RETVAL);
820 OUTPUT: 1147 OUTPUT:
821 RETVAL 1148 RETVAL
822 1149
823void 1150void
824set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1151set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825 CODE: 1152 CODE:
826 self->r = r; 1153 self->r = r;
827 self->g = g; 1154 self->g = g;
828 self->b = b; 1155 self->b = b;
829 self->a = a; 1156 self->a = a;
830 1157
831void 1158void
832set_font (CFClient::Layout self, CFClient::Font font = 0) 1159set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833 CODE: 1160 CODE:
834 if (self->font != font) 1161 if (self->font != font)
835 { 1162 {
836 self->font = font; 1163 self->font = font;
837 layout_update_font (self); 1164 layout_update_font (self);
838 } 1165 }
839 1166
840void 1167void
841set_height (CFClient::Layout self, int base_height) 1168set_height (CFPlus::Layout self, int base_height)
842 CODE: 1169 CODE:
843 if (self->base_height != base_height) 1170 if (self->base_height != base_height)
844 { 1171 {
845 self->base_height = base_height; 1172 self->base_height = base_height;
846 layout_update_font (self); 1173 layout_update_font (self);
847 } 1174 }
848 1175
849void 1176void
850set_width (CFClient::Layout self, int max_width = -1) 1177set_width (CFPlus::Layout self, int max_width = -1)
851 CODE: 1178 CODE:
852 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1179 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853 1180
854void 1181void
855set_indent (CFClient::Layout self, int indent) 1182set_indent (CFPlus::Layout self, int indent)
856 CODE: 1183 CODE:
857 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1184 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858 1185
859void 1186void
860set_spacing (CFClient::Layout self, int spacing) 1187set_spacing (CFPlus::Layout self, int spacing)
861 CODE: 1188 CODE:
862 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1189 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863 1190
864void 1191void
865set_ellipsise (CFClient::Layout self, int ellipsise) 1192set_ellipsise (CFPlus::Layout self, int ellipsise)
866 CODE: 1193 CODE:
867 pango_layout_set_ellipsize (self->pl, 1194 pango_layout_set_ellipsize (self->pl,
868 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1195 ellipsise == 1 ? PANGO_ELLIPSIZE_START
869 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1196 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1197 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
871 : PANGO_ELLIPSIZE_NONE 1198 : PANGO_ELLIPSIZE_NONE
872 ); 1199 );
873 1200
874void 1201void
875set_single_paragraph_mode (CFClient::Layout self, int spm) 1202set_single_paragraph_mode (CFPlus::Layout self, int spm)
876 CODE: 1203 CODE:
877 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1204 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878 1205
879void 1206void
880size (CFClient::Layout self) 1207size (CFPlus::Layout self)
881 PPCODE: 1208 PPCODE:
882{ 1209{
883 int w, h; 1210 int w, h;
884 1211
885 layout_get_pixel_size (self, &w, &h); 1212 layout_get_pixel_size (self, &w, &h);
888 PUSHs (sv_2mortal (newSViv (w))); 1215 PUSHs (sv_2mortal (newSViv (w)));
889 PUSHs (sv_2mortal (newSViv (h))); 1216 PUSHs (sv_2mortal (newSViv (h)));
890} 1217}
891 1218
892int 1219int
1220descent (CFPlus::Layout self)
1221 CODE:
1222{
1223 PangoRectangle rect;
1224 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1225 pango_layout_line_get_pixel_extents (line, 0, &rect);
1226 RETVAL = PANGO_DESCENT (rect);
1227}
1228 OUTPUT:
1229 RETVAL
1230
1231int
893xy_to_index (CFClient::Layout self, int x, int y) 1232xy_to_index (CFPlus::Layout self, int x, int y)
894 CODE: 1233 CODE:
895{ 1234{
896 int index, trailing; 1235 int index, trailing;
897 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1236 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898 RETVAL = index; 1237 RETVAL = index + trailing;
899} 1238}
900 OUTPUT: 1239 OUTPUT:
901 RETVAL 1240 RETVAL
902 1241
903void 1242void
904cursor_pos (CFClient::Layout self, int index) 1243cursor_pos (CFPlus::Layout self, int index)
905 PPCODE: 1244 PPCODE:
906{ 1245{
907 PangoRectangle strong_pos; 1246 PangoRectangle strong_pos;
908 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1247 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909 1248
912 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1251 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1252 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914} 1253}
915 1254
916void 1255void
917render (CFClient::Layout self) 1256index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
918 PPCODE: 1257 PPCODE:
919{ 1258{
920 SV *retval; 1259 int line, x;
921 int w, h;
922 1260
923 layout_get_pixel_size (self, &w, &h); 1261 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1262 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
924 1263
925 if (self->rgba)
926 {
927 cairo_surface_t *surface;
928 cairo_t *cairo;
929
930 retval = newSV (w * h * 4);
931 SvPOK_only (retval);
932 SvCUR_set (retval, w * h * 4);
933
934 memset (SvPVX (retval), 0, w * h * 4);
935
936 surface = cairo_image_surface_create_for_data (
937 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
938 cairo = cairo_create (surface);
939 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941 pango_cairo_show_layout (cairo, self->pl);
942
943 cairo_destroy (cairo);
944 cairo_surface_destroy (surface);
945
946 // what a mess, and its premultiplied, too :(
947 {
948 uint32_t *p = (uint32_t *)SvPVX (retval);
949 uint32_t *e = p + w * h;
950
951 while (p < e)
952 {
953 uint32_t rgba = *p;
954 rgba = (rgba >> 24) | (rgba << 8);
955#if 0
956#ifdef _WIN32
957 {//D
958 uint8_t r = rgba >> 24;
959 uint8_t g = rgba >> 16;
960 uint8_t b = rgba >> 8;
961 uint8_t a = rgba >> 0;
962
963 rgba = (rgba & 0xffffff00) | a;
964 }
965#endif
966#endif
967 rgba = SDL_SwapBE32 (rgba);
968 *p++ = rgba;
969 }
970 }
971
972 EXTEND (SP, 5); 1264 EXTEND (SP, 2);
973 PUSHs (sv_2mortal (newSViv (w))); 1265 PUSHs (sv_2mortal (newSViv (line - 1)));
1266 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1267}
1268
1269void
1270line_x_to_index (CFPlus::Layout self, int line, int x)
1271 PPCODE:
1272{
1273 PangoLayoutLine *lp;
1274 int index, trailing;
1275
1276 if (line < 0)
1277 XSRETURN_EMPTY;
1278
1279 if (!(lp = pango_layout_get_line (self->pl, line)))
1280 XSRETURN_EMPTY; /* do better */
1281
1282 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1283
1284 EXTEND (SP, 2);
1285 if (GIMME_V == G_SCALAR)
974 PUSHs (sv_2mortal (newSViv (h))); 1286 PUSHs (sv_2mortal (newSViv (index + trailing)));
975 PUSHs (sv_2mortal (retval));
976 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978 }
979 else 1287 else
980 { 1288 {
981 FT_Bitmap bitmap;
982
983 retval = newSV (w * h);
984 SvPOK_only (retval);
985 SvCUR_set (retval, w * h);
986
987 bitmap.rows = h;
988 bitmap.width = w;
989 bitmap.pitch = w;
990 bitmap.buffer = (unsigned char*)SvPVX (retval);
991 bitmap.num_grays = 256;
992 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994 memset (bitmap.buffer, 0, w * h);
995
996 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998 EXTEND (SP, 5);
999 PUSHs (sv_2mortal (newSViv (w))); 1289 PUSHs (sv_2mortal (newSViv (index)));
1000 PUSHs (sv_2mortal (newSViv (h))); 1290 PUSHs (sv_2mortal (newSViv (trailing)));
1001 PUSHs (sv_2mortal (retval));
1002 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004 } 1291 }
1005} 1292}
1006 1293
1007MODULE = CFClient PACKAGE = CFClient::Texture
1008
1009void 1294void
1010pad2pot (SV *data_, SV *w_, SV *h_) 1295render (CFPlus::Layout self, float x, float y, int flags = 0)
1011 CODE: 1296 PPCODE:
1012{ 1297 pango_opengl_render_layout_subpixel (
1013 int ow = SvIV (w_); 1298 self->pl,
1014 int oh = SvIV (h_); 1299 x * PANGO_SCALE, y * PANGO_SCALE,
1300 self->r, self->g, self->b, self->a,
1301 flags
1302 );
1015 1303
1016 if (ow && oh) 1304MODULE = CFPlus PACKAGE = CFPlus::Texture
1305
1306PROTOTYPES: ENABLE
1307
1308int minpot (int n)
1309
1310void
1311pad (SV *data_, int ow, int oh, int nw, int nh)
1312 CODE:
1313{
1314 if ((nw != ow || nh != oh) && SvOK (data_))
1017 { 1315 {
1018 int nw = minpot (ow);
1019 int nh = minpot (oh);
1020
1021 if (nw != ow || nh != oh)
1022 {
1023 if (SvOK (data_))
1024 {
1025 STRLEN datalen; 1316 STRLEN datalen;
1026 char *data = SvPVbyte (data_, datalen); 1317 char *data = SvPVbyte (data_, datalen);
1027 int bpp = datalen / (ow * oh); 1318 int bpp = datalen / (ow * oh);
1028 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1319 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1029 1320
1030 SvPOK_only (result_); 1321 SvPOK_only (result_);
1031 SvCUR_set (result_, nw * nh * bpp); 1322 SvCUR_set (result_, nw * nh * bpp);
1032 1323
1033 memset (SvPVX (result_), 0, nw * nh * bpp); 1324 memset (SvPVX (result_), 0, nw * nh * bpp);
1034 while (oh--) 1325 while (oh--)
1035 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1326 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1036 1327
1037 sv_setsv (data_, result_); 1328 sv_setsv (data_, result_);
1038 }
1039
1040 sv_setiv (w_, nw);
1041 sv_setiv (h_, nh);
1042 }
1043 } 1329 }
1044} 1330}
1045 1331
1046void 1332void
1047draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1333draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1090 glDisable (GL_ALPHA_TEST); 1376 glDisable (GL_ALPHA_TEST);
1091 glDisable (GL_BLEND); 1377 glDisable (GL_BLEND);
1092 } 1378 }
1093} 1379}
1094 1380
1381IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1382 CODE:
1383{
1384 GLint width;
1385 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1386 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1387 RETVAL = width > 0;
1388}
1389 OUTPUT:
1390 RETVAL
1391
1095MODULE = CFClient PACKAGE = CFClient::Map 1392MODULE = CFPlus PACKAGE = CFPlus::Map
1096 1393
1097CFClient::Map 1394PROTOTYPES: DISABLE
1098new (SV *class, int map_width, int map_height) 1395
1396CFPlus::Map
1397new (SV *class)
1099 CODE: 1398 CODE:
1100 New (0, RETVAL, 1, struct map); 1399 New (0, RETVAL, 1, struct map);
1101 RETVAL->x = 0; 1400 RETVAL->x = 0;
1102 RETVAL->y = 0; 1401 RETVAL->y = 0;
1103 RETVAL->w = map_width; 1402 RETVAL->w = 0;
1104 RETVAL->h = map_height; 1403 RETVAL->h = 0;
1105 RETVAL->ox = 0; 1404 RETVAL->ox = 0;
1106 RETVAL->oy = 0; 1405 RETVAL->oy = 0;
1107 RETVAL->faces = 8192; 1406 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1108 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1407 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1109 RETVAL->texs = 8192;
1110 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1111 RETVAL->rows = 0; 1408 RETVAL->rows = 0;
1112 RETVAL->row = 0; 1409 RETVAL->row = 0;
1113 OUTPUT: 1410 OUTPUT:
1114 RETVAL 1411 RETVAL
1115 1412
1116void 1413void
1117DESTROY (CFClient::Map self) 1414DESTROY (CFPlus::Map self)
1118 CODE: 1415 CODE:
1119{ 1416{
1120 map_clear (self); 1417 map_clear (self);
1121 Safefree (self->face); 1418 Safefree (self->face2tile);
1122 Safefree (self->tex); 1419 Safefree (self->tex);
1123 Safefree (self); 1420 Safefree (self);
1124} 1421}
1125 1422
1126void 1423void
1424resize (CFPlus::Map self, int map_width, int map_height)
1425 CODE:
1426 self->w = map_width;
1427 self->h = map_height;
1428
1429void
1127clear (CFClient::Map self) 1430clear (CFPlus::Map self)
1128 CODE: 1431 CODE:
1129 map_clear (self); 1432 map_clear (self);
1130 1433
1131void 1434void
1132set_face (CFClient::Map self, int face, int texid) 1435set_tileid (CFPlus::Map self, int face, int tile)
1133 CODE: 1436 CODE:
1134{ 1437{
1135 while (self->faces <= face) 1438 need_facenum (self, face); self->face2tile [face] = tile;
1136 { 1439 need_texid (self, tile);
1137 Append (mapface, self->face, self->faces, self->faces);
1138 self->faces *= 2;
1139 }
1140
1141 self->face [face] = texid;
1142} 1440}
1143 1441
1144void 1442void
1443set_smooth (CFPlus::Map self, int face, int smooth, int level)
1444 CODE:
1445{
1446 tileid texid;
1447 maptex *tex;
1448
1449 if (face < 0 || face >= self->faces)
1450 return;
1451
1452 if (smooth < 0 || smooth >= self->faces)
1453 return;
1454
1455 texid = self->face2tile [face];
1456
1457 if (!texid)
1458 return;
1459
1460 tex = self->tex + texid;
1461 tex->smoothtile = self->face2tile [smooth];
1462 tex->smoothlevel = level;
1463}
1464
1465void
1145set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1466set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1146 CODE: 1467 CODE:
1147{ 1468{
1148 while (self->texs <= texid) 1469 need_texid (self, texid);
1149 {
1150 Append (maptex, self->tex, self->texs, self->texs);
1151 self->texs *= 2;
1152 }
1153 1470
1154 { 1471 {
1155 maptex *tex = self->tex + texid; 1472 maptex *tex = self->tex + texid;
1156 1473
1157 tex->name = name; 1474 tex->name = name;
1174 // from transparent color bleeding and ugly wrapping effects. 1491 // from transparent color bleeding and ugly wrapping effects.
1175 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1492 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176} 1493}
1177 1494
1178int 1495int
1179ox (CFClient::Map self) 1496ox (CFPlus::Map self)
1180 ALIAS: 1497 ALIAS:
1181 oy = 1 1498 oy = 1
1182 x = 2 1499 x = 2
1183 y = 3 1500 y = 3
1184 w = 4 1501 w = 4
1195 } 1512 }
1196 OUTPUT: 1513 OUTPUT:
1197 RETVAL 1514 RETVAL
1198 1515
1199void 1516void
1200scroll (CFClient::Map self, int dx, int dy) 1517scroll (CFPlus::Map self, int dx, int dy)
1201 CODE: 1518 CODE:
1202{ 1519{
1203 if (dx > 0) 1520 if (dx > 0)
1204 map_blank (self, self->x, self->y, dx - 1, self->h); 1521 map_blank (self, self->x, self->y, dx, self->h);
1205 else if (dx < 0) 1522 else if (dx < 0)
1206 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1523 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1207 1524
1208 if (dy > 0) 1525 if (dy > 0)
1209 map_blank (self, self->x, self->y, self->w, dy - 1); 1526 map_blank (self, self->x, self->y, self->w, dy);
1210 else if (dy < 0) 1527 else if (dy < 0)
1211 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1528 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1212 1529
1213 self->ox += dx; self->x += dx; 1530 self->ox += dx; self->x += dx;
1214 self->oy += dy; self->y += dy; 1531 self->oy += dy; self->y += dy;
1215 1532
1216 while (self->y < 0) 1533 while (self->y < 0)
1221 self->y += MAP_EXTEND_Y; 1538 self->y += MAP_EXTEND_Y;
1222 } 1539 }
1223} 1540}
1224 1541
1225void 1542void
1226map1a_update (CFClient::Map self, SV *data_) 1543map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227 CODE: 1544 CODE:
1228{ 1545{
1229 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1546 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1230 uint8_t *data_end = (uint8_t *)SvEND (data_); 1547 uint8_t *data_end = (uint8_t *)SvEND (data_);
1231 mapcell *cell; 1548 mapcell *cell;
1232 int x, y, flags; 1549 int x, y, flags;
1233 1550
1234 while (data < data_end) 1551 while (data < data_end - 1)
1235 { 1552 {
1236 flags = (data [0] << 8) + data [1]; data += 2; 1553 flags = (data [0] << 8) + data [1]; data += 2;
1237 1554
1238 x = self->x + ((flags >> 10) & 63); 1555 x = self->x + ((flags >> 10) & 63);
1239 y = self->y + ((flags >> 4) & 63); 1556 y = self->y + ((flags >> 4) & 63);
1240 1557
1241 cell = map_get_cell (self, x, y); 1558 cell = map_get_cell (self, x, y);
1242 1559
1243 if (flags & 15) 1560 if (flags & 15)
1244 { 1561 {
1245 if (cell->darkness < 0) 1562 if (!cell->darkness)
1246 { 1563 {
1564 memset (cell, 0, sizeof (*cell));
1247 cell->darkness = 0; 1565 cell->darkness = 256;
1248 cell->face [0] = 0;
1249 cell->face [1] = 0;
1250 cell->face [2] = 0;
1251 } 1566 }
1252 1567
1253 cell->darkness = flags & 8 ? *data++ : 255;
1254
1255 //TODO: don't trust server data to be in-range(!) 1568 //TODO: don't trust server data to be in-range(!)
1569
1570 if (flags & 8)
1571 {
1572 if (extmap)
1573 {
1574 uint8_t ext, cmd;
1575
1576 do
1577 {
1578 ext = *data++;
1579 cmd = ext & 0x3f;
1580
1581 if (cmd < 4)
1582 cell->darkness = 255 - ext * 64 + 1;
1583 else if (cmd == 5) // health
1584 {
1585 cell->stat_width = 1;
1586 cell->stat_hp = *data++;
1587 }
1588 else if (cmd == 6) // monster width
1589 cell->stat_width = *data++ + 1;
1590 else if (cmd == 0x47)
1591 {
1592 if (*data == 4)
1593 ; // decode player count
1594
1595 data += *data + 1;
1596 }
1597 else if (cmd == 8) // cell flags
1598 cell->flags = *data++;
1599 else if (ext & 0x40) // unknown, multibyte => skip
1600 data += *data + 1;
1601 else
1602 data++;
1603 }
1604 while (ext & 0x80);
1605 }
1606 else
1607 cell->darkness = *data++ + 1;
1608 }
1256 1609
1257 if (flags & 4) 1610 if (flags & 4)
1258 { 1611 {
1259 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1612 faceid face = (data [0] << 8) + data [1]; data += 2;
1613 need_facenum (self, face);
1614 cell->tile [0] = self->face2tile [face];
1260 } 1615 }
1261 1616
1262 if (flags & 2) 1617 if (flags & 2)
1263 { 1618 {
1264 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1619 faceid face = (data [0] << 8) + data [1]; data += 2;
1620 need_facenum (self, face);
1621 cell->tile [1] = self->face2tile [face];
1265 } 1622 }
1266 1623
1267 if (flags & 1) 1624 if (flags & 1)
1268 { 1625 {
1269 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1626 faceid face = (data [0] << 8) + data [1]; data += 2;
1627 need_facenum (self, face);
1628 cell->tile [2] = self->face2tile [face];
1270 } 1629 }
1271 } 1630 }
1272 else 1631 else
1273 cell->darkness = -1; 1632 cell->darkness = 0;
1274 } 1633 }
1275} 1634}
1276 1635
1277SV * 1636SV *
1278mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1637mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279 CODE: 1638 CODE:
1280{ 1639{
1281 int x1, x; 1640 int x1, x;
1282 int y1, y; 1641 int y1, y;
1283 int z; 1642 int z;
1304 { 1663 {
1305 mapcell *cell = row->col + (x - row->c0); 1664 mapcell *cell = row->col + (x - row->c0);
1306 1665
1307 for (z = 0; z <= 0; z++) 1666 for (z = 0; z <= 0; z++)
1308 { 1667 {
1309 mapface face = cell->face [z];
1310
1311 if (face)
1312 {
1313 maptex tex = self->tex [face]; 1668 maptex tex = self->tex [cell->tile [z]];
1314 int a0 = 255 - tex.a; 1669 int a0 = 255 - tex.a;
1315 int a1 = tex.a; 1670 int a1 = tex.a;
1316 1671
1317 r = (r * a0 + tex.r * a1) / 255; 1672 r = (r * a0 + tex.r * a1) / 255;
1318 g = (g * a0 + tex.g * a1) / 255; 1673 g = (g * a0 + tex.g * a1) / 255;
1319 b = (b * a0 + tex.b * a1) / 255; 1674 b = (b * a0 + tex.b * a1) / 255;
1320 a = (a * a0 + tex.a * a1) / 255; 1675 a = (a * a0 + tex.a * a1) / 255;
1321 }
1322 } 1676 }
1323 } 1677 }
1324 1678
1325 *map++ = (r ) 1679 *map++ = (r )
1326 | (g << 8) 1680 | (g << 8)
1333} 1687}
1334 OUTPUT: 1688 OUTPUT:
1335 RETVAL 1689 RETVAL
1336 1690
1337void 1691void
1338draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1692draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1339 CODE: 1693 CODE:
1340{ 1694{
1341 int vx, vy; 1695 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1696 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1697 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1698 smooth_key skey;
1342 int x, y, z; 1699 int x, y, z;
1343 int last_name; 1700 int last_name;
1344 mapface face;
1345 1701
1346 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1702 // thats current max. sorry.
1347 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1703 if (sw > 255) sw = 255;
1704 if (sh > 255) sh = 255;
1348 1705
1349 /* 1706 // clear key, in case of extra padding
1350 int vx = self->vx = self->w >= sw 1707 memset (&skey, 0, sizeof (skey));
1351 ? self->x + (self->w - sw) / 2
1352 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1353
1354 int vy = self->vy = self->h >= sh
1355 ? self->y + (self->h - sh) / 2
1356 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1357 */
1358 1708
1359 glColor4ub (255, 255, 255, 255); 1709 glColor4ub (255, 255, 255, 255);
1360 1710
1361 glEnable (GL_BLEND); 1711 glEnable (GL_BLEND);
1362 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1712 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 1715
1366 glBegin (GL_QUADS); 1716 glBegin (GL_QUADS);
1367 1717
1368 last_name = 0; 1718 last_name = 0;
1369 1719
1720 mx += self->x;
1721 my += self->y;
1722
1723 // first pass: determine smooth_max
1724 // rather ugly, if you ask me
1725 // could also be stored inside mapcell and updated on change
1726 memset (smooth_max, 0, sizeof (smooth_max));
1727
1728 for (y = 0; y < sh; y++)
1729 if (0 <= y + my && y + my < self->rows)
1730 {
1731 maprow *row = self->row + (y + my);
1732
1733 for (x = 0; x < sw; x++)
1734 if (row->c0 <= x + mx && x + mx < row->c1)
1735 {
1736 mapcell *cell = row->col + (x + mx - row->c0);
1737
1738 smooth_max[x + 1][y + 1] =
1739 MAX (self->tex [cell->tile [0]].smoothlevel,
1740 MAX (self->tex [cell->tile [1]].smoothlevel,
1741 self->tex [cell->tile [2]].smoothlevel));
1742 }
1743 }
1744
1370 for (z = 0; z < 3; z++) 1745 for (z = 0; z <= 2; z++)
1746 {
1747 memset (smooth_level, 0, sizeof (smooth_level));
1748
1371 for (y = 0; y < sh; y++) 1749 for (y = 0; y < sh; y++)
1372 if (0 <= y + vy && y + vy < self->rows) 1750 if (0 <= y + my && y + my < self->rows)
1373 { 1751 {
1374 maprow *row = self->row + (y + vy); 1752 maprow *row = self->row + (y + my);
1375 1753
1376 for (x = 0; x < sw; x++) 1754 for (x = 0; x < sw; x++)
1377 if (row->c0 <= x + vx && x + vx < row->c1) 1755 if (row->c0 <= x + mx && x + mx < row->c1)
1378 { 1756 {
1379 mapcell *cell = row->col + (x + vx - row->c0); 1757 mapcell *cell = row->col + (x + mx - row->c0);
1380
1381 face = cell->face [z]; 1758 tileid tile = cell->tile [z];
1382 1759
1383 if (face) 1760 if (tile)
1761 {
1762 maptex tex = self->tex [tile];
1763 int px = (x + 1) * T - tex.w;
1764 int py = (y + 1) * T - tex.h;
1765
1766 // suppressing texture state switches here
1767 // is only moderately effective, but worth the extra effort
1768 if (last_name != tex.name)
1769 {
1770 if (!tex.name)
1771 tex = self->tex [2]; /* missing, replace by noface */
1772
1773 glEnd ();
1774 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1775 glBegin (GL_QUADS);
1776 }
1777
1778 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1779 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1781 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1782
1783 if (cell->flags && z == 2)
1784 {
1785 if (cell->flags & 1)
1786 {
1787 maptex tex = self->tex [1];
1788 int px = x * T + T * 2 / 32;
1789 int py = y * T - T * 6 / 32;
1790
1791 glEnd ();
1792 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1793 glBegin (GL_QUADS);
1794
1795 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1796 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1797 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1798 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1799 }
1800 }
1801
1802 // update smooth hash
1803 if (tex.smoothtile)
1804 {
1805 skey.tile = tex.smoothtile;
1806 skey.level = tex.smoothlevel;
1807
1808 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1809
1810 // add bits to current tile and all neighbours. skey.x|y is
1811 // shifted +1|+1 so we always stay positive.
1812
1813 // bits is ___n cccc CCCC bbbb
1814 // n do not draw borders&corners
1815 // c draw these corners, but...
1816 // C ... not these
1817 // b draw these borders
1818
1819 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1820 // ┃· ·· ·┃ ━━
1821
1822 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1823 // ·· ·· ·┏ ┓·
1824
1825 // full tile
1826 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1827
1828 // borders
1829 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1830 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1831 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1832 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1833
1834 // corners
1835 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1836 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1837 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1838 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1839 }
1840 }
1841 }
1842 }
1843
1844 // go through all smoothlevels, lowest to highest, then draw.
1845 // this is basically counting sort
1846 {
1847 int w, b;
1848
1849 for (w = 0; w < 256 / 32; ++w)
1850 {
1851 uint32_t smask = smooth_level [w];
1852 if (smask)
1853 for (b = 0; b < 32; ++b)
1854 if (smask & (((uint32_t)1) << b))
1384 { 1855 {
1385 maptex tex = self->tex [face]; 1856 int level = (w << 5) | b;
1857 HE *he;
1386 1858
1387 int px = (x + 1) * 32 - tex.w; 1859 hv_iterinit (smooth);
1388 int py = (y + 1) * 32 - tex.h; 1860 while ((he = hv_iternext (smooth)))
1389
1390 if (last_name != tex.name)
1391 { 1861 {
1862 smooth_key *skey = (smooth_key *)HeKEY (he);
1863 IV bits = SvIVX (HeVAL (he));
1864
1865 if (!(bits & 0x1000)
1866 && skey->level == level
1867 && level > smooth_max [skey->x][skey->y])
1868 {
1869 maptex tex = self->tex [skey->tile];
1870 int px = (((int)skey->x) - 1) * T;
1871 int py = (((int)skey->y) - 1) * T;
1872 int border = bits & 15;
1873 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1874 float dx = tex.s * .0625f; // 16 images/row
1875 float dy = tex.t * .5f ; // 2 images/column
1876
1877 // this time naively avoiding texture state changes
1878 // save gobs of state changes.
1879 if (last_name != tex.name)
1880 {
1881 if (!tex.name)
1882 continue; // smoothing not yet available
1883
1392 glEnd (); 1884 glEnd ();
1393 last_name = tex.name;
1394 glBindTexture (GL_TEXTURE_2D, last_name); 1885 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395 glBegin (GL_QUADS); 1886 glBegin (GL_QUADS);
1887 }
1888
1889 if (border)
1890 {
1891 float ox = border * dx;
1892
1893 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1894 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1895 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1896 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1897 }
1898
1899 if (corner)
1900 {
1901 float ox = corner * dx;
1902
1903 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1907 }
1908 }
1396 } 1909 }
1397
1398 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402 } 1910 }
1403 }
1404 } 1911 }
1912 }
1913
1914 hv_clear (smooth);
1915 }
1405 1916
1406 glEnd (); 1917 glEnd ();
1407 1918
1408 glDisable (GL_TEXTURE_2D); 1919 glDisable (GL_TEXTURE_2D);
1409 glDisable (GL_BLEND); 1920 glDisable (GL_BLEND);
1410}
1411 1921
1922 // top layer: overlays such as the health bar
1923 for (y = 0; y < sh; y++)
1924 if (0 <= y + my && y + my < self->rows)
1925 {
1926 maprow *row = self->row + (y + my);
1927
1928 for (x = 0; x < sw; x++)
1929 if (row->c0 <= x + mx && x + mx < row->c1)
1930 {
1931 mapcell *cell = row->col + (x + mx - row->c0);
1932
1933 int px = x * T;
1934 int py = y * T;
1935
1936 if (cell->stat_hp)
1937 {
1938 int width = cell->stat_width * T;
1939 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1940
1941 glColor3ub (0, 0, 0);
1942 glRectf (px + 1, py - thick - 2,
1943 px + width - 1, py);
1944
1945 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1946 glRectf (px + 2,
1947 py - thick - 1,
1948 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1949 }
1950 }
1951 }
1952}
1953
1412void 1954void
1413draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1955draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414 CODE: 1956 CODE:
1415{ 1957{
1416 static float color[16][3] = { 1958 static float color[16][3] = {
1417 { 0.00, 0.00, 0.00 }, 1959 { 0.00F, 0.00F, 0.00F },
1418 { 1.00, 1.00, 1.00 }, 1960 { 1.00F, 1.00F, 1.00F },
1419 { 0.00, 0.00, 0.55 }, 1961 { 0.00F, 0.00F, 0.55F },
1420 { 1.00, 0.00, 0.00 }, 1962 { 1.00F, 0.00F, 0.00F },
1421 1963
1422 { 1.00, 0.54, 0.00 }, 1964 { 1.00F, 0.54F, 0.00F },
1423 { 0.11, 0.56, 1.00 }, 1965 { 0.11F, 0.56F, 1.00F },
1424 { 0.93, 0.46, 0.00 }, 1966 { 0.93F, 0.46F, 0.00F },
1425 { 0.18, 0.54, 0.34 }, 1967 { 0.18F, 0.54F, 0.34F },
1426 1968
1427 { 0.56, 0.73, 0.56 }, 1969 { 0.56F, 0.73F, 0.56F },
1428 { 0.80, 0.80, 0.80 }, 1970 { 0.80F, 0.80F, 0.80F },
1429 { 0.55, 0.41, 0.13 }, 1971 { 0.55F, 0.41F, 0.13F },
1430 { 0.99, 0.77, 0.26 }, 1972 { 0.99F, 0.77F, 0.26F },
1431 1973
1432 { 0.74, 0.65, 0.41 }, 1974 { 0.74F, 0.65F, 0.41F },
1433 1975
1434 { 0.00, 1.00, 1.00 }, 1976 { 0.00F, 1.00F, 1.00F },
1435 { 1.00, 0.00, 1.00 }, 1977 { 1.00F, 0.00F, 1.00F },
1436 { 1.00, 1.00, 0.00 }, 1978 { 1.00F, 1.00F, 0.00F },
1437 }; 1979 };
1438 1980
1439 int x, y; 1981 int x, y;
1440 1982
1441 glEnable (GL_TEXTURE_2D); 1983 glEnable (GL_TEXTURE_2D);
1468 glDisable (GL_BLEND); 2010 glDisable (GL_BLEND);
1469 glDisable (GL_TEXTURE_2D); 2011 glDisable (GL_TEXTURE_2D);
1470} 2012}
1471 2013
1472void 2014void
1473fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2015fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1474 PPCODE: 2016 PPCODE:
1475{ 2017{
1476 int vx, vy;
1477 int x, y; 2018 int x, y;
2019 int sw1 = sw + 2;
2020 int sh1 = sh + 2;
2021 int sh3 = sh * 3;
1478 int sw4 = (sw + 3) & ~3; 2022 int sw34 = (sw * 3 + 3) & ~3;
2023 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1479 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2024 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1480 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2025 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1481 2026
1482 memset (darkness, 255, sw4 * sh);
1483 SvPOK_only (darkness_sv); 2027 SvPOK_only (darkness3_sv);
1484 SvCUR_set (darkness_sv, sw4 * sh); 2028 SvCUR_set (darkness3_sv, sw34 * sh3);
1485 2029
1486 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2030 mx += self->x - 1;
1487 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2031 my += self->y - 1;
1488 2032
2033 memset (darkness1, 255, sw1 * sh1);
2034
1489 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh1; y++)
1490 if (0 <= y + vy && y + vy < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1491 { 2037 {
1492 maprow *row = self->row + (y + vy); 2038 maprow *row = self->row + (y + my);
1493 2039
1494 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw1; x++)
1495 if (row->c0 <= x + vx && x + vx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1496 { 2042 {
1497 mapcell *cell = row->col + (x + vx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1498 2044
1499 darkness[y * sw4 + x] = cell->darkness < 0 2045 darkness1 [y * sw1 + x] = cell->darkness
2046 ? 255 - (cell->darkness - 1)
1500 ? 255 - FOW_DARKNESS 2047 : 255 - FOW_DARKNESS;
1501 : 255 - cell->darkness;
1502 } 2048 }
1503 } 2049 }
1504 2050
2051 for (y = 0; y < sh; ++y)
2052 for (x = 0; x < sw; ++x)
2053 {
2054 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2055 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2056 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2057 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2058 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2059 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2060 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2061 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2062 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2063
2064 uint8_t r11 = (d11 + d21 + d12) / 3;
2065 uint8_t r21 = d21;
2066 uint8_t r31 = (d21 + d31 + d32) / 3;
2067
2068 uint8_t r12 = d12;
2069 uint8_t r22 = d22;
2070 uint8_t r32 = d32;
2071
2072 uint8_t r13 = (d13 + d23 + d12) / 3;
2073 uint8_t r23 = d23;
2074 uint8_t r33 = (d23 + d33 + d32) / 3;
2075
2076 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2077 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2078 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2079 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2080 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2081 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2082 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2083 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2084 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2085 }
2086
2087 free (darkness1);
2088
1505 EXTEND (SP, 3); 2089 EXTEND (SP, 3);
1506 PUSHs (sv_2mortal (newSViv (sw4))); 2090 PUSHs (sv_2mortal (newSViv (sw34)));
1507 PUSHs (sv_2mortal (newSViv (sh))); 2091 PUSHs (sv_2mortal (newSViv (sh3)));
1508 PUSHs (darkness_sv); 2092 PUSHs (darkness3_sv);
1509} 2093}
1510 2094
1511SV * 2095SV *
1512get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2096get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513 CODE: 2097 CODE:
1514{ 2098{
1515 int x, y, x1, y1; 2099 int x, y, x1, y1;
1516 SV *data_sv = newSV (w * h * 7 + 5); 2100 SV *data_sv = newSV (w * h * 7 + 5);
1517 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2101 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1542 if (row && row->c0 <= x && x < row->c1) 2126 if (row && row->c0 <= x && x < row->c1)
1543 { 2127 {
1544 mapcell *cell = row->col + (x - row->c0); 2128 mapcell *cell = row->col + (x - row->c0);
1545 uint8_t flags = 0; 2129 uint8_t flags = 0;
1546 2130
1547 if (cell->face [0]) flags |= 1; 2131 if (cell->tile [0]) flags |= 1;
1548 if (cell->face [1]) flags |= 2; 2132 if (cell->tile [1]) flags |= 2;
1549 if (cell->face [2]) flags |= 4; 2133 if (cell->tile [2]) flags |= 4;
1550 2134
1551 *data++ = flags; 2135 *data++ = flags;
1552 2136
1553 if (flags & 1) 2137 if (flags & 1)
1554 { 2138 {
2139 tileid tile = cell->tile [0];
1555 *data++ = cell->face [0] >> 8; 2140 *data++ = tile >> 8;
1556 *data++ = cell->face [0]; 2141 *data++ = tile;
1557 } 2142 }
1558 2143
1559 if (flags & 2) 2144 if (flags & 2)
1560 { 2145 {
2146 tileid tile = cell->tile [1];
1561 *data++ = cell->face [1] >> 8; 2147 *data++ = tile >> 8;
1562 *data++ = cell->face [1]; 2148 *data++ = tile;
1563 } 2149 }
1564 2150
1565 if (flags & 4) 2151 if (flags & 4)
1566 { 2152 {
2153 tileid tile = cell->tile [2];
1567 *data++ = cell->face [2] >> 8; 2154 *data++ = tile >> 8;
1568 *data++ = cell->face [2]; 2155 *data++ = tile;
1569 } 2156 }
1570 } 2157 }
1571 else 2158 else
1572 *data++ = 0; 2159 *data++ = 0;
1573 } 2160 }
1579} 2166}
1580 OUTPUT: 2167 OUTPUT:
1581 RETVAL 2168 RETVAL
1582 2169
1583void 2170void
1584set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2171set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585 PPCODE: 2172 PPCODE:
1586{ 2173{
1587 int x, y, z; 2174 int x, y, z;
1588 int w, h; 2175 int w, h;
1589 int x1, y1; 2176 int x1, y1;
1613 { 2200 {
1614 uint8_t flags = *data++; 2201 uint8_t flags = *data++;
1615 2202
1616 if (flags) 2203 if (flags)
1617 { 2204 {
1618 mapface face[3] = { 0, 0, 0 };
1619
1620 mapcell *cell = row_get_cell (row, x); 2205 mapcell *cell = row_get_cell (row, x);
2206 tileid tile[3] = { 0, 0, 0 };
1621 2207
1622 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2208 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1623 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2209 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1624 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2210 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1625 2211
1626 if (cell->darkness <= 0) 2212 if (cell->darkness == 0)
1627 { 2213 {
1628 cell->darkness = -1; 2214 cell->darkness = 0;
1629 2215
1630 for (z = 0; z <= 2; z++) 2216 for (z = 0; z <= 2; z++)
1631 { 2217 {
1632 cell->face[z] = face[z]; 2218 tileid t = tile [z];
1633 2219
1634 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2220 if (t >= self->texs || (t && !self->tex [t].name))
2221 {
1635 XPUSHs (sv_2mortal (newSViv (face[z]))); 2222 XPUSHs (sv_2mortal (newSViv (t)));
2223 need_texid (self, t);
2224 }
2225
2226 cell->tile [z] = t;
1636 } 2227 }
1637 } 2228 }
1638 } 2229 }
1639 } 2230 }
1640 } 2231 }
1641} 2232}
1642 2233
1643MODULE = CFClient PACKAGE = CFClient::MixChunk 2234MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644 2235
2236PROTOTYPES: DISABLE
2237
1645CFClient::MixChunk 2238CFPlus::MixChunk
1646new_from_file (SV *class, char *path) 2239new_from_file (SV *class, char *path)
1647 CODE: 2240 CODE:
1648 RETVAL = Mix_LoadWAV (path); 2241 RETVAL = Mix_LoadWAV (path);
1649 OUTPUT: 2242 OUTPUT:
1650 RETVAL 2243 RETVAL
1651 2244
1652void 2245void
1653DESTROY (CFClient::MixChunk self) 2246DESTROY (CFPlus::MixChunk self)
1654 CODE: 2247 CODE:
1655 Mix_FreeChunk (self); 2248 Mix_FreeChunk (self);
1656 2249
1657int 2250int
1658volume (CFClient::MixChunk self, int volume = -1) 2251volume (CFPlus::MixChunk self, int volume = -1)
1659 CODE: 2252 CODE:
1660 RETVAL = Mix_VolumeChunk (self, volume); 2253 RETVAL = Mix_VolumeChunk (self, volume);
1661 OUTPUT: 2254 OUTPUT:
1662 RETVAL 2255 RETVAL
1663 2256
1664int 2257int
1665play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2258play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666 CODE: 2259 CODE:
1667 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2260 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668 OUTPUT: 2261 OUTPUT:
1669 RETVAL 2262 RETVAL
1670 2263
1671MODULE = CFClient PACKAGE = CFClient::MixMusic 2264MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672 2265
1673int 2266int
1674volume (int volume = -1) 2267volume (int volume = -1)
2268 PROTOTYPE: ;$
1675 CODE: 2269 CODE:
1676 RETVAL = Mix_VolumeMusic (volume); 2270 RETVAL = Mix_VolumeMusic (volume);
1677 OUTPUT: 2271 OUTPUT:
1678 RETVAL 2272 RETVAL
1679 2273
2274int
2275fade_out (int ms)
2276 CODE:
2277 RETVAL = Mix_FadeOutMusic (ms);
2278 OUTPUT:
2279 RETVAL
2280
1680CFClient::MixMusic 2281CFPlus::MixMusic
1681new_from_file (SV *class, char *path) 2282new_from_file (SV *class, char *path)
1682 CODE: 2283 CODE:
1683 RETVAL = Mix_LoadMUS (path); 2284 RETVAL = Mix_LoadMUS (path);
1684 OUTPUT: 2285 OUTPUT:
1685 RETVAL 2286 RETVAL
1686 2287
1687void 2288void
1688DESTROY (CFClient::MixMusic self) 2289DESTROY (CFPlus::MixMusic self)
1689 CODE: 2290 CODE:
1690 Mix_FreeMusic (self); 2291 Mix_FreeMusic (self);
1691 2292
1692int 2293int
1693play (CFClient::MixMusic self, int loops = -1) 2294play (CFPlus::MixMusic self, int loops = -1)
1694 CODE: 2295 CODE:
1695 RETVAL = Mix_PlayMusic (self, loops); 2296 RETVAL = Mix_PlayMusic (self, loops);
1696 OUTPUT: 2297 OUTPUT:
1697 RETVAL 2298 RETVAL
1698 2299
2300int
2301fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302 CODE:
2303 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2304 OUTPUT:
2305 RETVAL
2306
1699MODULE = CFClient PACKAGE = CFClient::OpenGL 2307MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308
2309PROTOTYPES: ENABLE
1700 2310
1701BOOT: 2311BOOT:
1702{ 2312{
1703 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2313 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704 static const struct { 2314 static const struct {
1705 const char *name; 2315 const char *name;
1706 IV iv; 2316 IV iv;
1707 } *civ, const_iv[] = { 2317 } *civ, const_iv[] = {
1708# define const_iv(name) { # name, (IV)name } 2318# define const_iv(name) { # name, (IV)name }
2319 const_iv (GL_VENDOR),
2320 const_iv (GL_VERSION),
2321 const_iv (GL_EXTENSIONS),
1709 const_iv (GL_COLOR_MATERIAL), 2322 const_iv (GL_COLOR_MATERIAL),
1710 const_iv (GL_SMOOTH), 2323 const_iv (GL_SMOOTH),
1711 const_iv (GL_FLAT), 2324 const_iv (GL_FLAT),
1712 const_iv (GL_DITHER), 2325 const_iv (GL_DITHER),
1713 const_iv (GL_BLEND), 2326 const_iv (GL_BLEND),
1717 const_iv (GL_ALPHA_TEST), 2330 const_iv (GL_ALPHA_TEST),
1718 const_iv (GL_NORMALIZE), 2331 const_iv (GL_NORMALIZE),
1719 const_iv (GL_RESCALE_NORMAL), 2332 const_iv (GL_RESCALE_NORMAL),
1720 const_iv (GL_FRONT), 2333 const_iv (GL_FRONT),
1721 const_iv (GL_BACK), 2334 const_iv (GL_BACK),
2335 const_iv (GL_AUX0),
1722 const_iv (GL_AND), 2336 const_iv (GL_AND),
1723 const_iv (GL_ONE), 2337 const_iv (GL_ONE),
1724 const_iv (GL_ZERO), 2338 const_iv (GL_ZERO),
1725 const_iv (GL_SRC_ALPHA), 2339 const_iv (GL_SRC_ALPHA),
1726 const_iv (GL_DST_ALPHA), 2340 const_iv (GL_DST_ALPHA),
1740 const_iv (GL_LUMINANCE), 2354 const_iv (GL_LUMINANCE),
1741 const_iv (GL_LUMINANCE_ALPHA), 2355 const_iv (GL_LUMINANCE_ALPHA),
1742 const_iv (GL_FLOAT), 2356 const_iv (GL_FLOAT),
1743 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2357 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1744 const_iv (GL_COMPILE), 2358 const_iv (GL_COMPILE),
2359 const_iv (GL_PROXY_TEXTURE_1D),
2360 const_iv (GL_PROXY_TEXTURE_2D),
1745 const_iv (GL_TEXTURE_1D), 2361 const_iv (GL_TEXTURE_1D),
1746 const_iv (GL_TEXTURE_2D), 2362 const_iv (GL_TEXTURE_2D),
1747 const_iv (GL_TEXTURE_ENV), 2363 const_iv (GL_TEXTURE_ENV),
1748 const_iv (GL_TEXTURE_MAG_FILTER), 2364 const_iv (GL_TEXTURE_MAG_FILTER),
1749 const_iv (GL_TEXTURE_MIN_FILTER), 2365 const_iv (GL_TEXTURE_MIN_FILTER),
1771 const_iv (GL_SEPARABLE_2D), 2387 const_iv (GL_SEPARABLE_2D),
1772 const_iv (GL_CONVOLUTION_2D), 2388 const_iv (GL_CONVOLUTION_2D),
1773 const_iv (GL_CONVOLUTION_BORDER_MODE), 2389 const_iv (GL_CONVOLUTION_BORDER_MODE),
1774 const_iv (GL_CONSTANT_BORDER), 2390 const_iv (GL_CONSTANT_BORDER),
1775 const_iv (GL_LINES), 2391 const_iv (GL_LINES),
2392 const_iv (GL_LINE_STRIP),
1776 const_iv (GL_LINE_LOOP), 2393 const_iv (GL_LINE_LOOP),
1777 const_iv (GL_QUADS), 2394 const_iv (GL_QUADS),
1778 const_iv (GL_QUAD_STRIP), 2395 const_iv (GL_QUAD_STRIP),
1779 const_iv (GL_TRIANGLES), 2396 const_iv (GL_TRIANGLES),
1780 const_iv (GL_TRIANGLE_STRIP), 2397 const_iv (GL_TRIANGLE_STRIP),
1781 const_iv (GL_TRIANGLE_FAN), 2398 const_iv (GL_TRIANGLE_FAN),
1782 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2399 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400 const_iv (GL_POINT_SMOOTH_HINT),
2401 const_iv (GL_LINE_SMOOTH_HINT),
2402 const_iv (GL_POLYGON_SMOOTH_HINT),
2403 const_iv (GL_GENERATE_MIPMAP_HINT),
1783 const_iv (GL_FASTEST), 2404 const_iv (GL_FASTEST),
2405 const_iv (GL_DONT_CARE),
2406 const_iv (GL_NICEST),
1784 const_iv (GL_V2F), 2407 const_iv (GL_V2F),
1785 const_iv (GL_V3F), 2408 const_iv (GL_V3F),
1786 const_iv (GL_T2F_V3F), 2409 const_iv (GL_T2F_V3F),
1787 const_iv (GL_T2F_N3F_V3F), 2410 const_iv (GL_T2F_N3F_V3F),
1788# undef const_iv 2411# undef const_iv
1789 }; 2412 };
1790 2413
1791 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2416
2417 texture_av = newAV ();
2418 AvREAL_off (texture_av);
1793} 2419}
1794 2420
1795char * 2421char *
1796gl_vendor () 2422gl_vendor ()
1797 CODE: 2423 CODE:
1808 2434
1809char * 2435char *
1810gl_extensions () 2436gl_extensions ()
1811 CODE: 2437 CODE:
1812 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2438 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2439 OUTPUT:
2440 RETVAL
2441
2442const char *glGetString (GLenum pname)
2443
2444GLint glGetInteger (GLenum pname)
2445 CODE:
2446 glGetIntegerv (pname, &RETVAL);
2447 OUTPUT:
2448 RETVAL
2449
2450GLdouble glGetDouble (GLenum pname)
2451 CODE:
2452 glGetDoublev (pname, &RETVAL);
1813 OUTPUT: 2453 OUTPUT:
1814 RETVAL 2454 RETVAL
1815 2455
1816int glGetError () 2456int glGetError ()
1817 2457
1890 r *= a; 2530 r *= a;
1891 g *= a; 2531 g *= a;
1892 b *= a; 2532 b *= a;
1893 } 2533 }
1894 // microsoft visual "c" rounds instead of truncating... 2534 // microsoft visual "c" rounds instead of truncating...
1895 glColor4ub (MIN ((int)(r * 256.f), 255), 2535 glColor4f (r, g, b, a);
1896 MIN ((int)(g * 256.f), 255),
1897 MIN ((int)(b * 256.f), 255),
1898 MIN ((int)(a * 256.f), 255));
1899 2536
1900void glInterleavedArrays (int format, int stride, char *data) 2537void glInterleavedArrays (int format, int stride, char *data)
1901 2538
1902void glDrawElements (int mode, int count, int type, char *indices) 2539void glDrawElements (int mode, int count, int type, char *indices)
1903 2540
1945 2582
1946void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2583void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1947 2584
1948void glDrawPixels (int width, int height, int format, int type, char *pixels) 2585void glDrawPixels (int width, int height, int format, int type, char *pixels)
1949 2586
2587void glPixelZoom (float x, float y)
2588
1950void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2589void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1951 2590
1952int glGenTexture () 2591int glGenTexture ()
1953 CODE: 2592 CODE:
1954{ 2593 RETVAL = gen_texture ();
1955 GLuint name;
1956 glGenTextures (1, &name);
1957 RETVAL = name;
1958}
1959 OUTPUT: 2594 OUTPUT:
1960 RETVAL 2595 RETVAL
1961 2596
1962void glDeleteTexture (int name) 2597void glDeleteTexture (int name)
1963 CODE: 2598 CODE:
1964{
1965 GLuint name_ = name;
1966 glDeleteTextures (1, &name_); 2599 del_texture (name);
1967} 2600
1968
1969int glGenList () 2601int glGenList ()
1970 CODE: 2602 CODE:
1971 RETVAL = glGenLists (1); 2603 RETVAL = glGenLists (1);
1972 OUTPUT: 2604 OUTPUT:
1973 RETVAL 2605 RETVAL
1980 2612
1981void glEndList () 2613void glEndList ()
1982 2614
1983void glCallList (int list) 2615void glCallList (int list)
1984 2616
2617MODULE = CFPlus PACKAGE = CFPlus::UI::Base
1985 2618
2619PROTOTYPES: DISABLE
2620
2621void
2622find_widget (SV *widget, NV x, NV y)
2623 PPCODE:
2624{
2625 if (within_widget (widget, x, y))
2626 XPUSHs (widget);
2627}
2628

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines