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.111 by root, Mon Jun 12 13:26:14 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>
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;
134} maptex; 168} maptex;
135 169
136typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
137 int16_t darkness; 173 uint16_t darkness;
138 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
139} mapcell; 175} mapcell;
140 176
141typedef struct { 177typedef struct {
142 int32_t c0, c1; 178 int32_t c0, c1;
143 mapcell *col; 179 mapcell *col;
144} maprow; 180} maprow;
145 181
146typedef struct map { 182typedef struct map {
147 int x, y, w, h; 183 int x, y, w, h;
148 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
149 int faces; 185 int faces; tileid *face2tile; // [faceid]
150 mapface *face; 186 int texs; maptex *tex; // [tileid]
151
152 int texs;
153 maptex *tex;
154 187
155 int32_t rows; 188 int32_t rows;
156 maprow *row; 189 maprow *row;
157} *CFClient__Map; 190} *CFPlus__Map;
158 191
159static char * 192static char *
160prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
161{ 194{
162 char *p; 195 char *p;
179} 212}
180 213
181#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))
182#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))
183 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
184static maprow * 237static maprow *
185map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
186{ 239{
187 if (0 > y) 240 if (0 > y)
188 { 241 {
189 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
228 281
229 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
230} 283}
231 284
232static mapcell * 285static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
234{ 287{
235 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
236} 289}
237 290
238static void 291static void
239map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
240{ 293{
241 int r; 294 int r;
242 295
243 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
252 self->row = 0; 305 self->row = 0;
253 self->rows = 0; 306 self->rows = 0;
254} 307}
255 308
256static void 309static void
257map_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)
258{ 311{
259 int x, y; 312 int x, y;
260 maprow *row; 313 maprow *row;
314 mapcell *cell;
261 315
262 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 317 if (y >= 0)
264 { 318 {
265 if (y >= self->rows) 319 if (y >= self->rows)
271 if (x >= row->c0) 325 if (x >= row->c0)
272 { 326 {
273 if (x >= row->c1) 327 if (x >= row->c1)
274 break; 328 break;
275 329
276 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;
277 } 336 }
278 } 337 }
279} 338}
280 339
281static void 340static void
302 ev.data2 = 0; 361 ev.data2 = 0;
303 362
304 SDL_PushEvent ((SDL_Event *)&ev); 363 SDL_PushEvent ((SDL_Event *)&ev);
305} 364}
306 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
307MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
308 388
309PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
310 390
311BOOT: 391BOOT:
312{ 392{
313 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
314 static const struct { 394 static const struct {
315 const char *name; 395 const char *name;
316 IV iv; 396 IV iv;
317 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
318# 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
319 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
320 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
321 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
322 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
323 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
332 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
333 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
334 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
335 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
336 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
337 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
338 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
339 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
340 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
341 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
396 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
397 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
398 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
399 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
400 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
401 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
402 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
403 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
404 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
405 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
406 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
407 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
408 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
409 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
410 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
411 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
412 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
413 const_iv (KMOD_CTRL),
414 const_iv (KMOD_SHIFT),
415 const_iv (KMOD_ALT),
416 const_iv (KMOD_META)
417# undef const_iv 506# undef const_iv
418 }; 507 };
419 508
420 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; )
421 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);
422} 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)
423 532
424void 533void
425pango_init () 534pango_init ()
426 CODE: 535 CODE:
427 // delayed, so it can pick up new fonts added by AddFontResourceEx
428{ 536{
429 {
430 ft2_fontmap = pango_ft2_font_map_new (); 537 opengl_fontmap = pango_opengl_font_map_new ();
431 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);
432 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433 }
434 {
435 cairo_font_options_t *fopt = cairo_font_options_create ();
436 cairo_fontmap = pango_cairo_font_map_get_default ();
437 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438#ifdef _WIN32
439 // cairo looks like shit eaten twice on windows
440 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441#else
442 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443#endif
444 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446 pango_cairo_context_set_font_options (cairo_context, fopt);
447 cairo_font_options_destroy (fopt);
448 }
449} 540}
450 541
451int 542int
452SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
453 544
454void 545void
455SDL_Quit () 546SDL_Quit ()
456 547
457void 548void
464 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467 558
468 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470 561
471 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475 566
476 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
477 572
478 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
479 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480 575
481 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
533 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
534 case SDL_KEYUP: 629 case SDL_KEYUP:
535 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
536 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
537 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 */
538 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
539 break; 635 break;
540 636
541 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
542 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
568 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570 break; 666 break;
571 } 667 }
572 668
573 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574 } 670 }
575} 671}
576 672
577int 673int
578Mix_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)
592#ifndef _WIN32 688#ifndef _WIN32
593 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
594#endif 690#endif
595 691
596void 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
597add_font (char *file) 722add_font (char *file)
598 CODE: 723 CODE:
599 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600#ifdef _WIN32
601 // cairo... sigh... requires win2000
602 AddFontResourceEx (file, FR_PRIVATE, 0);
603#endif
604 725
605void 726void
606load_image_inline (SV *image_) 727load_image_inline (SV *image_)
607 ALIAS: 728 ALIAS:
608 load_image_file = 1 729 load_image_file = 1
650 771
651 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652 773
653 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
654 775
776 SDL_LockSurface (surface2);
655 EXTEND (SP, 5); 777 EXTEND (SP, 6);
656 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
657 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
658 SDL_LockSurface (surface2);
659 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660 SDL_UnlockSurface (surface2);
661 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)));
662 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
664 785
665 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
666 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
667} 788}
668 789
704 CODE: 825 CODE:
705 fprintf (stderr, "FATAL: %s\n", message); 826 fprintf (stderr, "FATAL: %s\n", message);
706#ifdef _WIN32 827#ifdef _WIN32
707 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
708#endif 829#endif
709 _Exit (1); 830 _exit (1);
710 831
711void 832void
712_exit (int retval) 833_exit (int retval = 0)
713 CODE: 834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
837#else
714 _Exit (retval); 838 _exit (retval);
839#endif
715 840
716MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
717 842
718CFClient::Font 843CFPlus::Font
719new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
720 CODE: 845 CODE:
721{ 846{
722 int count; 847 int count;
723 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
726} 851}
727 OUTPUT: 852 OUTPUT:
728 RETVAL 853 RETVAL
729 854
730void 855void
731DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
732 CODE: 857 CODE:
733 pango_font_description_free (self); 858 pango_font_description_free (self);
734 859
735void 860void
736make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
737 CODE: 862 CODE:
738 default_font = self; 863 default_font = self;
739 864
740MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
741 866
742CFClient::Layout 867void
743new (SV *class, int rgba = 0) 868reset_glyph_cache ()
869 CODE:
870 tc_clear ();
871
872CFPlus::Layout
873new (SV *class)
744 CODE: 874 CODE:
745 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
746 876
747 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
748 RETVAL->rgba = rgba;
749 RETVAL->r = 1.; 878 RETVAL->r = 1.;
750 RETVAL->g = 1.; 879 RETVAL->g = 1.;
751 RETVAL->b = 1.; 880 RETVAL->b = 1.;
752 RETVAL->a = 1.; 881 RETVAL->a = 1.;
753 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
757 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
758 OUTPUT: 887 OUTPUT:
759 RETVAL 888 RETVAL
760 889
761void 890void
762DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
763 CODE: 892 CODE:
764 g_object_unref (self->pl); 893 g_object_unref (self->pl);
765 Safefree (self); 894 Safefree (self);
766 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
767int 986int
768is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
769 CODE: 988 CODE:
770 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}
771 OUTPUT: 998 OUTPUT:
772 RETVAL 999 RETVAL
773 1000
774void
775set_text (CFClient::Layout self, SV *text_)
776 CODE:
777{
778 STRLEN textlen;
779 char *text = SvPVutf8 (text_, textlen);
780
781 pango_layout_set_text (self->pl, text, textlen);
782}
783
784void
785set_markup (CFClient::Layout self, SV *text_)
786 CODE:
787{
788 STRLEN textlen;
789 char *text = SvPVutf8 (text_, textlen);
790
791 pango_layout_set_markup (self->pl, text, textlen);
792}
793
794SV * 1001SV *
795get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
796 CODE: 1003 CODE:
797 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798 sv_utf8_decode (RETVAL); 1005 sv_utf8_decode (RETVAL);
799 OUTPUT: 1006 OUTPUT:
800 RETVAL 1007 RETVAL
801 1008
802void 1009void
803set_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.)
804 CODE: 1011 CODE:
805 self->r = r; 1012 self->r = r;
806 self->g = g; 1013 self->g = g;
807 self->b = b; 1014 self->b = b;
808 self->a = a; 1015 self->a = a;
809 1016
810void 1017void
811set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812 CODE: 1019 CODE:
813 if (self->font != font) 1020 if (self->font != font)
814 { 1021 {
815 self->font = font; 1022 self->font = font;
816 layout_update_font (self); 1023 layout_update_font (self);
817 } 1024 }
818 1025
819void 1026void
820set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
821 CODE: 1028 CODE:
822 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
823 { 1030 {
824 self->base_height = base_height; 1031 self->base_height = base_height;
825 layout_update_font (self); 1032 layout_update_font (self);
826 } 1033 }
827 1034
828void 1035void
829set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
830 CODE: 1037 CODE:
831 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);
832 1039
833void 1040void
834set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
835 CODE: 1042 CODE:
836 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837 1044
838void 1045void
839set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
840 CODE: 1047 CODE:
841 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842 1049
843void 1050void
844set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
845 CODE: 1052 CODE:
846 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
847 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
848 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
850 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
851 ); 1058 );
852 1059
853void 1060void
854set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
855 CODE: 1062 CODE:
856 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857 1064
858void 1065void
859size (CFClient::Layout self) 1066size (CFPlus::Layout self)
860 PPCODE: 1067 PPCODE:
861{ 1068{
862 int w, h; 1069 int w, h;
863 1070
864 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
867 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
868 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
869} 1076}
870 1077
871int 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
872xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
873 CODE: 1092 CODE:
874{ 1093{
875 int index, trailing; 1094 int index, trailing;
876 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);
877 RETVAL = index; 1096 RETVAL = index + trailing;
878} 1097}
879 OUTPUT: 1098 OUTPUT:
880 RETVAL 1099 RETVAL
881 1100
882void 1101void
883cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
884 PPCODE: 1103 PPCODE:
885{ 1104{
886 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
887 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888 1107
891 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893} 1112}
894 1113
895void 1114void
896render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
897 PPCODE: 1116 PPCODE:
898{ 1117{
899 SV *retval; 1118 int line, x;
900 int w, h;
901 1119
902 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 */
903 1122
904 if (self->rgba)
905 {
906 cairo_surface_t *surface;
907 cairo_t *cairo;
908
909 retval = newSV (w * h * 4);
910 SvPOK_only (retval);
911 SvCUR_set (retval, w * h * 4);
912
913 memset (SvPVX (retval), 0, w * h * 4);
914
915 surface = cairo_image_surface_create_for_data (
916 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
917 cairo = cairo_create (surface);
918 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920 pango_cairo_show_layout (cairo, self->pl);
921
922 cairo_destroy (cairo);
923 cairo_surface_destroy (surface);
924
925 // what a mess, and its premultiplied, too :(
926 {
927 uint32_t *p = (uint32_t *)SvPVX (retval);
928 uint32_t *e = p + w * h;
929
930 while (p < e)
931 {
932 uint32_t rgba = *p;
933 rgba = (rgba >> 24) | (rgba << 8);
934#if 0
935#ifdef _WIN32
936 {//D
937 uint8_t r = rgba >> 24;
938 uint8_t g = rgba >> 16;
939 uint8_t b = rgba >> 8;
940 uint8_t a = rgba >> 0;
941
942 rgba = (rgba & 0xffffff00) | a;
943 }
944#endif
945#endif
946 rgba = SDL_SwapBE32 (rgba);
947 *p++ = rgba;
948 }
949 }
950
951 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
952 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)
953 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
954 PUSHs (sv_2mortal (retval));
955 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957 }
958 else 1146 else
959 { 1147 {
960 FT_Bitmap bitmap;
961
962 retval = newSV (w * h);
963 SvPOK_only (retval);
964 SvCUR_set (retval, w * h);
965
966 bitmap.rows = h;
967 bitmap.width = w;
968 bitmap.pitch = w;
969 bitmap.buffer = (unsigned char*)SvPVX (retval);
970 bitmap.num_grays = 256;
971 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973 memset (bitmap.buffer, 0, w * h);
974
975 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977 EXTEND (SP, 5);
978 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
979 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
980 PUSHs (sv_2mortal (retval));
981 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983 } 1150 }
984} 1151}
985 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
986MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
987 1164
988void 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
989draw_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.)
990 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
991 ALIAS: 1205 ALIAS:
992 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
993 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
994 CODE: 1208 CODE:
1032 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1033 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1034 } 1248 }
1035} 1249}
1036 1250
1037MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1038 1252
1039CFClient::Map 1253CFPlus::Map
1040new (SV *class, int map_width, int map_height) 1254new (SV *class)
1041 CODE: 1255 CODE:
1042 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1043 RETVAL->x = 0; 1257 RETVAL->x = 0;
1044 RETVAL->y = 0; 1258 RETVAL->y = 0;
1045 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1046 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1047 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1048 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1049 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1050 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1051 RETVAL->texs = 8192;
1052 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1053 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1054 RETVAL->row = 0; 1266 RETVAL->row = 0;
1055 OUTPUT: 1267 OUTPUT:
1056 RETVAL 1268 RETVAL
1057 1269
1058void 1270void
1059DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1060 CODE: 1272 CODE:
1061{ 1273{
1062 map_clear (self); 1274 map_clear (self);
1063 Safefree (self->face); 1275 Safefree (self->face2tile);
1064 Safefree (self->tex); 1276 Safefree (self->tex);
1065 Safefree (self); 1277 Safefree (self);
1066} 1278}
1067 1279
1068void 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
1069clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1070 CODE: 1288 CODE:
1071 map_clear (self); 1289 map_clear (self);
1072 1290
1073void 1291void
1074set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1075 CODE: 1293 CODE:
1076{ 1294{
1077 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1078 { 1296 need_texid (self, tile);
1079 Append (mapface, self->face, self->faces, self->faces);
1080 self->faces *= 2;
1081 }
1082
1083 self->face [face] = texid;
1084} 1297}
1085 1298
1086void 1299void
1087set_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)
1088 CODE: 1301 CODE:
1089{ 1302{
1090 while (self->texs <= texid) 1303 need_texid (self, texid);
1091 {
1092 Append (maptex, self->tex, self->texs, self->texs);
1093 self->texs *= 2;
1094 }
1095 1304
1096 { 1305 {
1097 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1098 1307
1099 tex->name = name; 1308 tex->name = name;
1116 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1117 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118} 1327}
1119 1328
1120int 1329int
1121ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1122 ALIAS: 1331 ALIAS:
1123 oy = 1 1332 oy = 1
1124 x = 2 1333 x = 2
1125 y = 3 1334 y = 3
1126 w = 4 1335 w = 4
1137 } 1346 }
1138 OUTPUT: 1347 OUTPUT:
1139 RETVAL 1348 RETVAL
1140 1349
1141void 1350void
1142scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1143 CODE: 1352 CODE:
1144{ 1353{
1145 if (dx > 0) 1354 if (dx > 0)
1146 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1147 else if (dx < 0) 1356 else if (dx < 0)
1148 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);
1149 1358
1150 if (dy > 0) 1359 if (dy > 0)
1151 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1152 else if (dy < 0) 1361 else if (dy < 0)
1153 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);
1154 1363
1155 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1156 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1157 1366
1158 while (self->y < 0) 1367 while (self->y < 0)
1163 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1164 } 1373 }
1165} 1374}
1166 1375
1167void 1376void
1168map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169 CODE: 1378 CODE:
1170{ 1379{
1171 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1172 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1173 mapcell *cell; 1382 mapcell *cell;
1174 int x, y, flags; 1383 int x, y, flags;
1175 1384
1176 while (data < data_end) 1385 while (data < data_end - 1)
1177 { 1386 {
1178 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1179 1388
1180 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1181 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1182 1391
1183 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1184 1393
1185 if (flags & 15) 1394 if (flags & 15)
1186 { 1395 {
1187 if (cell->darkness < 0) 1396 if (!cell->darkness)
1188 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1189 cell->darkness = 0; 1399 cell->darkness = 256;
1190 cell->face [0] = 0;
1191 cell->face [1] = 0;
1192 cell->face [2] = 0;
1193 } 1400 }
1194 1401
1195 cell->darkness = flags & 8 ? *data++ : 255;
1196
1197 //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 }
1198 1443
1199 if (flags & 4) 1444 if (flags & 4)
1200 { 1445 {
1201 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];
1202 } 1449 }
1203 1450
1204 if (flags & 2) 1451 if (flags & 2)
1205 { 1452 {
1206 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];
1207 } 1456 }
1208 1457
1209 if (flags & 1) 1458 if (flags & 1)
1210 { 1459 {
1211 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];
1212 } 1463 }
1213 } 1464 }
1214 else 1465 else
1215 cell->darkness = -1; 1466 cell->darkness = 0;
1216 } 1467 }
1217} 1468}
1218 1469
1219SV * 1470SV *
1220mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221 CODE: 1472 CODE:
1222{ 1473{
1223 int x1, x; 1474 int x1, x;
1224 int y1, y; 1475 int y1, y;
1225 int z; 1476 int z;
1246 { 1497 {
1247 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1248 1499
1249 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1250 { 1501 {
1251 mapface face = cell->face [z];
1252
1253 if (face)
1254 {
1255 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1256 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1257 int a1 = tex.a; 1504 int a1 = tex.a;
1258 1505
1259 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1260 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1261 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1262 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1263 }
1264 } 1510 }
1265 } 1511 }
1266 1512
1267 *map++ = (r ) 1513 *map++ = (r )
1268 | (g << 8) 1514 | (g << 8)
1275} 1521}
1276 OUTPUT: 1522 OUTPUT:
1277 RETVAL 1523 RETVAL
1278 1524
1279void 1525void
1280draw (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)
1281 PPCODE: 1527 CODE:
1282{ 1528{
1283 int vx, vy;
1284 int x, y, z; 1529 int x, y, z;
1285 int last_name; 1530 int last_name;
1286 mapface face;
1287 int sw4 = (sw + 3) & ~3;
1288 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1289 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1290
1291 memset (darkness, 255, sw4 * sh);
1292 SvPOK_only (darkness_sv);
1293 SvCUR_set (darkness_sv, sw4 * sh);
1294
1295 vx = self->x + (self->w - sw) / 2 - shift_x;
1296 vy = self->y + (self->h - sh) / 2 - shift_y;
1297
1298 /*
1299 int vx = self->vx = self->w >= sw
1300 ? self->x + (self->w - sw) / 2
1301 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1302
1303 int vy = self->vy = self->h >= sh
1304 ? self->y + (self->h - sh) / 2
1305 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306 */
1307 1531
1308 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1309 1533
1534 glEnable (GL_BLEND);
1310 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311 glEnable (GL_BLEND);
1312 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1313 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314 1538
1315 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1316 1540
1317 last_name = 0; 1541 last_name = 0;
1318 1542
1543 mx += self->x;
1544 my += self->y;
1545
1319 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1320 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1321 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1322 { 1549 {
1323 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1324 1551
1325 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1326 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1327 { 1554 {
1328 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1329
1330 darkness[y * sw4 + x] = cell->darkness < 0
1331 ? 255 - FOW_DARKNESS
1332 : 255 - cell->darkness;
1333
1334 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1335 1557
1336 if (face) 1558 if (tile)
1337 { 1559 {
1338 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1339
1340 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1341 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1342 1563
1343 if (last_name != tex.name) 1564 if (last_name != tex.name)
1344 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1345 glEnd (); 1569 glEnd ();
1346 last_name = tex.name;
1347 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1348 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1349 } 1572 }
1350 1573
1351 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1352 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1353 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);
1354 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 }
1355 } 1597 }
1356 } 1598 }
1357 } 1599 }
1358 1600
1359 glEnd (); 1601 glEnd ();
1360 1602
1361 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1362 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 }
1363 1729
1364 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1365 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1366 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1367 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1368} 1734}
1369 1735
1370SV * 1736SV *
1371get_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)
1372 CODE: 1738 CODE:
1373{ 1739{
1374 int x, y, x1, y1; 1740 int x, y, x1, y1;
1375 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1376 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1401 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1402 { 1768 {
1403 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1404 uint8_t flags = 0; 1770 uint8_t flags = 0;
1405 1771
1406 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1407 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1408 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1409 1775
1410 *data++ = flags; 1776 *data++ = flags;
1411 1777
1412 if (flags & 1) 1778 if (flags & 1)
1413 { 1779 {
1780 tileid tile = cell->tile [0];
1414 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1415 *data++ = cell->face [0]; 1782 *data++ = tile;
1416 } 1783 }
1417 1784
1418 if (flags & 2) 1785 if (flags & 2)
1419 { 1786 {
1787 tileid tile = cell->tile [1];
1420 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1421 *data++ = cell->face [1]; 1789 *data++ = tile;
1422 } 1790 }
1423 1791
1424 if (flags & 4) 1792 if (flags & 4)
1425 { 1793 {
1794 tileid tile = cell->tile [2];
1426 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1427 *data++ = cell->face [2]; 1796 *data++ = tile;
1428 } 1797 }
1429 } 1798 }
1430 else 1799 else
1431 *data++ = 0; 1800 *data++ = 0;
1432 } 1801 }
1438} 1807}
1439 OUTPUT: 1808 OUTPUT:
1440 RETVAL 1809 RETVAL
1441 1810
1442void 1811void
1443set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444 PPCODE: 1813 PPCODE:
1445{ 1814{
1446 int x, y, z; 1815 int x, y, z;
1447 int w, h; 1816 int w, h;
1448 int x1, y1; 1817 int x1, y1;
1472 { 1841 {
1473 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1474 1843
1475 if (flags) 1844 if (flags)
1476 { 1845 {
1477 mapface face[3] = { 0, 0, 0 };
1478
1479 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1480 1848
1481 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1482 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1483 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1484 1852
1485 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1486 { 1854 {
1487 cell->darkness = -1; 1855 cell->darkness = 0;
1488 1856
1489 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1490 { 1858 {
1491 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1492 1860
1493 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1494 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1495 } 1868 }
1496 } 1869 }
1497 } 1870 }
1498 } 1871 }
1499 } 1872 }
1500} 1873}
1501 1874
1502MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503 1876
1504CFClient::MixChunk 1877CFPlus::MixChunk
1505new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1506 CODE: 1879 CODE:
1507 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1508 OUTPUT: 1881 OUTPUT:
1509 RETVAL 1882 RETVAL
1510 1883
1511void 1884void
1512DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1513 CODE: 1886 CODE:
1514 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1515 1888
1516int 1889int
1517volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1518 CODE: 1891 CODE:
1519 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1520 OUTPUT: 1893 OUTPUT:
1521 RETVAL 1894 RETVAL
1522 1895
1523int 1896int
1524play (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)
1525 CODE: 1898 CODE:
1526 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527 OUTPUT: 1900 OUTPUT:
1528 RETVAL 1901 RETVAL
1529 1902
1530MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531 1904
1532int 1905int
1533volume (int volume = -1) 1906volume (int volume = -1)
1534 CODE: 1907 CODE:
1535 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1536 OUTPUT: 1909 OUTPUT:
1537 RETVAL 1910 RETVAL
1538 1911
1539CFClient::MixMusic 1912CFPlus::MixMusic
1540new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1541 CODE: 1914 CODE:
1542 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1543 OUTPUT: 1916 OUTPUT:
1544 RETVAL 1917 RETVAL
1545 1918
1546void 1919void
1547DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1548 CODE: 1921 CODE:
1549 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1550 1923
1551int 1924int
1552play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1553 CODE: 1926 CODE:
1554 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1555 OUTPUT: 1928 OUTPUT:
1556 RETVAL 1929 RETVAL
1557 1930
1558MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559 1932
1560BOOT: 1933BOOT:
1561{ 1934{
1562 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563 static const struct { 1936 static const struct {
1564 const char *name; 1937 const char *name;
1565 IV iv; 1938 IV iv;
1566 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1567# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1574 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1575 const_iv (GL_DEPTH_TEST), 1948 const_iv (GL_DEPTH_TEST),
1576 const_iv (GL_ALPHA_TEST), 1949 const_iv (GL_ALPHA_TEST),
1577 const_iv (GL_NORMALIZE), 1950 const_iv (GL_NORMALIZE),
1578 const_iv (GL_RESCALE_NORMAL), 1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1579 const_iv (GL_AND), 1954 const_iv (GL_AND),
1580 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1581 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1582 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1583 const_iv (GL_DST_ALPHA), 1958 const_iv (GL_DST_ALPHA),
1584 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1586 const_iv (GL_SRC_ALPHA_SATURATE), 1961 const_iv (GL_SRC_ALPHA_SATURATE),
1587 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1588 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),
1589 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1590 const_iv (GL_UNSIGNED_SHORT), 1968 const_iv (GL_UNSIGNED_SHORT),
1591 const_iv (GL_UNSIGNED_INT), 1969 const_iv (GL_UNSIGNED_INT),
1592 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1593 const_iv (GL_INTENSITY), 1971 const_iv (GL_INTENSITY),
1625 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1626 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1627 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1628 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1629 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1630 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1631 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1632 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1633 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1634 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
1667 OUTPUT: 2046 OUTPUT:
1668 RETVAL 2047 RETVAL
1669 2048
1670int glGetError () 2049int glGetError ()
1671 2050
2051void glFinish ()
2052
1672void glClear (int mask) 2053void glClear (int mask)
1673 2054
1674void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1675 PROTOTYPE: @ 2056 PROTOTYPE: @
1676 2057
1699void glPushMatrix () 2080void glPushMatrix ()
1700 2081
1701void glPopMatrix () 2082void glPopMatrix ()
1702 2083
1703void glLoadIdentity () 2084void glLoadIdentity ()
2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
1704 2089
1705# near_ and far_ are due to microsofts buggy "c" compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
1706void 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_)
1707 2092
1708# near_ and far_ are due to microsofts buggy "c" compiler 2093# near_ and far_ are due to microsofts buggy "c" compiler
1738 r *= a; 2123 r *= a;
1739 g *= a; 2124 g *= a;
1740 b *= a; 2125 b *= a;
1741 } 2126 }
1742 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1743 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1744 MIN ((int)(g * 256.f), 255),
1745 MIN ((int)(b * 256.f), 255),
1746 MIN ((int)(a * 256.f), 255));
1747 2129
1748void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1749 2131
1750void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1751 2133
1828 2210
1829void glEndList () 2211void glEndList ()
1830 2212
1831void glCallList (int list) 2213void glCallList (int list)
1832 2214
1833

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines