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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines