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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.180 by root, Fri Apr 13 18:11:26 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
546
547NV floor (NV x)
548
549NV ceil (NV x)
440 550
441void 551void
442pango_init () 552pango_init ()
443 CODE: 553 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 554{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 555 opengl_fontmap = pango_opengl_font_map_new ();
448 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);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 557 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 558}
467 559
468int 560int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 561SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 562
471void 563void
472SDL_Quit () 564SDL_Quit ()
473 565
474void 566void
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 573 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 574 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 575 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 576
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 577 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 578 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 579
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 580 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 581 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 582 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 583 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 584
493 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
494 590
495 SDL_EnableUNICODE (1); 591 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 592 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 593
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 594 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
550 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
551 case SDL_KEYUP: 647 case SDL_KEYUP:
552 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
553 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
554 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 */
555 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
556 break; 653 break;
557 654
558 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
559 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 682 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 683 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 684 break;
588 } 685 }
589 686
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 687 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 688 }
592} 689}
593 690
594int 691int
595Mix_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)
604Mix_AllocateChannels (int numchans = -1) 701Mix_AllocateChannels (int numchans = -1)
605 702
606void 703void
607lowdelay (int fd, int val = 1) 704lowdelay (int fd, int val = 1)
608 CODE: 705 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
707
708void
709win32_proxy_info ()
710 PPCODE:
711{
609#ifndef _WIN32 712#ifdef _WIN32
610 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 }
611#endif 734#endif
735}
612 736
613void 737void
614add_font (char *file) 738add_font (char *file)
615 CODE: 739 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 740 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 741
622void 742void
623load_image_inline (SV *image_) 743load_image_inline (SV *image_)
624 ALIAS: 744 ALIAS:
625 load_image_file = 1 745 load_image_file = 1
667 787
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 788 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 789
670 assert (surface2->pitch == surface2->w * 4); 790 assert (surface2->pitch == surface2->w * 4);
671 791
792 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 793 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 794 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 795 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 796 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 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)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 798 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 799 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
800 SDL_UnlockSurface (surface2);
681 801
682 SDL_FreeSurface (surface); 802 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 803 SDL_FreeSurface (surface2);
684} 804}
685 805
724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725#endif 845#endif
726 _exit (1); 846 _exit (1);
727 847
728void 848void
729_exit (int retval) 849_exit (int retval = 0)
730 CODE: 850 CODE:
851#ifdef WIN32
852 ExitThread (retval); // unclean, please beam me up
853#else
731 _exit (retval); 854 _exit (retval);
855#endif
732 856
733MODULE = CFClient PACKAGE = CFClient::Font 857MODULE = CFPlus PACKAGE = CFPlus::Font
734 858
735CFClient::Font 859CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 860new_from_file (SV *class, char *path, int id = 0)
737 CODE: 861 CODE:
738{ 862{
739 int count; 863 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 864 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 867}
744 OUTPUT: 868 OUTPUT:
745 RETVAL 869 RETVAL
746 870
747void 871void
748DESTROY (CFClient::Font self) 872DESTROY (CFPlus::Font self)
749 CODE: 873 CODE:
750 pango_font_description_free (self); 874 pango_font_description_free (self);
751 875
752void 876void
753make_default (CFClient::Font self) 877make_default (CFPlus::Font self)
754 CODE: 878 CODE:
755 default_font = self; 879 default_font = self;
756 880
757MODULE = CFClient PACKAGE = CFClient::Layout 881MODULE = CFPlus PACKAGE = CFPlus::Layout
758 882
759CFClient::Layout 883void
760new (SV *class, int rgba = 0) 884reset_glyph_cache ()
885 CODE:
886 tc_clear ();
887
888CFPlus::Layout
889new (SV *class)
761 CODE: 890 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 891 New (0, RETVAL, 1, struct cf_layout);
763 892
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 893 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 894 RETVAL->r = 1.;
767 RETVAL->g = 1.; 895 RETVAL->g = 1.;
768 RETVAL->b = 1.; 896 RETVAL->b = 1.;
769 RETVAL->a = 1.; 897 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 898 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 902 layout_update_font (RETVAL);
775 OUTPUT: 903 OUTPUT:
776 RETVAL 904 RETVAL
777 905
778void 906void
779DESTROY (CFClient::Layout self) 907DESTROY (CFPlus::Layout self)
780 CODE: 908 CODE:
781 g_object_unref (self->pl); 909 g_object_unref (self->pl);
782 Safefree (self); 910 Safefree (self);
783 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
784int 1002int
785is_rgba (CFClient::Layout self) 1003has_wrapped (CFPlus::Layout self)
786 CODE: 1004 CODE:
787 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}
788 OUTPUT: 1014 OUTPUT:
789 RETVAL 1015 RETVAL
790 1016
791void
792set_text (CFClient::Layout self, SV *text_)
793 CODE:
794{
795 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen);
797
798 pango_layout_set_text (self->pl, text, textlen);
799}
800
801void
802set_markup (CFClient::Layout self, SV *text_)
803 CODE:
804{
805 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen);
807
808 pango_layout_set_markup (self->pl, text, textlen);
809}
810
811SV * 1017SV *
812get_text (CFClient::Layout self) 1018get_text (CFPlus::Layout self)
813 CODE: 1019 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1020 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 1021 sv_utf8_decode (RETVAL);
816 OUTPUT: 1022 OUTPUT:
817 RETVAL 1023 RETVAL
818 1024
819void 1025void
820set_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.)
821 CODE: 1027 CODE:
822 self->r = r; 1028 self->r = r;
823 self->g = g; 1029 self->g = g;
824 self->b = b; 1030 self->b = b;
825 self->a = a; 1031 self->a = a;
826 1032
827void 1033void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 1034set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 1035 CODE:
830 if (self->font != font) 1036 if (self->font != font)
831 { 1037 {
832 self->font = font; 1038 self->font = font;
833 layout_update_font (self); 1039 layout_update_font (self);
834 } 1040 }
835 1041
836void 1042void
837set_height (CFClient::Layout self, int base_height) 1043set_height (CFPlus::Layout self, int base_height)
838 CODE: 1044 CODE:
839 if (self->base_height != base_height) 1045 if (self->base_height != base_height)
840 { 1046 {
841 self->base_height = base_height; 1047 self->base_height = base_height;
842 layout_update_font (self); 1048 layout_update_font (self);
843 } 1049 }
844 1050
845void 1051void
846set_width (CFClient::Layout self, int max_width = -1) 1052set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 1053 CODE:
848 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);
849 1055
850void 1056void
851set_indent (CFClient::Layout self, int indent) 1057set_indent (CFPlus::Layout self, int indent)
852 CODE: 1058 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1059 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 1060
855void 1061void
856set_spacing (CFClient::Layout self, int spacing) 1062set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 1063 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1064 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 1065
860void 1066void
861set_ellipsise (CFClient::Layout self, int ellipsise) 1067set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 1068 CODE:
863 pango_layout_set_ellipsize (self->pl, 1069 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1070 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1071 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1072 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 1073 : PANGO_ELLIPSIZE_NONE
868 ); 1074 );
869 1075
870void 1076void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 1077set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 1078 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1079 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 1080
875void 1081void
876size (CFClient::Layout self) 1082size (CFPlus::Layout self)
877 PPCODE: 1083 PPCODE:
878{ 1084{
879 int w, h; 1085 int w, h;
880 1086
881 layout_get_pixel_size (self, &w, &h); 1087 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 1090 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 1091 PUSHs (sv_2mortal (newSViv (h)));
886} 1092}
887 1093
888int 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
889xy_to_index (CFClient::Layout self, int x, int y) 1107xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1108 CODE:
891{ 1109{
892 int index, trailing; 1110 int index, trailing;
893 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);
894 RETVAL = index; 1112 RETVAL = index + trailing;
895} 1113}
896 OUTPUT: 1114 OUTPUT:
897 RETVAL 1115 RETVAL
898 1116
899void 1117void
900cursor_pos (CFClient::Layout self, int index) 1118cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1119 PPCODE:
902{ 1120{
903 PangoRectangle strong_pos; 1121 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1122 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1123
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1128}
911 1129
912void 1130void
913render (CFClient::Layout self) 1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
914 PPCODE: 1132 PPCODE:
915{ 1133{
916 SV *retval; 1134 int line, x;
917 int w, h;
918 1135
919 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 */
920 1138
921 if (self->rgba)
922 {
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5); 1139 EXTEND (SP, 2);
969 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)
970 PUSHs (sv_2mortal (newSViv (h))); 1161 PUSHs (sv_2mortal (newSViv (index + trailing)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 }
975 else 1162 else
976 { 1163 {
977 FT_Bitmap bitmap;
978
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w))); 1164 PUSHs (sv_2mortal (newSViv (index)));
996 PUSHs (sv_2mortal (newSViv (h))); 1165 PUSHs (sv_2mortal (newSViv (trailing)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 } 1166 }
1001} 1167}
1002 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
1003MODULE = CFClient PACKAGE = CFClient::Texture 1179MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1180
1005void 1181void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1182pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1183 CODE:
1008{ 1184{
1038 } 1214 }
1039 } 1215 }
1040} 1216}
1041 1217
1042void 1218void
1043draw_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.)
1044 PROTOTYPE: $$$;$$ 1220 PROTOTYPE: $$$;$$
1045 ALIAS: 1221 ALIAS:
1046 draw_quad_alpha = 1 1222 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1223 draw_quad_alpha_premultiplied = 2
1048 CODE: 1224 CODE:
1086 glDisable (GL_ALPHA_TEST); 1262 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1263 glDisable (GL_BLEND);
1088 } 1264 }
1089} 1265}
1090 1266
1091MODULE = CFClient PACKAGE = CFClient::Map 1267MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1268
1093CFClient::Map 1269CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1270new (SV *class)
1095 CODE: 1271 CODE:
1096 New (0, RETVAL, 1, struct map); 1272 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1273 RETVAL->x = 0;
1098 RETVAL->y = 0; 1274 RETVAL->y = 0;
1099 RETVAL->w = map_width; 1275 RETVAL->w = 0;
1100 RETVAL->h = map_height; 1276 RETVAL->h = 0;
1101 RETVAL->ox = 0; 1277 RETVAL->ox = 0;
1102 RETVAL->oy = 0; 1278 RETVAL->oy = 0;
1103 RETVAL->faces = 8192; 1279 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1104 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1280 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1105 RETVAL->texs = 8192;
1106 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1107 RETVAL->rows = 0; 1281 RETVAL->rows = 0;
1108 RETVAL->row = 0; 1282 RETVAL->row = 0;
1109 OUTPUT: 1283 OUTPUT:
1110 RETVAL 1284 RETVAL
1111 1285
1112void 1286void
1113DESTROY (CFClient::Map self) 1287DESTROY (CFPlus::Map self)
1114 CODE: 1288 CODE:
1115{ 1289{
1116 map_clear (self); 1290 map_clear (self);
1117 Safefree (self->face); 1291 Safefree (self->face2tile);
1118 Safefree (self->tex); 1292 Safefree (self->tex);
1119 Safefree (self); 1293 Safefree (self);
1120} 1294}
1121 1295
1122void 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
1123clear (CFClient::Map self) 1303clear (CFPlus::Map self)
1124 CODE: 1304 CODE:
1125 map_clear (self); 1305 map_clear (self);
1126 1306
1127void 1307void
1128set_face (CFClient::Map self, int face, int texid) 1308set_tileid (CFPlus::Map self, int face, int tile)
1129 CODE: 1309 CODE:
1130{ 1310{
1131 while (self->faces <= face) 1311 need_facenum (self, face); self->face2tile [face] = tile;
1132 { 1312 need_texid (self, tile);
1133 Append (mapface, self->face, self->faces, self->faces);
1134 self->faces *= 2;
1135 }
1136
1137 self->face [face] = texid;
1138} 1313}
1139 1314
1140void 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
1141set_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)
1142 CODE: 1340 CODE:
1143{ 1341{
1144 while (self->texs <= texid) 1342 need_texid (self, texid);
1145 {
1146 Append (maptex, self->tex, self->texs, self->texs);
1147 self->texs *= 2;
1148 }
1149 1343
1150 { 1344 {
1151 maptex *tex = self->tex + texid; 1345 maptex *tex = self->tex + texid;
1152 1346
1153 tex->name = name; 1347 tex->name = name;
1170 // from transparent color bleeding and ugly wrapping effects. 1364 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1365 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1366}
1173 1367
1174int 1368int
1175ox (CFClient::Map self) 1369ox (CFPlus::Map self)
1176 ALIAS: 1370 ALIAS:
1177 oy = 1 1371 oy = 1
1178 x = 2 1372 x = 2
1179 y = 3 1373 y = 3
1180 w = 4 1374 w = 4
1191 } 1385 }
1192 OUTPUT: 1386 OUTPUT:
1193 RETVAL 1387 RETVAL
1194 1388
1195void 1389void
1196scroll (CFClient::Map self, int dx, int dy) 1390scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1391 CODE:
1198{ 1392{
1199 if (dx > 0) 1393 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1394 map_blank (self, self->x, self->y, dx, self->h);
1201 else if (dx < 0) 1395 else if (dx < 0)
1202 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);
1203 1397
1204 if (dy > 0) 1398 if (dy > 0)
1205 map_blank (self, self->x, self->y, self->w, dy - 1); 1399 map_blank (self, self->x, self->y, self->w, dy);
1206 else if (dy < 0) 1400 else if (dy < 0)
1207 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);
1208 1402
1209 self->ox += dx; self->x += dx; 1403 self->ox += dx; self->x += dx;
1210 self->oy += dy; self->y += dy; 1404 self->oy += dy; self->y += dy;
1211 1405
1212 while (self->y < 0) 1406 while (self->y < 0)
1217 self->y += MAP_EXTEND_Y; 1411 self->y += MAP_EXTEND_Y;
1218 } 1412 }
1219} 1413}
1220 1414
1221void 1415void
1222map1a_update (CFClient::Map self, SV *data_) 1416map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1417 CODE:
1224{ 1418{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1419 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1420 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1421 mapcell *cell;
1228 int x, y, flags; 1422 int x, y, flags;
1229 1423
1230 while (data < data_end) 1424 while (data < data_end - 1)
1231 { 1425 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1426 flags = (data [0] << 8) + data [1]; data += 2;
1233 1427
1234 x = ((flags >> 10) & 63) + self->x; 1428 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1429 y = self->y + ((flags >> 4) & 63);
1236 1430
1237 cell = map_get_cell (self, x, y); 1431 cell = map_get_cell (self, x, y);
1238 1432
1239 if (flags & 15) 1433 if (flags & 15)
1240 { 1434 {
1241 if (cell->darkness < 0) 1435 if (!cell->darkness)
1242 { 1436 {
1437 memset (cell, 0, sizeof (*cell));
1243 cell->darkness = 0; 1438 cell->darkness = 256;
1244 cell->face [0] = 0;
1245 cell->face [1] = 0;
1246 cell->face [2] = 0;
1247 } 1439 }
1248 1440
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //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 }
1252 1482
1253 if (flags & 4) 1483 if (flags & 4)
1254 { 1484 {
1255 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];
1256 } 1488 }
1257 1489
1258 if (flags & 2) 1490 if (flags & 2)
1259 { 1491 {
1260 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];
1261 } 1495 }
1262 1496
1263 if (flags & 1) 1497 if (flags & 1)
1264 { 1498 {
1265 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];
1266 } 1502 }
1267 } 1503 }
1268 else 1504 else
1269 cell->darkness = -1; 1505 cell->darkness = 0;
1270 } 1506 }
1271} 1507}
1272 1508
1273SV * 1509SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1511 CODE:
1276{ 1512{
1277 int x1, x; 1513 int x1, x;
1278 int y1, y; 1514 int y1, y;
1279 int z; 1515 int z;
1300 { 1536 {
1301 mapcell *cell = row->col + (x - row->c0); 1537 mapcell *cell = row->col + (x - row->c0);
1302 1538
1303 for (z = 0; z <= 0; z++) 1539 for (z = 0; z <= 0; z++)
1304 { 1540 {
1305 mapface face = cell->face [z];
1306
1307 if (face)
1308 {
1309 maptex tex = self->tex [face]; 1541 maptex tex = self->tex [cell->tile [z]];
1310 int a0 = 255 - tex.a; 1542 int a0 = 255 - tex.a;
1311 int a1 = tex.a; 1543 int a1 = tex.a;
1312 1544
1313 r = (r * a0 + tex.r * a1) / 255; 1545 r = (r * a0 + tex.r * a1) / 255;
1314 g = (g * a0 + tex.g * a1) / 255; 1546 g = (g * a0 + tex.g * a1) / 255;
1315 b = (b * a0 + tex.b * a1) / 255; 1547 b = (b * a0 + tex.b * a1) / 255;
1316 a = (a * a0 + tex.a * a1) / 255; 1548 a = (a * a0 + tex.a * a1) / 255;
1317 }
1318 } 1549 }
1319 } 1550 }
1320 1551
1321 *map++ = (r ) 1552 *map++ = (r )
1322 | (g << 8) 1553 | (g << 8)
1329} 1560}
1330 OUTPUT: 1561 OUTPUT:
1331 RETVAL 1562 RETVAL
1332 1563
1333void 1564void
1334draw (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)
1335 PPCODE: 1566 CODE:
1336{ 1567{
1337 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;
1338 int x, y, z; 1572 int x, y, z;
1339 int last_name; 1573 int last_name;
1340 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 // bits is ___n cccc CCCC bbbb
1687 // n do not draw borders&corners
1688 // c draw these corners, but...
1689 // C ... not these
1690 // b draw these borders
1691
1692 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1693 // ┃· ·· ·┃ ━━
1694
1695 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1696 // ·· ·· ·┏ ┓·
1697
1698 // full tile
1699 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1700
1701 // borders
1702 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1703 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1704 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1705 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1706
1707 // corners
1708 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1709 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1710 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1711 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1712 }
1713 }
1714 }
1715 }
1716
1717 // go through all smoothlevels, lowest to highest, then draw
1718 // this is basically counting sort
1719 {
1720 int w, b;
1721
1722 for (w = 0; w < 256 / 32; ++w)
1723 {
1724 uint32_t smask = smooth_level [w];
1725 if (smask)
1726 for (b = 0; b < 32; ++b)
1727 if (smask & (((uint32_t)1) << b))
1728 {
1729 int level = (w << 5) | b;
1730 HE *he;
1731
1732 hv_iterinit (smooth);
1733 while ((he = hv_iternext (smooth)))
1734 {
1735 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he));
1737
1738 if (!(bits & 0x1000)
1739 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y])
1741 {
1742 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15;
1746 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1747 float dx = tex.s * .0625f; // 16 images/row
1748 float dy = tex.t * .5f ; // 2 images/column
1749
1750 // this time naively avoiding texture state changes
1751 // save gobs of state changes.
1752 if (last_name != tex.name)
1753 {
1754 if (!tex.name)
1755 continue; // smoothing not yet available
1756
1757 glEnd ();
1758 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1759 glBegin (GL_QUADS);
1760 }
1761
1762 if (border)
1763 {
1764 float ox = border * dx;
1765
1766 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1767 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1768 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1769 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1770 }
1771
1772 if (corner)
1773 {
1774 float ox = corner * dx;
1775
1776 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1777 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1778 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1779 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1780 }
1781 }
1782 }
1783 }
1784 }
1785 }
1786
1787 hv_clear (smooth);
1788 }
1789
1790 glEnd ();
1791
1792 glDisable (GL_TEXTURE_2D);
1793 glDisable (GL_BLEND);
1794
1795 // top layer: overlays such as the health bar
1796 for (y = 0; y < sh; y++)
1797 if (0 <= y + my && y + my < self->rows)
1798 {
1799 maprow *row = self->row + (y + my);
1800
1801 for (x = 0; x < sw; x++)
1802 if (row->c0 <= x + mx && x + mx < row->c1)
1803 {
1804 mapcell *cell = row->col + (x + mx - row->c0);
1805
1806 int px = x * T;
1807 int py = y * T;
1808
1809 if (cell->stat_hp)
1810 {
1811 int width = cell->stat_width * T;
1812 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1813
1814 glColor3ub (0, 0, 0);
1815 glRectf (px + 1, py - thick - 2,
1816 px + width - 1, py);
1817
1818 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1819 glRectf (px + 2,
1820 py - thick - 1,
1821 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1822 }
1823 }
1824 }
1825}
1826
1827void
1828draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1829 CODE:
1830{
1831 static float color[16][3] = {
1832 { 0.00F, 0.00F, 0.00F },
1833 { 1.00F, 1.00F, 1.00F },
1834 { 0.00F, 0.00F, 0.55F },
1835 { 1.00F, 0.00F, 0.00F },
1836
1837 { 1.00F, 0.54F, 0.00F },
1838 { 0.11F, 0.56F, 1.00F },
1839 { 0.93F, 0.46F, 0.00F },
1840 { 0.18F, 0.54F, 0.34F },
1841
1842 { 0.56F, 0.73F, 0.56F },
1843 { 0.80F, 0.80F, 0.80F },
1844 { 0.55F, 0.41F, 0.13F },
1845 { 0.99F, 0.77F, 0.26F },
1846
1847 { 0.74F, 0.65F, 0.41F },
1848
1849 { 0.00F, 1.00F, 1.00F },
1850 { 1.00F, 0.00F, 1.00F },
1851 { 1.00F, 1.00F, 0.00F },
1852 };
1853
1854 int x, y;
1855
1856 glEnable (GL_TEXTURE_2D);
1857 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1858 glEnable (GL_BLEND);
1859 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1860 glBegin (GL_QUADS);
1861
1862 for (y = 0; y < h; y++)
1863 for (x = 0; x < w; x++)
1864 {
1865 unsigned char m = data [x + y * w];
1866
1867 if (m)
1868 {
1869 float *c = color [m & 15];
1870
1871 float tx1 = m & 0x40 ? 0.5 : 0.;
1872 float tx2 = tx1 + 0.5;
1873
1874 glColor4f (c[0], c[1], c[2], 0.75);
1875 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1876 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1877 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1878 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1879 }
1880 }
1881
1882 glEnd ();
1883 glDisable (GL_BLEND);
1884 glDisable (GL_TEXTURE_2D);
1885}
1886
1887void
1888fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1889 PPCODE:
1890{
1891 int x, y;
1341 int sw4 = (sw + 3) & ~3; 1892 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1893 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1894 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344 1895
1345 memset (darkness, 255, sw4 * sh); 1896 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv); 1897 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh); 1898 SvCUR_set (darkness_sv, sw4 * sh);
1348 1899
1349 vx = self->x + (self->w - sw) / 2 - shift_x; 1900 mx += self->x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y; 1901 my += self->y;
1351 1902
1352 /*
1353 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357 int vy = self->vy = self->h >= sh
1358 ? self->y + (self->h - sh) / 2
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */
1361
1362 glColor4ub (255, 255, 255, 255);
1363
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368
1369 glBegin (GL_QUADS);
1370
1371 last_name = 0;
1372
1373 for (z = 0; z < 3; z++)
1374 for (y = 0; y < sh; y++) 1903 for (y = 0; y < sh; y++)
1375 if (0 <= y + vy && y + vy < self->rows) 1904 if (0 <= y + my && y + my < self->rows)
1376 { 1905 {
1377 maprow *row = self->row + (y + vy); 1906 maprow *row = self->row + (y + my);
1378 1907
1379 for (x = 0; x < sw; x++) 1908 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1909 if (row->c0 <= x + mx && x + mx < row->c1)
1381 { 1910 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1911 mapcell *cell = row->col + (x + mx - row->c0);
1383 1912
1384 darkness[y * sw4 + x] = cell->darkness < 0 1913 darkness[y * sw4 + x] = cell->darkness
1914 ? 255 - (cell->darkness - 1)
1385 ? 255 - FOW_DARKNESS 1915 : 255 - FOW_DARKNESS;
1386 : 255 - cell->darkness;
1387
1388 face = cell->face [z];
1389
1390 if (face)
1391 {
1392 maptex tex = self->tex [face];
1393
1394 int px = (x + 1) * 32 - tex.w;
1395 int py = (y + 1) * 32 - tex.h;
1396
1397 if (last_name != tex.name)
1398 {
1399 glEnd ();
1400 last_name = tex.name;
1401 glBindTexture (GL_TEXTURE_2D, last_name);
1402 glBegin (GL_QUADS);
1403 }
1404
1405 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409 }
1410 } 1916 }
1411 } 1917 }
1412
1413 glEnd ();
1414
1415 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND);
1417 1918
1418 EXTEND (SP, 3); 1919 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1920 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1921 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1922 PUSHs (darkness_sv);
1422} 1923}
1423 1924
1424SV * 1925SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1926get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1927 CODE:
1427{ 1928{
1428 int x, y, x1, y1; 1929 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1930 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1931 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1455 if (row && row->c0 <= x && x < row->c1) 1956 if (row && row->c0 <= x && x < row->c1)
1456 { 1957 {
1457 mapcell *cell = row->col + (x - row->c0); 1958 mapcell *cell = row->col + (x - row->c0);
1458 uint8_t flags = 0; 1959 uint8_t flags = 0;
1459 1960
1460 if (cell->face [0]) flags |= 1; 1961 if (cell->tile [0]) flags |= 1;
1461 if (cell->face [1]) flags |= 2; 1962 if (cell->tile [1]) flags |= 2;
1462 if (cell->face [2]) flags |= 4; 1963 if (cell->tile [2]) flags |= 4;
1463 1964
1464 *data++ = flags; 1965 *data++ = flags;
1465 1966
1466 if (flags & 1) 1967 if (flags & 1)
1467 { 1968 {
1969 tileid tile = cell->tile [0];
1468 *data++ = cell->face [0] >> 8; 1970 *data++ = tile >> 8;
1469 *data++ = cell->face [0]; 1971 *data++ = tile;
1470 } 1972 }
1471 1973
1472 if (flags & 2) 1974 if (flags & 2)
1473 { 1975 {
1976 tileid tile = cell->tile [1];
1474 *data++ = cell->face [1] >> 8; 1977 *data++ = tile >> 8;
1475 *data++ = cell->face [1]; 1978 *data++ = tile;
1476 } 1979 }
1477 1980
1478 if (flags & 4) 1981 if (flags & 4)
1479 { 1982 {
1983 tileid tile = cell->tile [2];
1480 *data++ = cell->face [2] >> 8; 1984 *data++ = tile >> 8;
1481 *data++ = cell->face [2]; 1985 *data++ = tile;
1482 } 1986 }
1483 } 1987 }
1484 else 1988 else
1485 *data++ = 0; 1989 *data++ = 0;
1486 } 1990 }
1492} 1996}
1493 OUTPUT: 1997 OUTPUT:
1494 RETVAL 1998 RETVAL
1495 1999
1496void 2000void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2001set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 2002 PPCODE:
1499{ 2003{
1500 int x, y, z; 2004 int x, y, z;
1501 int w, h; 2005 int w, h;
1502 int x1, y1; 2006 int x1, y1;
1526 { 2030 {
1527 uint8_t flags = *data++; 2031 uint8_t flags = *data++;
1528 2032
1529 if (flags) 2033 if (flags)
1530 { 2034 {
1531 mapface face[3] = { 0, 0, 0 };
1532
1533 mapcell *cell = row_get_cell (row, x); 2035 mapcell *cell = row_get_cell (row, x);
2036 tileid tile[3] = { 0, 0, 0 };
1534 2037
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2038 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2039 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2040 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1538 2041
1539 if (cell->darkness <= 0) 2042 if (cell->darkness == 0)
1540 { 2043 {
1541 cell->darkness = -1; 2044 cell->darkness = 0;
1542 2045
1543 for (z = 0; z <= 2; z++) 2046 for (z = 0; z <= 2; z++)
1544 { 2047 {
1545 cell->face[z] = face[z]; 2048 tileid t = tile [z];
1546 2049
1547 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2050 if (t >= self->texs || (t && !self->tex [t].name))
2051 {
1548 XPUSHs (sv_2mortal (newSViv (face[z]))); 2052 XPUSHs (sv_2mortal (newSViv (t)));
2053 need_texid (self, t);
2054 }
2055
2056 cell->tile [z] = t;
1549 } 2057 }
1550 } 2058 }
1551 } 2059 }
1552 } 2060 }
1553 } 2061 }
1554} 2062}
1555 2063
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 2064MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 2065
1558CFClient::MixChunk 2066CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 2067new_from_file (SV *class, char *path)
1560 CODE: 2068 CODE:
1561 RETVAL = Mix_LoadWAV (path); 2069 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 2070 OUTPUT:
1563 RETVAL 2071 RETVAL
1564 2072
1565void 2073void
1566DESTROY (CFClient::MixChunk self) 2074DESTROY (CFPlus::MixChunk self)
1567 CODE: 2075 CODE:
1568 Mix_FreeChunk (self); 2076 Mix_FreeChunk (self);
1569 2077
1570int 2078int
1571volume (CFClient::MixChunk self, int volume = -1) 2079volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 2080 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 2081 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 2082 OUTPUT:
1575 RETVAL 2083 RETVAL
1576 2084
1577int 2085int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2086play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 2087 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2088 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 2089 OUTPUT:
1582 RETVAL 2090 RETVAL
1583 2091
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 2092MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 2093
1586int 2094int
1587volume (int volume = -1) 2095volume (int volume = -1)
1588 CODE: 2096 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 2097 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 2098 OUTPUT:
1591 RETVAL 2099 RETVAL
1592 2100
1593CFClient::MixMusic 2101CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 2102new_from_file (SV *class, char *path)
1595 CODE: 2103 CODE:
1596 RETVAL = Mix_LoadMUS (path); 2104 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 2105 OUTPUT:
1598 RETVAL 2106 RETVAL
1599 2107
1600void 2108void
1601DESTROY (CFClient::MixMusic self) 2109DESTROY (CFPlus::MixMusic self)
1602 CODE: 2110 CODE:
1603 Mix_FreeMusic (self); 2111 Mix_FreeMusic (self);
1604 2112
1605int 2113int
1606play (CFClient::MixMusic self, int loops = -1) 2114play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 2115 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 2116 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 2117 OUTPUT:
1610 RETVAL 2118 RETVAL
1611 2119
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 2120MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 2121
1614BOOT: 2122BOOT:
1615{ 2123{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2124 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 2125 static const struct {
1618 const char *name; 2126 const char *name;
1619 IV iv; 2127 IV iv;
1620 } *civ, const_iv[] = { 2128 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 2129# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 2136 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 2137 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 2138 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 2139 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 2140 const_iv (GL_RESCALE_NORMAL),
2141 const_iv (GL_FRONT),
2142 const_iv (GL_BACK),
1633 const_iv (GL_AND), 2143 const_iv (GL_AND),
1634 const_iv (GL_ONE), 2144 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 2145 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 2146 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 2147 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2148 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 2149 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 2150 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 2151 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 2152 const_iv (GL_RGBA),
2153 const_iv (GL_RGBA4),
2154 const_iv (GL_RGBA8),
2155 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 2156 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 2157 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 2158 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 2159 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 2160 const_iv (GL_INTENSITY),
1679 const_iv (GL_SEPARABLE_2D), 2192 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 2193 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 2194 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 2195 const_iv (GL_CONSTANT_BORDER),
1683 const_iv (GL_LINES), 2196 const_iv (GL_LINES),
2197 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 2198 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 2199 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 2200 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 2201 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 2202 const_iv (GL_TRIANGLE_STRIP),
1721 OUTPUT: 2235 OUTPUT:
1722 RETVAL 2236 RETVAL
1723 2237
1724int glGetError () 2238int glGetError ()
1725 2239
2240void glFinish ()
2241
1726void glClear (int mask) 2242void glClear (int mask)
1727 2243
1728void glClearColor (float r, float g, float b, float a = 1.0) 2244void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 2245 PROTOTYPE: @
1730 2246
1753void glPushMatrix () 2269void glPushMatrix ()
1754 2270
1755void glPopMatrix () 2271void glPopMatrix ()
1756 2272
1757void glLoadIdentity () 2273void glLoadIdentity ()
2274
2275void glDrawBuffer (int buffer)
2276
2277void glReadBuffer (int buffer)
1758 2278
1759# near_ and far_ are due to microsofts buggy "c" compiler 2279# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2280void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761 2281
1762# near_ and far_ are due to microsofts buggy "c" compiler 2282# near_ and far_ are due to microsofts buggy "c" compiler
1792 r *= a; 2312 r *= a;
1793 g *= a; 2313 g *= a;
1794 b *= a; 2314 b *= a;
1795 } 2315 }
1796 // microsoft visual "c" rounds instead of truncating... 2316 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255), 2317 glColor4f (r, g, b, a);
1798 MIN ((int)(g * 256.f), 255),
1799 MIN ((int)(b * 256.f), 255),
1800 MIN ((int)(a * 256.f), 255));
1801 2318
1802void glInterleavedArrays (int format, int stride, char *data) 2319void glInterleavedArrays (int format, int stride, char *data)
1803 2320
1804void glDrawElements (int mode, int count, int type, char *indices) 2321void glDrawElements (int mode, int count, int type, char *indices)
1805 2322
1882 2399
1883void glEndList () 2400void glEndList ()
1884 2401
1885void glCallList (int list) 2402void glCallList (int list)
1886 2403
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines