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.108 by root, Wed Jun 7 23:28:12 2006 UTC vs.
Revision 1.179 by root, Wed Apr 11 04:32:51 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines