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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines