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.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.194 by root, Thu Jul 12 17:56:50 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
18#include <SDL_endian.h> 31#include <SDL_endian.h>
19#include <SDL_image.h> 32#include <SDL_image.h>
20#include <SDL_mixer.h> 33#include <SDL_mixer.h>
21#include <SDL_opengl.h> 34#include <SDL_opengl.h>
22 35
36#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS
38
23#include <glib/gmacros.h> 39#include <glib/gmacros.h>
24 40
25#include <pango/pango.h> 41#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 42
30#ifndef _WIN32 43#ifndef _WIN32
31# include <sys/types.h> 44# include <sys/types.h>
32# include <sys/socket.h> 45# include <sys/socket.h>
33# include <netinet/in.h> 46# include <netinet/in.h>
34# include <netinet/tcp.h> 47# include <netinet/tcp.h>
35# include <inttypes.h> 48# 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 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
53 57
54#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
59
60#if 0
61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else
63# define PARACHUTE 0
64#endif
65
66static AV *texture_av;
55 67
56static struct 68static struct
57{ 69{
58#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 71#include "glfunc.h"
60#undef GL_FUNC 72#undef GL_FUNC
61} gl; 73} gl;
62 74
75static void
63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64{ 77{
65 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
66 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
67 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 82 else
70 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
71} 84}
72 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
110#include "texcache.c"
111
112#include "pango-font.c"
113#include "pango-fontmap.c"
114#include "pango-render.c"
115
73typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
75 118
76typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
77 120
78static int 121static int
79shape_attr_p (PangoLayoutRun *run) 122shape_attr_p (PangoLayoutRun *run)
80{ 123{
81 GSList *attrs = run->item->analysis.extra_attrs; 124 GSList *attrs = run->item->analysis.extra_attrs;
92 135
93 return 0; 136 return 0;
94} 137}
95 138
96typedef struct cf_layout { 139typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
100 int base_height; 142 int base_height;
101 CFClient__Font font; 143 CFPlus__Font font;
102} *CFClient__Layout; 144} *CFPlus__Layout;
103 145
104static CFClient__Font default_font; 146static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
107 149
108static void 150static void
109substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
110{ 152{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 156#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 158}
121 159
122static void 160static void
123layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
124{ 162{
125 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
126 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
127 */ 165 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
132 170
133 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
134} 172}
135 173
136static void 174static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
140 181
141 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 184
144 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
145} 186 if (!rect.height) rect.height = 1;
146 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
147typedef uint16_t mapface; 193typedef uint16_t faceid;
148 194
149typedef struct { 195typedef struct {
150 GLint name; 196 int name;
151 int w, h; 197 int w, h;
152 float s, t; 198 float s, t;
153 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
154} maptex; 202} maptex;
155 203
156typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
157 int16_t darkness; 207 uint16_t darkness;
158 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 209} mapcell;
160 210
161typedef struct { 211typedef struct {
162 int32_t c0, c1; 212 int32_t c0, c1;
163 mapcell *col; 213 mapcell *col;
164} maprow; 214} maprow;
165 215
166typedef struct map { 216typedef struct map {
167 int x, y, w, h; 217 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 219 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 220 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 221
175 int32_t rows; 222 int32_t rows;
176 maprow *row; 223 maprow *row;
177} *CFClient__Map; 224} *CFPlus__Map;
178 225
179static char * 226static char *
180prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
181{ 228{
182 char *p; 229 char *p;
199} 246}
200 247
201#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
204static maprow * 271static maprow *
205map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
206{ 273{
207 if (0 > y) 274 if (0 > y)
208 { 275 {
209 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
248 315
249 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
250} 317}
251 318
252static mapcell * 319static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
254{ 321{
255 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
256} 323}
257 324
258static void 325static void
259map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
260{ 327{
261 int r; 328 int r;
262 329
263 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
272 self->row = 0; 339 self->row = 0;
273 self->rows = 0; 340 self->rows = 0;
274} 341}
275 342
276static void 343static void
277map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278{ 345{
279 int x, y; 346 int x, y;
280 maprow *row; 347 maprow *row;
348 mapcell *cell;
281 349
282 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 351 if (y >= 0)
284 { 352 {
285 if (y >= self->rows) 353 if (y >= self->rows)
291 if (x >= row->c0) 359 if (x >= row->c0)
292 { 360 {
293 if (x >= row->c1) 361 if (x >= row->c1)
294 break; 362 break;
295 363
296 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
297 } 370 }
298 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
299} 388}
300 389
301static void 390static void
302music_finished (void) 391music_finished (void)
303{ 392{
339 n |= n >> 16; 428 n |= n >> 16;
340 429
341 return n + 1; 430 return n + 1;
342} 431}
343 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
344MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
345 438
346PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
347 440
348BOOT: 441BOOT:
349{ 442{
350 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 444 static const struct {
352 const char *name; 445 const char *name;
353 IV iv; 446 IV iv;
354 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
355# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
356 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
369 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
373 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
374 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
433 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
438 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 556# undef const_iv
455 }; 557 };
456 558
457 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
459} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
460 578
461NV floor (NV x) 579NV floor (NV x)
462 580
463NV ceil (NV x) 581NV ceil (NV x)
464 582
465void 583void
466pango_init () 584pango_init ()
467 CODE: 585 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 586{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
472 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 588 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 590}
491 591
492int 592int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 593SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 594
495void 595void
496SDL_Quit () 596SDL_Quit ()
497 597
498void 598void
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 616
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
518 622
519 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521 625
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
542 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544 ); 648 );
545 if (RETVAL) 649 if (RETVAL)
546 { 650 {
651 av_clear (texture_av);
652
547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h" 655# include "glfunc.h"
550# undef GL_FUNC 656# undef GL_FUNC
657
551 } 658 }
552 OUTPUT: 659 OUTPUT:
553 RETVAL 660 RETVAL
554 661
555void 662void
574 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
575 case SDL_KEYUP: 682 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 688 break;
581 689
582 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 717 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 718 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 719 break;
612 } 720 }
613 721
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 722 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 723 }
616} 724}
617 725
618int 726int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 727Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
628Mix_AllocateChannels (int numchans = -1) 736Mix_AllocateChannels (int numchans = -1)
629 737
630void 738void
631lowdelay (int fd, int val = 1) 739lowdelay (int fd, int val = 1)
632 CODE: 740 CODE:
741 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
742
743void
744win32_proxy_info ()
745 PPCODE:
746{
633#ifndef _WIN32 747#ifdef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 748 char buffer[2048];
749 DWORD buflen;
750
751 EXTEND (SP, 3);
752
753 buflen = sizeof (buffer);
754 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
755 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
756 {
757 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
758
759 buflen = sizeof (buffer);
760 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
761 {
762 PUSHs (newSVpv (buffer, 0));
763
764 buflen = sizeof (buffer);
765 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
766 PUSHs (newSVpv (buffer, 0));
767 }
768 }
635#endif 769#endif
770}
636 771
637void 772void
638add_font (char *file) 773add_font (char *file)
639 CODE: 774 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 775 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 776
646void 777void
647load_image_inline (SV *image_) 778load_image_inline (SV *image_)
648 ALIAS: 779 ALIAS:
649 load_image_file = 1 780 load_image_file = 1
691 822
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 823 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 824
694 assert (surface2->pitch == surface2->w * 4); 825 assert (surface2->pitch == surface2->w * 4);
695 826
827 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 828 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 829 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 830 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 831 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 832 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 833 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 834 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
835 SDL_UnlockSurface (surface2);
705 836
706 SDL_FreeSurface (surface); 837 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 838 SDL_FreeSurface (surface2);
708} 839}
709 840
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 879 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 880#endif
750 _exit (1); 881 _exit (1);
751 882
752void 883void
753_exit (int retval) 884_exit (int retval = 0)
754 CODE: 885 CODE:
886#ifdef WIN32
887 ExitThread (retval); // unclean, please beam me up
888#else
755 _exit (retval); 889 _exit (retval);
890#endif
756 891
892void
893debug ()
894 CODE:
895{
896#if DEBUG
897 VALGRIND_DO_LEAK_CHECK;
898#endif
899}
900
757MODULE = CFClient PACKAGE = CFClient::Font 901MODULE = CFPlus PACKAGE = CFPlus::Font
758 902
759CFClient::Font 903CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 904new_from_file (SV *class, char *path, int id = 0)
761 CODE: 905 CODE:
762{ 906{
763 int count; 907 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 908 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
767} 911}
768 OUTPUT: 912 OUTPUT:
769 RETVAL 913 RETVAL
770 914
771void 915void
772DESTROY (CFClient::Font self) 916DESTROY (CFPlus::Font self)
773 CODE: 917 CODE:
774 pango_font_description_free (self); 918 pango_font_description_free (self);
775 919
776void 920void
777make_default (CFClient::Font self) 921make_default (CFPlus::Font self)
778 CODE: 922 CODE:
779 default_font = self; 923 default_font = self;
780 924
781MODULE = CFClient PACKAGE = CFClient::Layout 925MODULE = CFPlus PACKAGE = CFPlus::Layout
782 926
783CFClient::Layout 927void
784new (SV *class, int rgba = 0) 928reset_glyph_cache ()
929 CODE:
930 tc_clear ();
931
932CFPlus::Layout
933new (SV *class)
785 CODE: 934 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 935 New (0, RETVAL, 1, struct cf_layout);
787 936
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 937 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 938 RETVAL->r = 1.;
791 RETVAL->g = 1.; 939 RETVAL->g = 1.;
792 RETVAL->b = 1.; 940 RETVAL->b = 1.;
793 RETVAL->a = 1.; 941 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 942 RETVAL->base_height = MIN_FONT_HEIGHT;
798 layout_update_font (RETVAL); 946 layout_update_font (RETVAL);
799 OUTPUT: 947 OUTPUT:
800 RETVAL 948 RETVAL
801 949
802void 950void
803DESTROY (CFClient::Layout self) 951DESTROY (CFPlus::Layout self)
804 CODE: 952 CODE:
805 g_object_unref (self->pl); 953 g_object_unref (self->pl);
806 Safefree (self); 954 Safefree (self);
807 955
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 956void
816set_text (CFClient::Layout self, SV *text_) 957set_text (CFPlus::Layout self, SV *text_)
817 CODE: 958 CODE:
818{ 959{
819 STRLEN textlen; 960 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 961 char *text = SvPVutf8 (text_, textlen);
821 962
822 pango_layout_set_text (self->pl, text, textlen); 963 pango_layout_set_text (self->pl, text, textlen);
823} 964}
824 965
825void 966void
826set_markup (CFClient::Layout self, SV *text_) 967set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 968 CODE:
828{ 969{
829 STRLEN textlen; 970 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 971 char *text = SvPVutf8 (text_, textlen);
831 972
832 pango_layout_set_markup (self->pl, text, textlen); 973 pango_layout_set_markup (self->pl, text, textlen);
833} 974}
834 975
835void 976void
836set_shapes (CFClient::Layout self, ...) 977set_shapes (CFPlus::Layout self, ...)
837 CODE: 978 CODE:
838{ 979{
839 PangoAttrList *attrs = 0; 980 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 981 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 982 const char *pos = text;
876 if (attrs) 1017 if (attrs)
877 pango_layout_set_attributes (self->pl, attrs); 1018 pango_layout_set_attributes (self->pl, attrs);
878} 1019}
879 1020
880void 1021void
881get_shapes (CFClient::Layout self) 1022get_shapes (CFPlus::Layout self)
882 PPCODE: 1023 PPCODE:
883{ 1024{
884 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1025 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885 1026
886 do 1027 do
890 if (run && shape_attr_p (run)) 1031 if (run && shape_attr_p (run))
891 { 1032 {
892 PangoRectangle extents; 1033 PangoRectangle extents;
893 pango_layout_iter_get_run_extents (iter, 0, &extents); 1034 pango_layout_iter_get_run_extents (iter, 0, &extents);
894 1035
1036 EXTEND (SP, 2);
895 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1037 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1038 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897 } 1039 }
898 } 1040 }
899 while (pango_layout_iter_next_run (iter)); 1041 while (pango_layout_iter_next_run (iter));
900 1042
901 pango_layout_iter_free (iter); 1043 pango_layout_iter_free (iter);
902} 1044}
903 1045
904int 1046int
905has_wrapped (CFClient::Layout self) 1047has_wrapped (CFPlus::Layout self)
906 CODE: 1048 CODE:
907{ 1049{
908 int lines = 1; 1050 int lines = 1;
909 const char *text = pango_layout_get_text (self->pl); 1051 const char *text = pango_layout_get_text (self->pl);
910 1052
915} 1057}
916 OUTPUT: 1058 OUTPUT:
917 RETVAL 1059 RETVAL
918 1060
919SV * 1061SV *
920get_text (CFClient::Layout self) 1062get_text (CFPlus::Layout self)
921 CODE: 1063 CODE:
922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1064 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923 sv_utf8_decode (RETVAL); 1065 sv_utf8_decode (RETVAL);
924 OUTPUT: 1066 OUTPUT:
925 RETVAL 1067 RETVAL
926 1068
927void 1069void
928set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1070set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929 CODE: 1071 CODE:
930 self->r = r; 1072 self->r = r;
931 self->g = g; 1073 self->g = g;
932 self->b = b; 1074 self->b = b;
933 self->a = a; 1075 self->a = a;
934 1076
935void 1077void
936set_font (CFClient::Layout self, CFClient::Font font = 0) 1078set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937 CODE: 1079 CODE:
938 if (self->font != font) 1080 if (self->font != font)
939 { 1081 {
940 self->font = font; 1082 self->font = font;
941 layout_update_font (self); 1083 layout_update_font (self);
942 } 1084 }
943 1085
944void 1086void
945set_height (CFClient::Layout self, int base_height) 1087set_height (CFPlus::Layout self, int base_height)
946 CODE: 1088 CODE:
947 if (self->base_height != base_height) 1089 if (self->base_height != base_height)
948 { 1090 {
949 self->base_height = base_height; 1091 self->base_height = base_height;
950 layout_update_font (self); 1092 layout_update_font (self);
951 } 1093 }
952 1094
953void 1095void
954set_width (CFClient::Layout self, int max_width = -1) 1096set_width (CFPlus::Layout self, int max_width = -1)
955 CODE: 1097 CODE:
956 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1098 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957 1099
958void 1100void
959set_indent (CFClient::Layout self, int indent) 1101set_indent (CFPlus::Layout self, int indent)
960 CODE: 1102 CODE:
961 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1103 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962 1104
963void 1105void
964set_spacing (CFClient::Layout self, int spacing) 1106set_spacing (CFPlus::Layout self, int spacing)
965 CODE: 1107 CODE:
966 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1108 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967 1109
968void 1110void
969set_ellipsise (CFClient::Layout self, int ellipsise) 1111set_ellipsise (CFPlus::Layout self, int ellipsise)
970 CODE: 1112 CODE:
971 pango_layout_set_ellipsize (self->pl, 1113 pango_layout_set_ellipsize (self->pl,
972 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1114 ellipsise == 1 ? PANGO_ELLIPSIZE_START
973 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1115 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1116 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
975 : PANGO_ELLIPSIZE_NONE 1117 : PANGO_ELLIPSIZE_NONE
976 ); 1118 );
977 1119
978void 1120void
979set_single_paragraph_mode (CFClient::Layout self, int spm) 1121set_single_paragraph_mode (CFPlus::Layout self, int spm)
980 CODE: 1122 CODE:
981 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1123 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982 1124
983void 1125void
984size (CFClient::Layout self) 1126size (CFPlus::Layout self)
985 PPCODE: 1127 PPCODE:
986{ 1128{
987 int w, h; 1129 int w, h;
988 1130
989 layout_get_pixel_size (self, &w, &h); 1131 layout_get_pixel_size (self, &w, &h);
992 PUSHs (sv_2mortal (newSViv (w))); 1134 PUSHs (sv_2mortal (newSViv (w)));
993 PUSHs (sv_2mortal (newSViv (h))); 1135 PUSHs (sv_2mortal (newSViv (h)));
994} 1136}
995 1137
996int 1138int
997descent (CFClient::Layout self) 1139descent (CFPlus::Layout self)
998 CODE: 1140 CODE:
999{ 1141{
1000 PangoRectangle rect; 1142 PangoRectangle rect;
1001 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1143 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002 pango_layout_line_get_pixel_extents (line, 0, &rect); 1144 pango_layout_line_get_pixel_extents (line, 0, &rect);
1004} 1146}
1005 OUTPUT: 1147 OUTPUT:
1006 RETVAL 1148 RETVAL
1007 1149
1008int 1150int
1009xy_to_index (CFClient::Layout self, int x, int y) 1151xy_to_index (CFPlus::Layout self, int x, int y)
1010 CODE: 1152 CODE:
1011{ 1153{
1012 int index, trailing; 1154 int index, trailing;
1013 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1155 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014 RETVAL = index; 1156 RETVAL = index + trailing;
1015} 1157}
1016 OUTPUT: 1158 OUTPUT:
1017 RETVAL 1159 RETVAL
1018 1160
1019void 1161void
1020cursor_pos (CFClient::Layout self, int index) 1162cursor_pos (CFPlus::Layout self, int index)
1021 PPCODE: 1163 PPCODE:
1022{ 1164{
1023 PangoRectangle strong_pos; 1165 PangoRectangle strong_pos;
1024 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1166 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025 1167
1028 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1170 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1171 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030} 1172}
1031 1173
1032void 1174void
1033render (CFClient::Layout self) 1175index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034 PPCODE: 1176 PPCODE:
1035{ 1177{
1036 SV *retval; 1178 int line, x;
1037 int w, h;
1038 1179
1039 layout_get_pixel_size (self, &w, &h); 1180 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1181 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1040 1182
1041 if (self->rgba)
1042 {
1043 cairo_surface_t *surface;
1044 cairo_t *cairo;
1045
1046 retval = newSV (w * h * 4);
1047 SvPOK_only (retval);
1048 SvCUR_set (retval, w * h * 4);
1049
1050 memset (SvPVX (retval), 0, w * h * 4);
1051
1052 surface = cairo_image_surface_create_for_data (
1053 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1054 cairo = cairo_create (surface);
1055 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057 pango_cairo_show_layout (cairo, self->pl);
1058
1059 cairo_destroy (cairo);
1060 cairo_surface_destroy (surface);
1061
1062 // what a mess, and its premultiplied, too :(
1063 {
1064 uint32_t *p = (uint32_t *)SvPVX (retval);
1065 uint32_t *e = p + w * h;
1066
1067 while (p < e)
1068 {
1069 uint32_t rgba = *p;
1070 rgba = (rgba >> 24) | (rgba << 8);
1071#if 0
1072#ifdef _WIN32
1073 {//D
1074 uint8_t r = rgba >> 24;
1075 uint8_t g = rgba >> 16;
1076 uint8_t b = rgba >> 8;
1077 uint8_t a = rgba >> 0;
1078
1079 rgba = (rgba & 0xffffff00) | a;
1080 }
1081#endif
1082#endif
1083 rgba = SDL_SwapBE32 (rgba);
1084 *p++ = rgba;
1085 }
1086 }
1087
1088 EXTEND (SP, 5); 1183 EXTEND (SP, 2);
1089 PUSHs (sv_2mortal (newSViv (w))); 1184 PUSHs (sv_2mortal (newSViv (line - 1)));
1185 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1186}
1187
1188void
1189line_x_to_index (CFPlus::Layout self, int line, int x)
1190 PPCODE:
1191{
1192 PangoLayoutLine *lp;
1193 int index, trailing;
1194
1195 if (line < 0)
1196 XSRETURN_EMPTY;
1197
1198 if (!(lp = pango_layout_get_line (self->pl, line)))
1199 XSRETURN_EMPTY; /* do better */
1200
1201 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1202
1203 EXTEND (SP, 2);
1204 if (GIMME_V == G_SCALAR)
1090 PUSHs (sv_2mortal (newSViv (h))); 1205 PUSHs (sv_2mortal (newSViv (index + trailing)));
1091 PUSHs (sv_2mortal (retval));
1092 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094 }
1095 else 1206 else
1096 { 1207 {
1097 FT_Bitmap bitmap;
1098
1099 retval = newSV (w * h);
1100 SvPOK_only (retval);
1101 SvCUR_set (retval, w * h);
1102
1103 bitmap.rows = h;
1104 bitmap.width = w;
1105 bitmap.pitch = w;
1106 bitmap.buffer = (unsigned char*)SvPVX (retval);
1107 bitmap.num_grays = 256;
1108 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110 memset (bitmap.buffer, 0, w * h);
1111
1112 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114 EXTEND (SP, 5);
1115 PUSHs (sv_2mortal (newSViv (w))); 1208 PUSHs (sv_2mortal (newSViv (index)));
1116 PUSHs (sv_2mortal (newSViv (h))); 1209 PUSHs (sv_2mortal (newSViv (trailing)));
1117 PUSHs (sv_2mortal (retval));
1118 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120 } 1210 }
1121} 1211}
1122 1212
1213void
1214render (CFPlus::Layout self, float x, float y, int flags = 0)
1215 PPCODE:
1216 pango_opengl_render_layout_subpixel (
1217 self->pl,
1218 x * PANGO_SCALE, y * PANGO_SCALE,
1219 self->r, self->g, self->b, self->a,
1220 flags
1221 );
1222
1123MODULE = CFClient PACKAGE = CFClient::Texture 1223MODULE = CFPlus PACKAGE = CFPlus::Texture
1124 1224
1125void 1225void
1126pad2pot (SV *data_, SV *w_, SV *h_) 1226pad2pot (SV *data_, SV *w_, SV *h_)
1127 CODE: 1227 CODE:
1128{ 1228{
1206 glDisable (GL_ALPHA_TEST); 1306 glDisable (GL_ALPHA_TEST);
1207 glDisable (GL_BLEND); 1307 glDisable (GL_BLEND);
1208 } 1308 }
1209} 1309}
1210 1310
1211MODULE = CFClient PACKAGE = CFClient::Map 1311MODULE = CFPlus PACKAGE = CFPlus::Map
1212 1312
1213CFClient::Map 1313CFPlus::Map
1214new (SV *class, int map_width, int map_height) 1314new (SV *class)
1215 CODE: 1315 CODE:
1216 New (0, RETVAL, 1, struct map); 1316 New (0, RETVAL, 1, struct map);
1217 RETVAL->x = 0; 1317 RETVAL->x = 0;
1218 RETVAL->y = 0; 1318 RETVAL->y = 0;
1219 RETVAL->w = map_width; 1319 RETVAL->w = 0;
1220 RETVAL->h = map_height; 1320 RETVAL->h = 0;
1221 RETVAL->ox = 0; 1321 RETVAL->ox = 0;
1222 RETVAL->oy = 0; 1322 RETVAL->oy = 0;
1223 RETVAL->faces = 8192; 1323 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1224 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1324 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1225 RETVAL->texs = 8192;
1226 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1227 RETVAL->rows = 0; 1325 RETVAL->rows = 0;
1228 RETVAL->row = 0; 1326 RETVAL->row = 0;
1229 OUTPUT: 1327 OUTPUT:
1230 RETVAL 1328 RETVAL
1231 1329
1232void 1330void
1233DESTROY (CFClient::Map self) 1331DESTROY (CFPlus::Map self)
1234 CODE: 1332 CODE:
1235{ 1333{
1236 map_clear (self); 1334 map_clear (self);
1237 Safefree (self->face); 1335 Safefree (self->face2tile);
1238 Safefree (self->tex); 1336 Safefree (self->tex);
1239 Safefree (self); 1337 Safefree (self);
1240} 1338}
1241 1339
1242void 1340void
1341resize (CFPlus::Map self, int map_width, int map_height)
1342 CODE:
1343 self->w = map_width;
1344 self->h = map_height;
1345
1346void
1243clear (CFClient::Map self) 1347clear (CFPlus::Map self)
1244 CODE: 1348 CODE:
1245 map_clear (self); 1349 map_clear (self);
1246 1350
1247void 1351void
1248set_face (CFClient::Map self, int face, int texid) 1352set_tileid (CFPlus::Map self, int face, int tile)
1249 CODE: 1353 CODE:
1250{ 1354{
1251 while (self->faces <= face) 1355 need_facenum (self, face); self->face2tile [face] = tile;
1252 { 1356 need_texid (self, tile);
1253 Append (mapface, self->face, self->faces, self->faces);
1254 self->faces *= 2;
1255 }
1256
1257 self->face [face] = texid;
1258} 1357}
1259 1358
1260void 1359void
1360set_smooth (CFPlus::Map self, int face, int smooth, int level)
1361 CODE:
1362{
1363 tileid texid;
1364 maptex *tex;
1365
1366 if (face < 0 || face >= self->faces)
1367 return;
1368
1369 if (smooth < 0 || smooth >= self->faces)
1370 return;
1371
1372 texid = self->face2tile [face];
1373
1374 if (!texid)
1375 return;
1376
1377 tex = self->tex + texid;
1378 tex->smoothtile = self->face2tile [smooth];
1379 tex->smoothlevel = level;
1380}
1381
1382void
1261set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1383set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1262 CODE: 1384 CODE:
1263{ 1385{
1264 while (self->texs <= texid) 1386 need_texid (self, texid);
1265 {
1266 Append (maptex, self->tex, self->texs, self->texs);
1267 self->texs *= 2;
1268 }
1269 1387
1270 { 1388 {
1271 maptex *tex = self->tex + texid; 1389 maptex *tex = self->tex + texid;
1272 1390
1273 tex->name = name; 1391 tex->name = name;
1290 // from transparent color bleeding and ugly wrapping effects. 1408 // from transparent color bleeding and ugly wrapping effects.
1291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1409 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292} 1410}
1293 1411
1294int 1412int
1295ox (CFClient::Map self) 1413ox (CFPlus::Map self)
1296 ALIAS: 1414 ALIAS:
1297 oy = 1 1415 oy = 1
1298 x = 2 1416 x = 2
1299 y = 3 1417 y = 3
1300 w = 4 1418 w = 4
1311 } 1429 }
1312 OUTPUT: 1430 OUTPUT:
1313 RETVAL 1431 RETVAL
1314 1432
1315void 1433void
1316scroll (CFClient::Map self, int dx, int dy) 1434scroll (CFPlus::Map self, int dx, int dy)
1317 CODE: 1435 CODE:
1318{ 1436{
1319 if (dx > 0) 1437 if (dx > 0)
1320 map_blank (self, self->x, self->y, dx - 1, self->h); 1438 map_blank (self, self->x, self->y, dx, self->h);
1321 else if (dx < 0) 1439 else if (dx < 0)
1322 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1440 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1323 1441
1324 if (dy > 0) 1442 if (dy > 0)
1325 map_blank (self, self->x, self->y, self->w, dy - 1); 1443 map_blank (self, self->x, self->y, self->w, dy);
1326 else if (dy < 0) 1444 else if (dy < 0)
1327 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1445 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1328 1446
1329 self->ox += dx; self->x += dx; 1447 self->ox += dx; self->x += dx;
1330 self->oy += dy; self->y += dy; 1448 self->oy += dy; self->y += dy;
1331 1449
1332 while (self->y < 0) 1450 while (self->y < 0)
1337 self->y += MAP_EXTEND_Y; 1455 self->y += MAP_EXTEND_Y;
1338 } 1456 }
1339} 1457}
1340 1458
1341void 1459void
1342map1a_update (CFClient::Map self, SV *data_) 1460map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343 CODE: 1461 CODE:
1344{ 1462{
1345 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1463 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346 uint8_t *data_end = (uint8_t *)SvEND (data_); 1464 uint8_t *data_end = (uint8_t *)SvEND (data_);
1347 mapcell *cell; 1465 mapcell *cell;
1348 int x, y, flags; 1466 int x, y, flags;
1349 1467
1350 while (data < data_end) 1468 while (data < data_end - 1)
1351 { 1469 {
1352 flags = (data [0] << 8) + data [1]; data += 2; 1470 flags = (data [0] << 8) + data [1]; data += 2;
1353 1471
1354 x = self->x + ((flags >> 10) & 63); 1472 x = self->x + ((flags >> 10) & 63);
1355 y = self->y + ((flags >> 4) & 63); 1473 y = self->y + ((flags >> 4) & 63);
1356 1474
1357 cell = map_get_cell (self, x, y); 1475 cell = map_get_cell (self, x, y);
1358 1476
1359 if (flags & 15) 1477 if (flags & 15)
1360 { 1478 {
1361 if (cell->darkness < 0) 1479 if (!cell->darkness)
1362 { 1480 {
1481 memset (cell, 0, sizeof (*cell));
1363 cell->darkness = 0; 1482 cell->darkness = 256;
1364 cell->face [0] = 0;
1365 cell->face [1] = 0;
1366 cell->face [2] = 0;
1367 } 1483 }
1368 1484
1369 cell->darkness = flags & 8 ? *data++ : 255;
1370
1371 //TODO: don't trust server data to be in-range(!) 1485 //TODO: don't trust server data to be in-range(!)
1486
1487 if (flags & 8)
1488 {
1489 if (extmap)
1490 {
1491 uint8_t ext, cmd;
1492
1493 do
1494 {
1495 ext = *data++;
1496 cmd = ext & 0x3f;
1497
1498 if (cmd < 4)
1499 cell->darkness = 255 - ext * 64 + 1;
1500 else if (cmd == 5) // health
1501 {
1502 cell->stat_width = 1;
1503 cell->stat_hp = *data++;
1504 }
1505 else if (cmd == 6) // monster width
1506 cell->stat_width = *data++ + 1;
1507 else if (cmd == 0x47)
1508 {
1509 if (*data == 4)
1510 ; // decode player count
1511
1512 data += *data + 1;
1513 }
1514 else if (cmd == 8) // cell flags
1515 cell->flags = *data++;
1516 else if (ext & 0x40) // unknown, multibyte => skip
1517 data += *data + 1;
1518 else
1519 data++;
1520 }
1521 while (ext & 0x80);
1522 }
1523 else
1524 cell->darkness = *data++ + 1;
1525 }
1372 1526
1373 if (flags & 4) 1527 if (flags & 4)
1374 { 1528 {
1375 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [0] = self->face2tile [face];
1376 } 1532 }
1377 1533
1378 if (flags & 2) 1534 if (flags & 2)
1379 { 1535 {
1380 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1536 faceid face = (data [0] << 8) + data [1]; data += 2;
1537 need_facenum (self, face);
1538 cell->tile [1] = self->face2tile [face];
1381 } 1539 }
1382 1540
1383 if (flags & 1) 1541 if (flags & 1)
1384 { 1542 {
1385 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1543 faceid face = (data [0] << 8) + data [1]; data += 2;
1544 need_facenum (self, face);
1545 cell->tile [2] = self->face2tile [face];
1386 } 1546 }
1387 } 1547 }
1388 else 1548 else
1389 cell->darkness = -1; 1549 cell->darkness = 0;
1390 } 1550 }
1391} 1551}
1392 1552
1393SV * 1553SV *
1394mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1554mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395 CODE: 1555 CODE:
1396{ 1556{
1397 int x1, x; 1557 int x1, x;
1398 int y1, y; 1558 int y1, y;
1399 int z; 1559 int z;
1420 { 1580 {
1421 mapcell *cell = row->col + (x - row->c0); 1581 mapcell *cell = row->col + (x - row->c0);
1422 1582
1423 for (z = 0; z <= 0; z++) 1583 for (z = 0; z <= 0; z++)
1424 { 1584 {
1425 mapface face = cell->face [z];
1426
1427 if (face)
1428 {
1429 maptex tex = self->tex [face]; 1585 maptex tex = self->tex [cell->tile [z]];
1430 int a0 = 255 - tex.a; 1586 int a0 = 255 - tex.a;
1431 int a1 = tex.a; 1587 int a1 = tex.a;
1432 1588
1433 r = (r * a0 + tex.r * a1) / 255; 1589 r = (r * a0 + tex.r * a1) / 255;
1434 g = (g * a0 + tex.g * a1) / 255; 1590 g = (g * a0 + tex.g * a1) / 255;
1435 b = (b * a0 + tex.b * a1) / 255; 1591 b = (b * a0 + tex.b * a1) / 255;
1436 a = (a * a0 + tex.a * a1) / 255; 1592 a = (a * a0 + tex.a * a1) / 255;
1437 }
1438 } 1593 }
1439 } 1594 }
1440 1595
1441 *map++ = (r ) 1596 *map++ = (r )
1442 | (g << 8) 1597 | (g << 8)
1449} 1604}
1450 OUTPUT: 1605 OUTPUT:
1451 RETVAL 1606 RETVAL
1452 1607
1453void 1608void
1454draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1609draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1455 CODE: 1610 CODE:
1456{ 1611{
1457 int vx, vy; 1612 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1613 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1614 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1615 smooth_key skey;
1458 int x, y, z; 1616 int x, y, z;
1459 int last_name; 1617 int last_name;
1460 mapface face;
1461 1618
1462 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1619 // thats current max. sorry.
1463 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1620 if (sw > 255) sw = 255;
1621 if (sh > 255) sh = 255;
1464 1622
1465 /* 1623 // clear key, in case of extra padding
1466 int vx = self->vx = self->w >= sw 1624 memset (&skey, 0, sizeof (skey));
1467 ? self->x + (self->w - sw) / 2
1468 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470 int vy = self->vy = self->h >= sh
1471 ? self->y + (self->h - sh) / 2
1472 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473 */
1474 1625
1475 glColor4ub (255, 255, 255, 255); 1626 glColor4ub (255, 255, 255, 255);
1476 1627
1477 glEnable (GL_BLEND); 1628 glEnable (GL_BLEND);
1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1629 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1481 1632
1482 glBegin (GL_QUADS); 1633 glBegin (GL_QUADS);
1483 1634
1484 last_name = 0; 1635 last_name = 0;
1485 1636
1637 mx += self->x;
1638 my += self->y;
1639
1640 // first pass: determine smooth_max
1641 // rather ugly, if you ask me
1642 // could also be stored inside mapcell and updated on change
1643 memset (smooth_max, 0, sizeof (smooth_max));
1644
1645 for (y = 0; y < sh; y++)
1646 if (0 <= y + my && y + my < self->rows)
1647 {
1648 maprow *row = self->row + (y + my);
1649
1650 for (x = 0; x < sw; x++)
1651 if (row->c0 <= x + mx && x + mx < row->c1)
1652 {
1653 mapcell *cell = row->col + (x + mx - row->c0);
1654
1655 smooth_max[x + 1][y + 1] =
1656 MAX (self->tex [cell->tile [0]].smoothlevel,
1657 MAX (self->tex [cell->tile [1]].smoothlevel,
1658 self->tex [cell->tile [2]].smoothlevel));
1659 }
1660 }
1661
1486 for (z = 0; z < 3; z++) 1662 for (z = 0; z <= 2; z++)
1663 {
1664 memset (smooth_level, 0, sizeof (smooth_level));
1665
1487 for (y = 0; y < sh; y++) 1666 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows) 1667 if (0 <= y + my && y + my < self->rows)
1489 { 1668 {
1490 maprow *row = self->row + (y + vy); 1669 maprow *row = self->row + (y + my);
1491 1670
1492 for (x = 0; x < sw; x++) 1671 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1) 1672 if (row->c0 <= x + mx && x + mx < row->c1)
1494 { 1673 {
1495 mapcell *cell = row->col + (x + vx - row->c0); 1674 mapcell *cell = row->col + (x + mx - row->c0);
1496
1497 face = cell->face [z]; 1675 tileid tile = cell->tile [z];
1498 1676
1499 if (face) 1677 if (tile)
1678 {
1679 maptex tex = self->tex [tile];
1680 int px = (x + 1) * T - tex.w;
1681 int py = (y + 1) * T - tex.h;
1682
1683 // suppressing texture state switches here
1684 // is only moderately effective, but worth the extra effort
1685 if (last_name != tex.name)
1686 {
1687 if (!tex.name)
1688 tex = self->tex [2]; /* missing, replace by noface */
1689
1690 glEnd ();
1691 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1692 glBegin (GL_QUADS);
1693 }
1694
1695 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1696 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1697 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1698 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1699
1700 if (cell->flags && z == 2)
1701 {
1702 if (cell->flags & 1)
1703 {
1704 maptex tex = self->tex [1];
1705 int px = x * T + T * 2 / 32;
1706 int py = y * T - T * 6 / 32;
1707
1708 glEnd ();
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711
1712 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1713 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1714 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1715 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1716 }
1717 }
1718
1719 // update smooth hash
1720 if (tex.smoothtile)
1721 {
1722 skey.tile = tex.smoothtile;
1723 skey.level = tex.smoothlevel;
1724
1725 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1726
1727 // add bits to current tile and all neighbours. skey.x|y is
1728 // shifted +1|+1 so we always stay positive.
1729
1730 // bits is ___n cccc CCCC bbbb
1731 // n do not draw borders&corners
1732 // c draw these corners, but...
1733 // C ... not these
1734 // b draw these borders
1735
1736 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1737 // ┃· ·· ·┃ ━━
1738
1739 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1740 // ·· ·· ·┏ ┓·
1741
1742 // full tile
1743 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1744
1745 // borders
1746 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1747 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1748 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1749 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1750
1751 // corners
1752 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1753 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1754 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1755 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1756 }
1757 }
1758 }
1759 }
1760
1761 // go through all smoothlevels, lowest to highest, then draw.
1762 // this is basically counting sort
1763 {
1764 int w, b;
1765
1766 for (w = 0; w < 256 / 32; ++w)
1767 {
1768 uint32_t smask = smooth_level [w];
1769 if (smask)
1770 for (b = 0; b < 32; ++b)
1771 if (smask & (((uint32_t)1) << b))
1500 { 1772 {
1501 maptex tex = self->tex [face]; 1773 int level = (w << 5) | b;
1774 HE *he;
1502 1775
1503 int px = (x + 1) * 32 - tex.w; 1776 hv_iterinit (smooth);
1504 int py = (y + 1) * 32 - tex.h; 1777 while ((he = hv_iternext (smooth)))
1505
1506 if (last_name != tex.name)
1507 { 1778 {
1779 smooth_key *skey = (smooth_key *)HeKEY (he);
1780 IV bits = SvIVX (HeVAL (he));
1781
1782 if (!(bits & 0x1000)
1783 && skey->level == level
1784 && level > smooth_max [skey->x][skey->y])
1785 {
1786 maptex tex = self->tex [skey->tile];
1787 int px = (((int)skey->x) - 1) * T;
1788 int py = (((int)skey->y) - 1) * T;
1789 int border = bits & 15;
1790 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1791 float dx = tex.s * .0625f; // 16 images/row
1792 float dy = tex.t * .5f ; // 2 images/column
1793
1794 // this time naively avoiding texture state changes
1795 // save gobs of state changes.
1796 if (last_name != tex.name)
1797 {
1798 if (!tex.name)
1799 continue; // smoothing not yet available
1800
1508 glEnd (); 1801 glEnd ();
1509 last_name = tex.name;
1510 glBindTexture (GL_TEXTURE_2D, last_name); 1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511 glBegin (GL_QUADS); 1803 glBegin (GL_QUADS);
1804 }
1805
1806 if (border)
1807 {
1808 float ox = border * dx;
1809
1810 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1811 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1812 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1813 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1814 }
1815
1816 if (corner)
1817 {
1818 float ox = corner * dx;
1819
1820 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1821 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1822 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1823 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1824 }
1825 }
1512 } 1826 }
1513
1514 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518 } 1827 }
1519 }
1520 } 1828 }
1829 }
1830
1831 hv_clear (smooth);
1832 }
1521 1833
1522 glEnd (); 1834 glEnd ();
1523 1835
1524 glDisable (GL_TEXTURE_2D); 1836 glDisable (GL_TEXTURE_2D);
1525 glDisable (GL_BLEND); 1837 glDisable (GL_BLEND);
1526}
1527 1838
1839 // top layer: overlays such as the health bar
1840 for (y = 0; y < sh; y++)
1841 if (0 <= y + my && y + my < self->rows)
1842 {
1843 maprow *row = self->row + (y + my);
1844
1845 for (x = 0; x < sw; x++)
1846 if (row->c0 <= x + mx && x + mx < row->c1)
1847 {
1848 mapcell *cell = row->col + (x + mx - row->c0);
1849
1850 int px = x * T;
1851 int py = y * T;
1852
1853 if (cell->stat_hp)
1854 {
1855 int width = cell->stat_width * T;
1856 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1857
1858 glColor3ub (0, 0, 0);
1859 glRectf (px + 1, py - thick - 2,
1860 px + width - 1, py);
1861
1862 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1863 glRectf (px + 2,
1864 py - thick - 1,
1865 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1866 }
1867 }
1868 }
1869}
1870
1528void 1871void
1529draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1872draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530 CODE: 1873 CODE:
1531{ 1874{
1532 static float color[16][3] = { 1875 static float color[16][3] = {
1533 { 0.00, 0.00, 0.00 }, 1876 { 0.00F, 0.00F, 0.00F },
1534 { 1.00, 1.00, 1.00 }, 1877 { 1.00F, 1.00F, 1.00F },
1535 { 0.00, 0.00, 0.55 }, 1878 { 0.00F, 0.00F, 0.55F },
1536 { 1.00, 0.00, 0.00 }, 1879 { 1.00F, 0.00F, 0.00F },
1537 1880
1538 { 1.00, 0.54, 0.00 }, 1881 { 1.00F, 0.54F, 0.00F },
1539 { 0.11, 0.56, 1.00 }, 1882 { 0.11F, 0.56F, 1.00F },
1540 { 0.93, 0.46, 0.00 }, 1883 { 0.93F, 0.46F, 0.00F },
1541 { 0.18, 0.54, 0.34 }, 1884 { 0.18F, 0.54F, 0.34F },
1542 1885
1543 { 0.56, 0.73, 0.56 }, 1886 { 0.56F, 0.73F, 0.56F },
1544 { 0.80, 0.80, 0.80 }, 1887 { 0.80F, 0.80F, 0.80F },
1545 { 0.55, 0.41, 0.13 }, 1888 { 0.55F, 0.41F, 0.13F },
1546 { 0.99, 0.77, 0.26 }, 1889 { 0.99F, 0.77F, 0.26F },
1547 1890
1548 { 0.74, 0.65, 0.41 }, 1891 { 0.74F, 0.65F, 0.41F },
1549 1892
1550 { 0.00, 1.00, 1.00 }, 1893 { 0.00F, 1.00F, 1.00F },
1551 { 1.00, 0.00, 1.00 }, 1894 { 1.00F, 0.00F, 1.00F },
1552 { 1.00, 1.00, 0.00 }, 1895 { 1.00F, 1.00F, 0.00F },
1553 }; 1896 };
1554 1897
1555 int x, y; 1898 int x, y;
1556 1899
1557 glEnable (GL_TEXTURE_2D); 1900 glEnable (GL_TEXTURE_2D);
1584 glDisable (GL_BLEND); 1927 glDisable (GL_BLEND);
1585 glDisable (GL_TEXTURE_2D); 1928 glDisable (GL_TEXTURE_2D);
1586} 1929}
1587 1930
1588void 1931void
1589fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1932fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590 PPCODE: 1933 PPCODE:
1591{ 1934{
1592 int vx, vy;
1593 int x, y; 1935 int x, y;
1594 int sw4 = (sw + 3) & ~3; 1936 int sw4 = (sw + 3) & ~3;
1595 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1937 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1938 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597 1939
1598 memset (darkness, 255, sw4 * sh); 1940 memset (darkness, 255, sw4 * sh);
1599 SvPOK_only (darkness_sv); 1941 SvPOK_only (darkness_sv);
1600 SvCUR_set (darkness_sv, sw4 * sh); 1942 SvCUR_set (darkness_sv, sw4 * sh);
1601 1943
1602 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1944 mx += self->x;
1603 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1945 my += self->y;
1604 1946
1605 for (y = 0; y < sh; y++) 1947 for (y = 0; y < sh; y++)
1606 if (0 <= y + vy && y + vy < self->rows) 1948 if (0 <= y + my && y + my < self->rows)
1607 { 1949 {
1608 maprow *row = self->row + (y + vy); 1950 maprow *row = self->row + (y + my);
1609 1951
1610 for (x = 0; x < sw; x++) 1952 for (x = 0; x < sw; x++)
1611 if (row->c0 <= x + vx && x + vx < row->c1) 1953 if (row->c0 <= x + mx && x + mx < row->c1)
1612 { 1954 {
1613 mapcell *cell = row->col + (x + vx - row->c0); 1955 mapcell *cell = row->col + (x + mx - row->c0);
1614 1956
1615 darkness[y * sw4 + x] = cell->darkness < 0 1957 darkness[y * sw4 + x] = cell->darkness
1958 ? 255 - (cell->darkness - 1)
1616 ? 255 - FOW_DARKNESS 1959 : 255 - FOW_DARKNESS;
1617 : 255 - cell->darkness;
1618 } 1960 }
1619 } 1961 }
1620 1962
1621 EXTEND (SP, 3); 1963 EXTEND (SP, 3);
1622 PUSHs (sv_2mortal (newSViv (sw4))); 1964 PUSHs (sv_2mortal (newSViv (sw4)));
1623 PUSHs (sv_2mortal (newSViv (sh))); 1965 PUSHs (sv_2mortal (newSViv (sh)));
1624 PUSHs (darkness_sv); 1966 PUSHs (darkness_sv);
1625} 1967}
1626 1968
1627SV * 1969SV *
1628get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1970get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629 CODE: 1971 CODE:
1630{ 1972{
1631 int x, y, x1, y1; 1973 int x, y, x1, y1;
1632 SV *data_sv = newSV (w * h * 7 + 5); 1974 SV *data_sv = newSV (w * h * 7 + 5);
1633 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1975 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1658 if (row && row->c0 <= x && x < row->c1) 2000 if (row && row->c0 <= x && x < row->c1)
1659 { 2001 {
1660 mapcell *cell = row->col + (x - row->c0); 2002 mapcell *cell = row->col + (x - row->c0);
1661 uint8_t flags = 0; 2003 uint8_t flags = 0;
1662 2004
1663 if (cell->face [0]) flags |= 1; 2005 if (cell->tile [0]) flags |= 1;
1664 if (cell->face [1]) flags |= 2; 2006 if (cell->tile [1]) flags |= 2;
1665 if (cell->face [2]) flags |= 4; 2007 if (cell->tile [2]) flags |= 4;
1666 2008
1667 *data++ = flags; 2009 *data++ = flags;
1668 2010
1669 if (flags & 1) 2011 if (flags & 1)
1670 { 2012 {
2013 tileid tile = cell->tile [0];
1671 *data++ = cell->face [0] >> 8; 2014 *data++ = tile >> 8;
1672 *data++ = cell->face [0]; 2015 *data++ = tile;
1673 } 2016 }
1674 2017
1675 if (flags & 2) 2018 if (flags & 2)
1676 { 2019 {
2020 tileid tile = cell->tile [1];
1677 *data++ = cell->face [1] >> 8; 2021 *data++ = tile >> 8;
1678 *data++ = cell->face [1]; 2022 *data++ = tile;
1679 } 2023 }
1680 2024
1681 if (flags & 4) 2025 if (flags & 4)
1682 { 2026 {
2027 tileid tile = cell->tile [2];
1683 *data++ = cell->face [2] >> 8; 2028 *data++ = tile >> 8;
1684 *data++ = cell->face [2]; 2029 *data++ = tile;
1685 } 2030 }
1686 } 2031 }
1687 else 2032 else
1688 *data++ = 0; 2033 *data++ = 0;
1689 } 2034 }
1695} 2040}
1696 OUTPUT: 2041 OUTPUT:
1697 RETVAL 2042 RETVAL
1698 2043
1699void 2044void
1700set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2045set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701 PPCODE: 2046 PPCODE:
1702{ 2047{
1703 int x, y, z; 2048 int x, y, z;
1704 int w, h; 2049 int w, h;
1705 int x1, y1; 2050 int x1, y1;
1729 { 2074 {
1730 uint8_t flags = *data++; 2075 uint8_t flags = *data++;
1731 2076
1732 if (flags) 2077 if (flags)
1733 { 2078 {
1734 mapface face[3] = { 0, 0, 0 };
1735
1736 mapcell *cell = row_get_cell (row, x); 2079 mapcell *cell = row_get_cell (row, x);
2080 tileid tile[3] = { 0, 0, 0 };
1737 2081
1738 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2082 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1739 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2083 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1740 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2084 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1741 2085
1742 if (cell->darkness <= 0) 2086 if (cell->darkness == 0)
1743 { 2087 {
1744 cell->darkness = -1; 2088 cell->darkness = 0;
1745 2089
1746 for (z = 0; z <= 2; z++) 2090 for (z = 0; z <= 2; z++)
1747 { 2091 {
1748 cell->face[z] = face[z]; 2092 tileid t = tile [z];
1749 2093
1750 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2094 if (t >= self->texs || (t && !self->tex [t].name))
2095 {
1751 XPUSHs (sv_2mortal (newSViv (face[z]))); 2096 XPUSHs (sv_2mortal (newSViv (t)));
2097 need_texid (self, t);
2098 }
2099
2100 cell->tile [z] = t;
1752 } 2101 }
1753 } 2102 }
1754 } 2103 }
1755 } 2104 }
1756 } 2105 }
1757} 2106}
1758 2107
1759MODULE = CFClient PACKAGE = CFClient::MixChunk 2108MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760 2109
1761CFClient::MixChunk 2110CFPlus::MixChunk
1762new_from_file (SV *class, char *path) 2111new_from_file (SV *class, char *path)
1763 CODE: 2112 CODE:
1764 RETVAL = Mix_LoadWAV (path); 2113 RETVAL = Mix_LoadWAV (path);
1765 OUTPUT: 2114 OUTPUT:
1766 RETVAL 2115 RETVAL
1767 2116
1768void 2117void
1769DESTROY (CFClient::MixChunk self) 2118DESTROY (CFPlus::MixChunk self)
1770 CODE: 2119 CODE:
1771 Mix_FreeChunk (self); 2120 Mix_FreeChunk (self);
1772 2121
1773int 2122int
1774volume (CFClient::MixChunk self, int volume = -1) 2123volume (CFPlus::MixChunk self, int volume = -1)
1775 CODE: 2124 CODE:
1776 RETVAL = Mix_VolumeChunk (self, volume); 2125 RETVAL = Mix_VolumeChunk (self, volume);
1777 OUTPUT: 2126 OUTPUT:
1778 RETVAL 2127 RETVAL
1779 2128
1780int 2129int
1781play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2130play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782 CODE: 2131 CODE:
1783 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2132 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784 OUTPUT: 2133 OUTPUT:
1785 RETVAL 2134 RETVAL
1786 2135
1787MODULE = CFClient PACKAGE = CFClient::MixMusic 2136MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788 2137
1789int 2138int
1790volume (int volume = -1) 2139volume (int volume = -1)
1791 CODE: 2140 CODE:
1792 RETVAL = Mix_VolumeMusic (volume); 2141 RETVAL = Mix_VolumeMusic (volume);
1793 OUTPUT: 2142 OUTPUT:
1794 RETVAL 2143 RETVAL
1795 2144
2145int
2146fade_out (int ms)
2147 CODE:
2148 RETVAL = Mix_FadeOutMusic (ms);
2149 OUTPUT:
2150 RETVAL
2151
1796CFClient::MixMusic 2152CFPlus::MixMusic
1797new_from_file (SV *class, char *path) 2153new_from_file (SV *class, char *path)
1798 CODE: 2154 CODE:
1799 RETVAL = Mix_LoadMUS (path); 2155 RETVAL = Mix_LoadMUS (path);
1800 OUTPUT: 2156 OUTPUT:
1801 RETVAL 2157 RETVAL
1802 2158
1803void 2159void
1804DESTROY (CFClient::MixMusic self) 2160DESTROY (CFPlus::MixMusic self)
1805 CODE: 2161 CODE:
1806 Mix_FreeMusic (self); 2162 Mix_FreeMusic (self);
1807 2163
1808int 2164int
1809play (CFClient::MixMusic self, int loops = -1) 2165play (CFPlus::MixMusic self, int loops = -1)
1810 CODE: 2166 CODE:
1811 RETVAL = Mix_PlayMusic (self, loops); 2167 RETVAL = Mix_PlayMusic (self, loops);
1812 OUTPUT: 2168 OUTPUT:
1813 RETVAL 2169 RETVAL
1814 2170
1815MODULE = CFClient PACKAGE = CFClient::OpenGL 2171MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816 2172
1817BOOT: 2173BOOT:
1818{ 2174{
1819 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2175 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820 static const struct { 2176 static const struct {
1821 const char *name; 2177 const char *name;
1822 IV iv; 2178 IV iv;
1823 } *civ, const_iv[] = { 2179 } *civ, const_iv[] = {
1824# define const_iv(name) { # name, (IV)name } 2180# define const_iv(name) { # name, (IV)name }
1887 const_iv (GL_SEPARABLE_2D), 2243 const_iv (GL_SEPARABLE_2D),
1888 const_iv (GL_CONVOLUTION_2D), 2244 const_iv (GL_CONVOLUTION_2D),
1889 const_iv (GL_CONVOLUTION_BORDER_MODE), 2245 const_iv (GL_CONVOLUTION_BORDER_MODE),
1890 const_iv (GL_CONSTANT_BORDER), 2246 const_iv (GL_CONSTANT_BORDER),
1891 const_iv (GL_LINES), 2247 const_iv (GL_LINES),
2248 const_iv (GL_LINE_STRIP),
1892 const_iv (GL_LINE_LOOP), 2249 const_iv (GL_LINE_LOOP),
1893 const_iv (GL_QUADS), 2250 const_iv (GL_QUADS),
1894 const_iv (GL_QUAD_STRIP), 2251 const_iv (GL_QUAD_STRIP),
1895 const_iv (GL_TRIANGLES), 2252 const_iv (GL_TRIANGLES),
1896 const_iv (GL_TRIANGLE_STRIP), 2253 const_iv (GL_TRIANGLE_STRIP),
1904# undef const_iv 2261# undef const_iv
1905 }; 2262 };
1906 2263
1907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2264 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1908 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2265 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2266
2267 texture_av = newAV ();
2268 AvREAL_off (texture_av);
1909} 2269}
1910 2270
1911char * 2271char *
1912gl_vendor () 2272gl_vendor ()
1913 CODE: 2273 CODE:
2006 r *= a; 2366 r *= a;
2007 g *= a; 2367 g *= a;
2008 b *= a; 2368 b *= a;
2009 } 2369 }
2010 // microsoft visual "c" rounds instead of truncating... 2370 // microsoft visual "c" rounds instead of truncating...
2011 glColor4ub (MIN ((int)(r * 256.f), 255), 2371 glColor4f (r, g, b, a);
2012 MIN ((int)(g * 256.f), 255),
2013 MIN ((int)(b * 256.f), 255),
2014 MIN ((int)(a * 256.f), 255));
2015 2372
2016void glInterleavedArrays (int format, int stride, char *data) 2373void glInterleavedArrays (int format, int stride, char *data)
2017 2374
2018void glDrawElements (int mode, int count, int type, char *indices) 2375void glDrawElements (int mode, int count, int type, char *indices)
2019 2376
2065 2422
2066void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2423void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2067 2424
2068int glGenTexture () 2425int glGenTexture ()
2069 CODE: 2426 CODE:
2070{ 2427 RETVAL = gen_texture ();
2071 GLuint name;
2072 glGenTextures (1, &name);
2073 RETVAL = name;
2074}
2075 OUTPUT: 2428 OUTPUT:
2076 RETVAL 2429 RETVAL
2077 2430
2078void glDeleteTexture (int name) 2431void glDeleteTexture (int name)
2079 CODE: 2432 CODE:
2080{
2081 GLuint name_ = name;
2082 glDeleteTextures (1, &name_); 2433 del_texture (name);
2083} 2434
2084
2085int glGenList () 2435int glGenList ()
2086 CODE: 2436 CODE:
2087 RETVAL = glGenLists (1); 2437 RETVAL = glGenLists (1);
2088 OUTPUT: 2438 OUTPUT:
2089 RETVAL 2439 RETVAL
2096 2446
2097void glEndList () 2447void glEndList ()
2098 2448
2099void glCallList (int list) 2449void glCallList (int list)
2100 2450
2101

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines