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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.174 by root, Fri Apr 6 07:45:34 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_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
124#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93} 126}
94 127
95static void 128static void
96layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
97{ 130{
98 /* 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
99 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
100 */ 133 */
101 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
105 138
106 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
107} 140}
108 141
109static void 142static void
110layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
111{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
112 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
113 149
114 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116 152
117 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
118} 154 if (!rect.height) rect.height = 1;
119 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
120typedef uint16_t mapface; 161typedef uint16_t faceid;
121 162
122typedef struct { 163typedef struct {
123 GLint name; 164 int name;
124 int w, h; 165 int w, h;
125 float s, t; 166 float s, t;
126 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
127} maptex; 168} maptex;
128 169
129typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
130 int16_t darkness; 173 uint16_t darkness;
131 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
132} mapcell; 175} mapcell;
133 176
134typedef struct { 177typedef struct {
135 int32_t c0, c1; 178 int32_t c0, c1;
136 mapcell *col; 179 mapcell *col;
137} maprow; 180} maprow;
138 181
139typedef struct map { 182typedef struct map {
140 int x, y, w, h; 183 int x, y, w, h;
141 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
142 int faces; 185 int faces; tileid *face2tile; // [faceid]
143 mapface *face; 186 int texs; maptex *tex; // [tileid]
144
145 int texs;
146 maptex *tex;
147 187
148 int32_t rows; 188 int32_t rows;
149 maprow *row; 189 maprow *row;
150} *CFClient__Map; 190} *CFPlus__Map;
151 191
152static char * 192static char *
153prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
154{ 194{
155 char *p; 195 char *p;
172} 212}
173 213
174#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 214#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
175#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176 216
217static void
218need_facenum (struct map *self, faceid face)
219{
220 while (self->faces <= face)
221 {
222 Append (tileid, self->face2tile, self->faces, self->faces);
223 self->faces *= 2;
224 }
225}
226
227static void
228need_texid (struct map *self, int texid)
229{
230 while (self->texs <= texid)
231 {
232 Append (maptex, self->tex, self->texs, self->texs);
233 self->texs *= 2;
234 }
235}
236
177static maprow * 237static maprow *
178map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
179{ 239{
180 if (0 > y) 240 if (0 > y)
181 { 241 {
182 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
183 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
221 281
222 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
223} 283}
224 284
225static mapcell * 285static mapcell *
226map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
227{ 287{
228 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
229} 289}
230 290
231static void 291static void
232map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
233{ 293{
234 int r; 294 int r;
235 295
236 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
237 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
245 self->row = 0; 305 self->row = 0;
246 self->rows = 0; 306 self->rows = 0;
247} 307}
248 308
249static void 309static void
250map_blank (CFClient__Map self, int x0, int y0, int w, int h) 310map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251{ 311{
252 int x, y; 312 int x, y;
253 maprow *row; 313 maprow *row;
314 mapcell *cell;
254 315
255 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
256 if (y >= 0) 317 if (y >= 0)
257 { 318 {
258 if (y >= self->rows) 319 if (y >= self->rows)
264 if (x >= row->c0) 325 if (x >= row->c0)
265 { 326 {
266 if (x >= row->c1) 327 if (x >= row->c1)
267 break; 328 break;
268 329
269 row->col[x - row->c0].darkness = -1; 330 cell = row->col + x - row->c0;
331
332 cell->darkness = 0;
333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
270 } 336 }
271 } 337 }
272} 338}
273 339
274static void 340static void
295 ev.data2 = 0; 361 ev.data2 = 0;
296 362
297 SDL_PushEvent ((SDL_Event *)&ev); 363 SDL_PushEvent ((SDL_Event *)&ev);
298} 364}
299 365
366static unsigned int
367minpot (unsigned int n)
368{
369 if (!n)
370 return 0;
371
372 --n;
373
374 n |= n >> 1;
375 n |= n >> 2;
376 n |= n >> 4;
377 n |= n >> 8;
378 n |= n >> 16;
379
380 return n + 1;
381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
300MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
301 388
302PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
303 390
304BOOT: 391BOOT:
305{ 392{
306 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
307 static const struct { 394 static const struct {
308 const char *name; 395 const char *name;
309 IV iv; 396 IV iv;
310 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
311# define const_iv(name) { # name, (IV)name } 398# define const_iv(name) { # name, (IV)name }
399 const_iv (SDLK_MODIFIER_MIN),
400 const_iv (SDLK_MODIFIER_MAX),
401
312 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
313 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
314 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
315 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
316 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
325 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
326 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
327 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
328 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
329 const_iv (SDL_USEREVENT), 419 const_iv (SDL_USEREVENT),
420
421 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE),
424
330 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
331 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
332 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
333 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
334 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
389 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
390 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
391 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
392 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
393 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
394 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
395 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
396 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
397 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
398 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
399 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
400 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
401 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
402 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
403 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
404 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
405 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
406 const_iv (KMOD_CTRL),
407 const_iv (KMOD_SHIFT),
408 const_iv (KMOD_ALT),
409 const_iv (KMOD_META)
410# undef const_iv 506# undef const_iv
411 }; 507 };
412 508
413 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 509 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
511
512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
415} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
521
522int
523in_destruct ()
524 CODE:
525 RETVAL = PL_main_cv == Nullcv;
526 OUTPUT:
527 RETVAL
528
529NV floor (NV x)
530
531NV ceil (NV x)
416 532
417void 533void
418pango_init () 534pango_init ()
419 CODE: 535 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 536{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 537 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 538 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426 }
427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
438} 540}
439 541
440int 542int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 544
443void 545void
444SDL_Quit () 546SDL_Quit ()
445 547
446void 548void
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
456 558
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
459 561
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464 566
465 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
466 572
467 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
468 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
469 575
470 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
522 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
523 case SDL_KEYUP: 629 case SDL_KEYUP:
524 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
525 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
526 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 632 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
633 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
527 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
528 break; 635 break;
529 636
530 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
557 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559 break; 666 break;
560 } 667 }
561 668
562 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563 } 670 }
564} 671}
565 672
566int 673int
567Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 674Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
581#ifndef _WIN32 688#ifndef _WIN32
582 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
583#endif 690#endif
584 691
585void 692void
693win32_proxy_info ()
694 PPCODE:
695{
696#ifdef _WIN32
697 char buffer[2048];
698 DWORD buflen;
699
700 EXTEND (SP, 3);
701
702 buflen = sizeof (buffer);
703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
707
708 buflen = sizeof (buffer);
709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
710 {
711 PUSHs (newSVpv (buffer, 0));
712
713 buflen = sizeof (buffer);
714 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
715 PUSHs (newSVpv (buffer, 0));
716 }
717 }
718#endif
719}
720
721void
586add_font (char *file) 722add_font (char *file)
587 CODE: 723 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
593 725
594void 726void
595load_image_inline (SV *image_) 727load_image_inline (SV *image_)
596 ALIAS: 728 ALIAS:
597 load_image_file = 1 729 load_image_file = 1
639 771
640 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641 773
642 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
643 775
776 SDL_LockSurface (surface2);
644 EXTEND (SP, 5); 777 EXTEND (SP, 6);
645 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
646 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
647 SDL_LockSurface (surface2);
648 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649 SDL_UnlockSurface (surface2);
650 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 781 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
653 785
654 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
655 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
656} 788}
657 789
693 CODE: 825 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 826 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 827#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 829#endif
698 exit (1); 830 _exit (1);
699 831
832void
833_exit (int retval = 0)
834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
838 _exit (retval);
839#endif
840
700MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
701 842
702CFClient::Font 843CFPlus::Font
703new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
704 CODE: 845 CODE:
705{ 846{
706 int count; 847 int count;
707 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
710} 851}
711 OUTPUT: 852 OUTPUT:
712 RETVAL 853 RETVAL
713 854
714void 855void
715DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
716 CODE: 857 CODE:
717 pango_font_description_free (self); 858 pango_font_description_free (self);
718 859
719void 860void
720make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
721 CODE: 862 CODE:
722 default_font = self; 863 default_font = self;
723 864
724MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
725 866
726CFClient::Layout 867void
727new (SV *class, int rgba = 0) 868reset_glyph_cache ()
728 CODE: 869 CODE:
729#if _WIN32 870 tc_clear ();
730 //rgba = 0;//D makes text nicer, breaks TextView 871
731#endif 872CFPlus::Layout
732 rgba=1;//D 873new (SV *class)
874 CODE:
733 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
734 876
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 878 RETVAL->r = 1.;
738 RETVAL->g = 1.; 879 RETVAL->g = 1.;
739 RETVAL->b = 1.; 880 RETVAL->b = 1.;
740 RETVAL->a = 1.; 881 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
745 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
746 OUTPUT: 887 OUTPUT:
747 RETVAL 888 RETVAL
748 889
749void 890void
750DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
751 CODE: 892 CODE:
752 g_object_unref (self->pl); 893 g_object_unref (self->pl);
753 Safefree (self); 894 Safefree (self);
754 895
896void
897set_text (CFPlus::Layout self, SV *text_)
898 CODE:
899{
900 STRLEN textlen;
901 char *text = SvPVutf8 (text_, textlen);
902
903 pango_layout_set_text (self->pl, text, textlen);
904}
905
906void
907set_markup (CFPlus::Layout self, SV *text_)
908 CODE:
909{
910 STRLEN textlen;
911 char *text = SvPVutf8 (text_, textlen);
912
913 pango_layout_set_markup (self->pl, text, textlen);
914}
915
916void
917set_shapes (CFPlus::Layout self, ...)
918 CODE:
919{
920 PangoAttrList *attrs = 0;
921 const char *text = pango_layout_get_text (self->pl);
922 const char *pos = text;
923 int arg = 4;
924
925 while (arg < items && (pos = strstr (pos, OBJ_STR)))
926 {
927 PangoRectangle inkrect, rect;
928 PangoAttribute *attr;
929
930 int x = SvIV (ST (arg - 3));
931 int y = SvIV (ST (arg - 2));
932 int w = SvIV (ST (arg - 1));
933 int h = SvIV (ST (arg ));
934
935 inkrect.x = 0;
936 inkrect.y = 0;
937 inkrect.width = 0;
938 inkrect.height = 0;
939
940 rect.x = x * PANGO_SCALE;
941 rect.y = y * PANGO_SCALE;
942 rect.width = w * PANGO_SCALE;
943 rect.height = h * PANGO_SCALE;
944
945 if (!attrs)
946 attrs = pango_layout_get_attributes (self->pl);
947
948 attr = pango_attr_shape_new (&inkrect, &rect);
949 attr->start_index = pos - text;
950 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
951 pango_attr_list_insert (attrs, attr);
952
953 arg += 4;
954 pos += sizeof (OBJ_STR) - 1;
955 }
956
957 if (attrs)
958 pango_layout_set_attributes (self->pl, attrs);
959}
960
961void
962get_shapes (CFPlus::Layout self)
963 PPCODE:
964{
965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
966
967 do
968 {
969 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
970
971 if (run && shape_attr_p (run))
972 {
973 PangoRectangle extents;
974 pango_layout_iter_get_run_extents (iter, 0, &extents);
975
976 EXTEND (SP, 2);
977 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
978 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
979 }
980 }
981 while (pango_layout_iter_next_run (iter));
982
983 pango_layout_iter_free (iter);
984}
985
755int 986int
756is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
757 CODE: 988 CODE:
758 RETVAL = self->rgba; 989{
990 int lines = 1;
991 const char *text = pango_layout_get_text (self->pl);
992
993 while (*text)
994 lines += *text++ == '\n';
995
996 RETVAL = lines < pango_layout_get_line_count (self->pl);
997}
759 OUTPUT: 998 OUTPUT:
760 RETVAL 999 RETVAL
761 1000
762void
763set_text (CFClient::Layout self, SV *text_)
764 CODE:
765{
766 STRLEN textlen;
767 char *text = SvPVutf8 (text_, textlen);
768
769 pango_layout_set_text (self->pl, text, textlen);
770}
771
772void
773set_markup (CFClient::Layout self, SV *text_)
774 CODE:
775{
776 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen);
778
779 pango_layout_set_markup (self->pl, text, textlen);
780}
781
782SV * 1001SV *
783get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
784 CODE: 1003 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 1005 sv_utf8_decode (RETVAL);
787 OUTPUT: 1006 OUTPUT:
788 RETVAL 1007 RETVAL
789 1008
790void 1009void
791set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1010set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792 CODE: 1011 CODE:
793 self->r = r; 1012 self->r = r;
794 self->g = g; 1013 self->g = g;
795 self->b = b; 1014 self->b = b;
796 self->a = a; 1015 self->a = a;
797 1016
798void 1017void
799set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800 CODE: 1019 CODE:
801 if (self->font != font) 1020 if (self->font != font)
802 { 1021 {
803 self->font = font; 1022 self->font = font;
804 layout_update_font (self); 1023 layout_update_font (self);
805 } 1024 }
806 1025
807void 1026void
808set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
809 CODE: 1028 CODE:
810 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
811 { 1030 {
812 self->base_height = base_height; 1031 self->base_height = base_height;
813 layout_update_font (self); 1032 layout_update_font (self);
814 } 1033 }
815 1034
816void 1035void
817set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
818 CODE: 1037 CODE:
819 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1038 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820 1039
821void 1040void
822set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
823 CODE: 1042 CODE:
824 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825 1044
826void 1045void
827set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
828 CODE: 1047 CODE:
829 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830 1049
831void 1050void
832set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
833 CODE: 1052 CODE:
834 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
835 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
836 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
838 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
839 ); 1058 );
840 1059
841void 1060void
842set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
843 CODE: 1062 CODE:
844 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845 1064
846void 1065void
847size (CFClient::Layout self) 1066size (CFPlus::Layout self)
848 PPCODE: 1067 PPCODE:
849{ 1068{
850 int w, h; 1069 int w, h;
851 1070
852 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
855 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
857} 1076}
858 1077
859int 1078int
1079descent (CFPlus::Layout self)
1080 CODE:
1081{
1082 PangoRectangle rect;
1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
1085 RETVAL = PANGO_DESCENT (rect);
1086}
1087 OUTPUT:
1088 RETVAL
1089
1090int
860xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
861 CODE: 1092 CODE:
862{ 1093{
863 int index, trailing; 1094 int index, trailing;
864 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865 RETVAL = index; 1096 RETVAL = index + trailing;
866} 1097}
867 OUTPUT: 1098 OUTPUT:
868 RETVAL 1099 RETVAL
869 1100
870void 1101void
871cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
872 PPCODE: 1103 PPCODE:
873{ 1104{
874 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
875 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876 1107
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1112}
882 1113
883void 1114void
884render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885 PPCODE: 1116 PPCODE:
886{ 1117{
887 SV *retval; 1118 int line, x;
888 int w, h;
889 1119
890 layout_get_pixel_size (self, &w, &h); 1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
891 1122
892 if (self->rgba)
893 {
894 cairo_surface_t *surface;
895 cairo_t *cairo;
896
897 retval = newSV (w * h * 4);
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h * 4);
900
901 memset (SvPVX (retval), 0, w * h * 4);
902
903 surface = cairo_image_surface_create_for_data (
904 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905 cairo = cairo_create (surface);
906 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908 pango_cairo_show_layout (cairo, self->pl);
909
910 cairo_destroy (cairo);
911 cairo_surface_destroy (surface);
912
913 // what a mess, and its premultiplied, too :(
914 {
915 uint32_t *p = (uint32_t *)SvPVX (retval);
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 {
920 uint32_t rgba = *p;
921 rgba = (rgba >> 24) | (rgba << 8);
922#if 0
923#ifdef _WIN32
924 {//D
925 uint8_t r = rgba >> 24;
926 uint8_t g = rgba >> 16;
927 uint8_t b = rgba >> 8;
928 uint8_t a = rgba >> 0;
929
930 rgba = (rgba & 0xffffff00) | a;
931 }
932#endif
933#endif
934 rgba = SDL_SwapBE32 (rgba);
935 *p++ = rgba;
936 }
937 }
938
939 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
940 PUSHs (sv_2mortal (newSViv (w))); 1124 PUSHs (sv_2mortal (newSViv (line - 1)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126}
1127
1128void
1129line_x_to_index (CFPlus::Layout self, int line, int x)
1130 PPCODE:
1131{
1132 PangoLayoutLine *lp;
1133 int index, trailing;
1134
1135 if (line < 0)
1136 XSRETURN_EMPTY;
1137
1138 if (!(lp = pango_layout_get_line (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */
1140
1141 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1142
1143 EXTEND (SP, 2);
1144 if (GIMME_V == G_SCALAR)
941 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945 }
946 else 1146 else
947 { 1147 {
948 FT_Bitmap bitmap;
949
950 retval = newSV (w * h);
951 SvPOK_only (retval);
952 SvCUR_set (retval, w * h);
953
954 bitmap.rows = h;
955 bitmap.width = w;
956 bitmap.pitch = w;
957 bitmap.buffer = (unsigned char*)SvPVX (retval);
958 bitmap.num_grays = 256;
959 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961 memset (bitmap.buffer, 0, w * h);
962
963 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965 EXTEND (SP, 5);
966 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
967 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
968 PUSHs (sv_2mortal (retval));
969 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971 } 1150 }
972} 1151}
973 1152
1153void
1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1155 PPCODE:
1156 pango_opengl_render_layout_subpixel (
1157 self->pl,
1158 x * PANGO_SCALE, y * PANGO_SCALE,
1159 self->r, self->g, self->b, self->a,
1160 flags
1161 );
1162
974MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
975 1164
976void 1165void
1166pad2pot (SV *data_, SV *w_, SV *h_)
1167 CODE:
1168{
1169 int ow = SvIV (w_);
1170 int oh = SvIV (h_);
1171
1172 if (ow && oh)
1173 {
1174 int nw = minpot (ow);
1175 int nh = minpot (oh);
1176
1177 if (nw != ow || nh != oh)
1178 {
1179 if (SvOK (data_))
1180 {
1181 STRLEN datalen;
1182 char *data = SvPVbyte (data_, datalen);
1183 int bpp = datalen / (ow * oh);
1184 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1185
1186 SvPOK_only (result_);
1187 SvCUR_set (result_, nw * nh * bpp);
1188
1189 memset (SvPVX (result_), 0, nw * nh * bpp);
1190 while (oh--)
1191 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192
1193 sv_setsv (data_, result_);
1194 }
1195
1196 sv_setiv (w_, nw);
1197 sv_setiv (h_, nh);
1198 }
1199 }
1200}
1201
1202void
977draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1203draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
979 ALIAS: 1205 ALIAS:
980 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
982 CODE: 1208 CODE:
1020 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1021 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1022 } 1248 }
1023} 1249}
1024 1250
1025MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1026 1252
1027CFClient::Map 1253CFPlus::Map
1028new (SV *class, int map_width, int map_height) 1254new (SV *class)
1029 CODE: 1255 CODE:
1030 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1031 RETVAL->x = 0; 1257 RETVAL->x = 0;
1032 RETVAL->y = 0; 1258 RETVAL->y = 0;
1033 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1034 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1035 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1036 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1037 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1038 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1039 RETVAL->texs = 8192;
1040 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1041 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1042 RETVAL->row = 0; 1266 RETVAL->row = 0;
1043 OUTPUT: 1267 OUTPUT:
1044 RETVAL 1268 RETVAL
1045 1269
1046void 1270void
1047DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1048 CODE: 1272 CODE:
1049{ 1273{
1050 map_clear (self); 1274 map_clear (self);
1051 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
1052 Safefree (self); 1277 Safefree (self);
1053} 1278}
1054 1279
1055void 1280void
1281resize (CFPlus::Map self, int map_width, int map_height)
1282 CODE:
1283 self->w = map_width;
1284 self->h = map_height;
1285
1286void
1056clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1057 CODE: 1288 CODE:
1058 map_clear (self); 1289 map_clear (self);
1059 1290
1060void 1291void
1061set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1062 CODE: 1293 CODE:
1063{ 1294{
1064 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1065 { 1296 need_texid (self, tile);
1066 Append (mapface, self->face, self->faces, self->faces);
1067 self->faces *= 2;
1068 }
1069
1070 self->face [face] = texid;
1071} 1297}
1072 1298
1073void 1299void
1074set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1300set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1075 CODE: 1301 CODE:
1076{ 1302{
1077 while (self->texs <= texid) 1303 need_texid (self, texid);
1078 {
1079 Append (maptex, self->tex, self->texs, self->texs);
1080 self->texs *= 2;
1081 }
1082 1304
1083 { 1305 {
1084 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1085 1307
1086 tex->name = name; 1308 tex->name = name;
1103 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105} 1327}
1106 1328
1107int 1329int
1108ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1109 ALIAS: 1331 ALIAS:
1110 oy = 1 1332 oy = 1
1111 x = 2 1333 x = 2
1112 y = 3 1334 y = 3
1113 w = 4 1335 w = 4
1124 } 1346 }
1125 OUTPUT: 1347 OUTPUT:
1126 RETVAL 1348 RETVAL
1127 1349
1128void 1350void
1129scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1130 CODE: 1352 CODE:
1131{ 1353{
1132 if (dx > 0) 1354 if (dx > 0)
1133 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1134 else if (dx < 0) 1356 else if (dx < 0)
1135 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1136 1358
1137 if (dy > 0) 1359 if (dy > 0)
1138 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1139 else if (dy < 0) 1361 else if (dy < 0)
1140 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1141 1363
1142 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1143 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1144 1366
1145 while (self->y < 0) 1367 while (self->y < 0)
1150 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1151 } 1373 }
1152} 1374}
1153 1375
1154void 1376void
1155map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156 CODE: 1378 CODE:
1157{ 1379{
1158 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1160 mapcell *cell; 1382 mapcell *cell;
1161 int x, y, flags; 1383 int x, y, flags;
1162 1384
1163 while (data < data_end) 1385 while (data < data_end - 1)
1164 { 1386 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1166 1388
1167 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1169 1391
1170 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1171 1393
1172 if (flags & 15) 1394 if (flags & 15)
1173 { 1395 {
1174 if (cell->darkness < 0) 1396 if (!cell->darkness)
1175 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1176 cell->darkness = 0; 1399 cell->darkness = 256;
1177 cell->face [0] = 0;
1178 cell->face [1] = 0;
1179 cell->face [2] = 0;
1180 } 1400 }
1181 1401
1182 cell->darkness = flags & 8 ? *data++ : 255;
1183
1184 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1403
1404 if (flags & 8)
1405 {
1406 if (extmap)
1407 {
1408 uint8_t ext, cmd;
1409
1410 do
1411 {
1412 ext = *data++;
1413 cmd = ext & 0x3f;
1414
1415 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
1420 cell->stat_hp = *data++;
1421 }
1422 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47)
1425 {
1426 if (*data == 8)
1427 ; // decode player uuid
1428
1429 data += *data + 1;
1430 }
1431 else if (cmd == 8) // cell flags
1432 cell->flags = *data++;
1433 else if (ext & 0x40) // unknown, multibyte => skip
1434 data += *data + 1;
1435 else
1436 data++;
1437 }
1438 while (ext & 0x80);
1439 }
1440 else
1441 cell->darkness = *data++ + 1;
1442 }
1185 1443
1186 if (flags & 4) 1444 if (flags & 4)
1187 { 1445 {
1188 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1446 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face);
1448 cell->tile [0] = self->face2tile [face];
1189 } 1449 }
1190 1450
1191 if (flags & 2) 1451 if (flags & 2)
1192 { 1452 {
1193 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
1194 } 1456 }
1195 1457
1196 if (flags & 1) 1458 if (flags & 1)
1197 { 1459 {
1198 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
1199 } 1463 }
1200 } 1464 }
1201 else 1465 else
1202 cell->darkness = -1; 1466 cell->darkness = 0;
1203 } 1467 }
1204} 1468}
1205 1469
1206SV * 1470SV *
1207mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208 CODE: 1472 CODE:
1209{ 1473{
1210 int x1, x; 1474 int x1, x;
1211 int y1, y; 1475 int y1, y;
1212 int z; 1476 int z;
1233 { 1497 {
1234 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1235 1499
1236 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1237 { 1501 {
1238 mapface face = cell->face [z];
1239
1240 if (face)
1241 {
1242 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1243 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1244 int a1 = tex.a; 1504 int a1 = tex.a;
1245 1505
1246 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1247 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1248 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1249 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1250 }
1251 } 1510 }
1252 } 1511 }
1253 1512
1254 *map++ = (r ) 1513 *map++ = (r )
1255 | (g << 8) 1514 | (g << 8)
1262} 1521}
1263 OUTPUT: 1522 OUTPUT:
1264 RETVAL 1523 RETVAL
1265 1524
1266void 1525void
1267draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1526draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1268 PPCODE: 1527 CODE:
1269{ 1528{
1270 int vx, vy;
1271 int x, y, z; 1529 int x, y, z;
1272 int last_name; 1530 int last_name;
1273 mapface face;
1274 int sw4 = (sw + 3) & ~3;
1275 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277
1278 memset (darkness, 255, sw4 * sh);
1279 SvPOK_only (darkness_sv);
1280 SvCUR_set (darkness_sv, sw4 * sh);
1281
1282 vx = self->x + (self->w - sw) / 2 - shift_x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y;
1284
1285 /*
1286 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2
1288 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1289
1290 int vy = self->vy = self->h >= sh
1291 ? self->y + (self->h - sh) / 2
1292 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293 */
1294 1531
1295 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1296 1533
1534 glEnable (GL_BLEND);
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301 1538
1302 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1303 1540
1304 last_name = 0; 1541 last_name = 0;
1305 1542
1543 mx += self->x;
1544 my += self->y;
1545
1306 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1307 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1308 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1309 { 1549 {
1310 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1311 1551
1312 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1314 { 1554 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1316
1317 darkness[y * sw4 + x] = cell->darkness < 0
1318 ? 255 - FOW_DARKNESS
1319 : 255 - cell->darkness;
1320
1321 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1322 1557
1323 if (face) 1558 if (tile)
1324 { 1559 {
1325 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1326
1327 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1328 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1329 1563
1330 if (last_name != tex.name) 1564 if (last_name != tex.name)
1331 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1332 glEnd (); 1569 glEnd ();
1333 last_name = tex.name;
1334 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1335 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1336 } 1572 }
1337 1573
1338 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 {
1583 maptex tex = self->tex [1];
1584 int px = x * T + T * 2 / 32;
1585 int py = y * T - T * 6 / 32;
1586
1587 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589 glBegin (GL_QUADS);
1590
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1596 }
1342 } 1597 }
1343 } 1598 }
1344 } 1599 }
1345 1600
1346 glEnd (); 1601 glEnd ();
1347 1602
1348 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1349 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1605
1606 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 int px = x * T;
1618 int py = y * T;
1619
1620 if (cell->stat_hp)
1621 {
1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1624
1625 glColor3ub (0, 0, 0);
1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1628
1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1633 }
1634 }
1635 }
1636}
1637
1638void
1639draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1640 CODE:
1641{
1642 static float color[16][3] = {
1643 { 0.00F, 0.00F, 0.00F },
1644 { 1.00F, 1.00F, 1.00F },
1645 { 0.00F, 0.00F, 0.55F },
1646 { 1.00F, 0.00F, 0.00F },
1647
1648 { 1.00F, 0.54F, 0.00F },
1649 { 0.11F, 0.56F, 1.00F },
1650 { 0.93F, 0.46F, 0.00F },
1651 { 0.18F, 0.54F, 0.34F },
1652
1653 { 0.56F, 0.73F, 0.56F },
1654 { 0.80F, 0.80F, 0.80F },
1655 { 0.55F, 0.41F, 0.13F },
1656 { 0.99F, 0.77F, 0.26F },
1657
1658 { 0.74F, 0.65F, 0.41F },
1659
1660 { 0.00F, 1.00F, 1.00F },
1661 { 1.00F, 0.00F, 1.00F },
1662 { 1.00F, 1.00F, 0.00F },
1663 };
1664
1665 int x, y;
1666
1667 glEnable (GL_TEXTURE_2D);
1668 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1669 glEnable (GL_BLEND);
1670 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1671 glBegin (GL_QUADS);
1672
1673 for (y = 0; y < h; y++)
1674 for (x = 0; x < w; x++)
1675 {
1676 unsigned char m = data [x + y * w];
1677
1678 if (m)
1679 {
1680 float *c = color [m & 15];
1681
1682 float tx1 = m & 0x40 ? 0.5 : 0.;
1683 float tx2 = tx1 + 0.5;
1684
1685 glColor4f (c[0], c[1], c[2], 0.75);
1686 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1687 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1688 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1689 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1690 }
1691 }
1692
1693 glEnd ();
1694 glDisable (GL_BLEND);
1695 glDisable (GL_TEXTURE_2D);
1696}
1697
1698void
1699fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1700 PPCODE:
1701{
1702 int x, y;
1703 int sw4 = (sw + 3) & ~3;
1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1706
1707 memset (darkness, 255, sw4 * sh);
1708 SvPOK_only (darkness_sv);
1709 SvCUR_set (darkness_sv, sw4 * sh);
1710
1711 mx += self->x;
1712 my += self->y;
1713
1714 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows)
1716 {
1717 maprow *row = self->row + (y + my);
1718
1719 for (x = 0; x < sw; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1)
1721 {
1722 mapcell *cell = row->col + (x + mx - row->c0);
1723
1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1726 : 255 - FOW_DARKNESS;
1727 }
1728 }
1350 1729
1351 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1355} 1734}
1356 1735
1357SV * 1736SV *
1358get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1737get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359 CODE: 1738 CODE:
1360{ 1739{
1361 int x, y, x1, y1; 1740 int x, y, x1, y1;
1362 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1363 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1388 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1389 { 1768 {
1390 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1391 uint8_t flags = 0; 1770 uint8_t flags = 0;
1392 1771
1393 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1394 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1395 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1396 1775
1397 *data++ = flags; 1776 *data++ = flags;
1398 1777
1399 if (flags & 1) 1778 if (flags & 1)
1400 { 1779 {
1780 tileid tile = cell->tile [0];
1401 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1402 *data++ = cell->face [0]; 1782 *data++ = tile;
1403 } 1783 }
1404 1784
1405 if (flags & 2) 1785 if (flags & 2)
1406 { 1786 {
1787 tileid tile = cell->tile [1];
1407 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1408 *data++ = cell->face [1]; 1789 *data++ = tile;
1409 } 1790 }
1410 1791
1411 if (flags & 4) 1792 if (flags & 4)
1412 { 1793 {
1794 tileid tile = cell->tile [2];
1413 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1414 *data++ = cell->face [2]; 1796 *data++ = tile;
1415 } 1797 }
1416 } 1798 }
1417 else 1799 else
1418 *data++ = 0; 1800 *data++ = 0;
1419 } 1801 }
1425} 1807}
1426 OUTPUT: 1808 OUTPUT:
1427 RETVAL 1809 RETVAL
1428 1810
1429void 1811void
1430set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431 PPCODE: 1813 PPCODE:
1432{ 1814{
1433 int x, y, z; 1815 int x, y, z;
1434 int w, h; 1816 int w, h;
1435 int x1, y1; 1817 int x1, y1;
1459 { 1841 {
1460 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1461 1843
1462 if (flags) 1844 if (flags)
1463 { 1845 {
1464 mapface face[3] = { 0, 0, 0 };
1465
1466 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1467 1848
1468 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1469 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1470 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1471 1852
1472 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1473 { 1854 {
1474 cell->darkness = -1; 1855 cell->darkness = 0;
1475 1856
1476 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1477 { 1858 {
1478 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1479 1860
1480 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1481 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1482 } 1868 }
1483 } 1869 }
1484 } 1870 }
1485 } 1871 }
1486 } 1872 }
1487} 1873}
1488 1874
1489MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490 1876
1491CFClient::MixChunk 1877CFPlus::MixChunk
1492new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1493 CODE: 1879 CODE:
1494 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1495 OUTPUT: 1881 OUTPUT:
1496 RETVAL 1882 RETVAL
1497 1883
1498void 1884void
1499DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1500 CODE: 1886 CODE:
1501 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1502 1888
1503int 1889int
1504volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1505 CODE: 1891 CODE:
1506 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1507 OUTPUT: 1893 OUTPUT:
1508 RETVAL 1894 RETVAL
1509 1895
1510int 1896int
1511play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1897play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512 CODE: 1898 CODE:
1513 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514 OUTPUT: 1900 OUTPUT:
1515 RETVAL 1901 RETVAL
1516 1902
1517MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518 1904
1519int 1905int
1520volume (int volume = -1) 1906volume (int volume = -1)
1521 CODE: 1907 CODE:
1522 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1523 OUTPUT: 1909 OUTPUT:
1524 RETVAL 1910 RETVAL
1525 1911
1526CFClient::MixMusic 1912CFPlus::MixMusic
1527new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1528 CODE: 1914 CODE:
1529 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1530 OUTPUT: 1916 OUTPUT:
1531 RETVAL 1917 RETVAL
1532 1918
1533void 1919void
1534DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1535 CODE: 1921 CODE:
1536 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1537 1923
1538int 1924int
1539play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1540 CODE: 1926 CODE:
1541 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1542 OUTPUT: 1928 OUTPUT:
1543 RETVAL 1929 RETVAL
1544 1930
1545MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546 1932
1547BOOT: 1933BOOT:
1548{ 1934{
1549 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550 static const struct { 1936 static const struct {
1551 const char *name; 1937 const char *name;
1552 IV iv; 1938 IV iv;
1553 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1554# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1561 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 1948 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 1949 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 1950 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1566 const_iv (GL_AND), 1954 const_iv (GL_AND),
1567 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 1958 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 1961 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1575 const_iv (GL_RGBA), 1963 const_iv (GL_RGBA),
1964 const_iv (GL_RGBA4),
1965 const_iv (GL_RGBA8),
1966 const_iv (GL_RGB5_A1),
1576 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 1968 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 1969 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 1971 const_iv (GL_INTENSITY),
1612 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1613 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1614 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1615 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1616 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1617 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1618 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1619 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
1654 OUTPUT: 2046 OUTPUT:
1655 RETVAL 2047 RETVAL
1656 2048
1657int glGetError () 2049int glGetError ()
1658 2050
2051void glFinish ()
2052
1659void glClear (int mask) 2053void glClear (int mask)
1660 2054
1661void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 2056 PROTOTYPE: @
1663 2057
1686void glPushMatrix () 2080void glPushMatrix ()
1687 2081
1688void glPopMatrix () 2082void glPopMatrix ()
1689 2083
1690void glLoadIdentity () 2084void glLoadIdentity ()
2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
1691 2089
1692# near_ and far_ are due to microsofts buggy "c" compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
1693void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2091void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694 2092
1695# near_ and far_ are due to microsofts buggy "c" compiler 2093# near_ and far_ are due to microsofts buggy "c" compiler
1725 r *= a; 2123 r *= a;
1726 g *= a; 2124 g *= a;
1727 b *= a; 2125 b *= a;
1728 } 2126 }
1729 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1730 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1731 MIN ((int)(g * 256.f), 255),
1732 MIN ((int)(b * 256.f), 255),
1733 MIN ((int)(a * 256.f), 255));
1734 2129
1735void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1736 2131
1737void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1738 2133
1815 2210
1816void glEndList () 2211void glEndList ()
1817 2212
1818void glCallList (int list) 2213void glCallList (int list)
1819 2214
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines