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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines