ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines