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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines