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.104 by root, Mon Jun 5 00:17:47 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);
91#ifdef _WIN32 122#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 124#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 126}
97 127
98static void 128static void
99layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
100{ 130{
101 /* 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
102 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
103 */ 133 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
108 138
109 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
110} 140}
111 141
112static void 142static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
116 149
117 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 152
120 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
121} 154 if (!rect.height) rect.height = 1;
122 155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
123typedef uint16_t mapface; 161typedef uint16_t faceid;
124 162
125typedef struct { 163typedef struct {
126 GLint name; 164 int name;
127 int w, h; 165 int w, h;
128 float s, t; 166 float s, t;
129 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
130} maptex; 168} maptex;
131 169
132typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
133 int16_t darkness; 173 uint16_t darkness;
134 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
135} mapcell; 175} mapcell;
136 176
137typedef struct { 177typedef struct {
138 int32_t c0, c1; 178 int32_t c0, c1;
139 mapcell *col; 179 mapcell *col;
140} maprow; 180} maprow;
141 181
142typedef struct map { 182typedef struct map {
143 int x, y, w, h; 183 int x, y, w, h;
144 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
145 int faces; 185 int faces; tileid *face2tile; // [faceid]
146 mapface *face; 186 int texs; maptex *tex; // [tileid]
147
148 int texs;
149 maptex *tex;
150 187
151 int32_t rows; 188 int32_t rows;
152 maprow *row; 189 maprow *row;
153} *CFClient__Map; 190} *CFPlus__Map;
154 191
155static char * 192static char *
156prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
157{ 194{
158 char *p; 195 char *p;
175} 212}
176 213
177#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))
178#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))
179 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
180static maprow * 237static maprow *
181map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
182{ 239{
183 if (0 > y) 240 if (0 > y)
184 { 241 {
185 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
224 281
225 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
226} 283}
227 284
228static mapcell * 285static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
230{ 287{
231 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
232} 289}
233 290
234static void 291static void
235map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
236{ 293{
237 int r; 294 int r;
238 295
239 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
248 self->row = 0; 305 self->row = 0;
249 self->rows = 0; 306 self->rows = 0;
250} 307}
251 308
252static void 309static void
253map_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)
254{ 311{
255 int x, y; 312 int x, y;
256 maprow *row; 313 maprow *row;
314 mapcell *cell;
257 315
258 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
259 if (y >= 0) 317 if (y >= 0)
260 { 318 {
261 if (y >= self->rows) 319 if (y >= self->rows)
267 if (x >= row->c0) 325 if (x >= row->c0)
268 { 326 {
269 if (x >= row->c1) 327 if (x >= row->c1)
270 break; 328 break;
271 329
272 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;
273 } 336 }
274 } 337 }
275} 338}
276 339
277static void 340static void
298 ev.data2 = 0; 361 ev.data2 = 0;
299 362
300 SDL_PushEvent ((SDL_Event *)&ev); 363 SDL_PushEvent ((SDL_Event *)&ev);
301} 364}
302 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
303MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
304 388
305PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
306 390
307BOOT: 391BOOT:
308{ 392{
309 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 394 static const struct {
311 const char *name; 395 const char *name;
312 IV iv; 396 IV iv;
313 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
314# 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
315 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
332 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
333 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
397 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 506# undef const_iv
414 }; 507 };
415 508
416 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; )
417 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);
418} 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)
419 532
420void 533void
421pango_init () 534pango_init ()
422 CODE: 535 CODE:
423{ 536{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 537 opengl_fontmap = pango_opengl_font_map_new ();
426 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);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431} 540}
432 541
433int 542int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 544
436void 545void
437SDL_Quit () 546SDL_Quit ()
438 547
439void 548void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 558
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 561
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 566
458 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
459 572
460 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 575
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
515 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
516 case SDL_KEYUP: 629 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 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 */
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break; 635 break;
522 636
523 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 666 break;
553 } 667 }
554 668
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 670 }
557} 671}
558 672
559int 673int
560Mix_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)
574#ifndef _WIN32 688#ifndef _WIN32
575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576#endif 690#endif
577 691
578void 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
579add_font (char *file) 722add_font (char *file)
580 CODE: 723 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 725
587void 726void
588load_image_inline (SV *image_) 727load_image_inline (SV *image_)
589 ALIAS: 728 ALIAS:
590 load_image_file = 1 729 load_image_file = 1
632 771
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 773
635 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
636 775
776 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 777 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642 SDL_UnlockSurface (surface2);
643 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)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
646 785
647 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
649} 788}
650 789
686 CODE: 825 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 826 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 827#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 829#endif
691 exit (1); 830 _exit (1);
692 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
693MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
694 842
695CFClient::Font 843CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 844new_from_file (SV *class, char *path, int id = 0)
697 CODE: 845 CODE:
698{ 846{
699 int count; 847 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 851}
704 OUTPUT: 852 OUTPUT:
705 RETVAL 853 RETVAL
706 854
707void 855void
708DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
709 CODE: 857 CODE:
710 pango_font_description_free (self); 858 pango_font_description_free (self);
711 859
712void 860void
713make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
714 CODE: 862 CODE:
715 default_font = self; 863 default_font = self;
716 864
717MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
718 866
719CFClient::Layout 867void
720new (SV *class, int rgba = 0) 868reset_glyph_cache ()
721 CODE: 869 CODE:
722#if _WIN32 870 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 871
724#endif 872CFPlus::Layout
725 rgba=1;//D 873new (SV *class)
874 CODE:
726 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
727 876
728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
729 RETVAL->rgba = rgba;
730 RETVAL->r = 1.; 878 RETVAL->r = 1.;
731 RETVAL->g = 1.; 879 RETVAL->g = 1.;
732 RETVAL->b = 1.; 880 RETVAL->b = 1.;
733 RETVAL->a = 1.; 881 RETVAL->a = 1.;
734 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
738 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
739 OUTPUT: 887 OUTPUT:
740 RETVAL 888 RETVAL
741 889
742void 890void
743DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
744 CODE: 892 CODE:
745 g_object_unref (self->pl); 893 g_object_unref (self->pl);
746 Safefree (self); 894 Safefree (self);
747 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
748int 986int
749is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
750 CODE: 988 CODE:
751 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}
752 OUTPUT: 998 OUTPUT:
753 RETVAL 999 RETVAL
754 1000
755void
756set_text (CFClient::Layout self, SV *text_)
757 CODE:
758{
759 STRLEN textlen;
760 char *text = SvPVutf8 (text_, textlen);
761
762 pango_layout_set_text (self->pl, text, textlen);
763}
764
765void
766set_markup (CFClient::Layout self, SV *text_)
767 CODE:
768{
769 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen);
771
772 pango_layout_set_markup (self->pl, text, textlen);
773}
774
775SV * 1001SV *
776get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
777 CODE: 1003 CODE:
778 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779 SvUTF8_on (RETVAL); 1005 sv_utf8_decode (RETVAL);
780 OUTPUT: 1006 OUTPUT:
781 RETVAL 1007 RETVAL
782 1008
783void 1009void
784set_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.)
785 CODE: 1011 CODE:
786 self->r = r; 1012 self->r = r;
787 self->g = g; 1013 self->g = g;
788 self->b = b; 1014 self->b = b;
789 self->a = a; 1015 self->a = a;
790 1016
791void 1017void
792set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793 CODE: 1019 CODE:
794 if (self->font != font) 1020 if (self->font != font)
795 { 1021 {
796 self->font = font; 1022 self->font = font;
797 layout_update_font (self); 1023 layout_update_font (self);
798 } 1024 }
799 1025
800void 1026void
801set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
802 CODE: 1028 CODE:
803 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
804 { 1030 {
805 self->base_height = base_height; 1031 self->base_height = base_height;
806 layout_update_font (self); 1032 layout_update_font (self);
807 } 1033 }
808 1034
809void 1035void
810set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
811 CODE: 1037 CODE:
812 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);
813 1039
814void 1040void
815set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
816 CODE: 1042 CODE:
817 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818 1044
819void 1045void
820set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
821 CODE: 1047 CODE:
822 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823 1049
824void 1050void
825set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
826 CODE: 1052 CODE:
827 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
828 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
829 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
831 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
832 ); 1058 );
833 1059
834void 1060void
835set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
836 CODE: 1062 CODE:
837 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838 1064
839void 1065void
840size (CFClient::Layout self) 1066size (CFPlus::Layout self)
841 PPCODE: 1067 PPCODE:
842{ 1068{
843 int w, h; 1069 int w, h;
844 1070
845 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
848 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
849 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
850} 1076}
851 1077
852int 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
853xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
854 CODE: 1092 CODE:
855{ 1093{
856 int index, trailing; 1094 int index, trailing;
857 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);
858 RETVAL = index; 1096 RETVAL = index + trailing;
859} 1097}
860 OUTPUT: 1098 OUTPUT:
861 RETVAL 1099 RETVAL
862 1100
863void 1101void
864cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
865 PPCODE: 1103 PPCODE:
866{ 1104{
867 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
868 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869 1107
872 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874} 1112}
875 1113
876void 1114void
877render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
878 PPCODE: 1116 PPCODE:
879{ 1117{
880 SV *retval; 1118 int line, x;
881 int w, h;
882 1119
883 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 */
884 1122
885 if (self->rgba)
886 {
887 cairo_surface_t *surface;
888 cairo_t *cairo;
889
890 retval = newSV (w * h * 4);
891 SvPOK_only (retval);
892 SvCUR_set (retval, w * h * 4);
893
894 memset (SvPVX (retval), 0, w * h * 4);
895
896 surface = cairo_image_surface_create_for_data (
897 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
898 cairo = cairo_create (surface);
899 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901 pango_cairo_show_layout (cairo, self->pl);
902
903 cairo_destroy (cairo);
904 cairo_surface_destroy (surface);
905
906 // what a mess, and its premultiplied, too :(
907 {
908 uint32_t *p = (uint32_t *)SvPVX (retval);
909 uint32_t *e = p + w * h;
910
911 while (p < e)
912 {
913 uint32_t rgba = *p;
914 rgba = (rgba >> 24) | (rgba << 8);
915#if 0
916#ifdef _WIN32
917 {//D
918 uint8_t r = rgba >> 24;
919 uint8_t g = rgba >> 16;
920 uint8_t b = rgba >> 8;
921 uint8_t a = rgba >> 0;
922
923 rgba = (rgba & 0xffffff00) | a;
924 }
925#endif
926#endif
927 rgba = SDL_SwapBE32 (rgba);
928 *p++ = rgba;
929 }
930 }
931
932 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
933 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)
934 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
935 PUSHs (sv_2mortal (retval));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938 }
939 else 1146 else
940 { 1147 {
941 FT_Bitmap bitmap;
942
943 retval = newSV (w * h);
944 SvPOK_only (retval);
945 SvCUR_set (retval, w * h);
946
947 bitmap.rows = h;
948 bitmap.width = w;
949 bitmap.pitch = w;
950 bitmap.buffer = (unsigned char*)SvPVX (retval);
951 bitmap.num_grays = 256;
952 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954 memset (bitmap.buffer, 0, w * h);
955
956 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958 EXTEND (SP, 5);
959 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
960 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
961 PUSHs (sv_2mortal (retval));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964 } 1150 }
965} 1151}
966 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
967MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
968 1164
969void 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
970draw_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.)
971 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
972 ALIAS: 1205 ALIAS:
973 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
974 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
975 CODE: 1208 CODE:
1013 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1014 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1015 } 1248 }
1016} 1249}
1017 1250
1018MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1019 1252
1020CFClient::Map 1253CFPlus::Map
1021new (SV *class, int map_width, int map_height) 1254new (SV *class)
1022 CODE: 1255 CODE:
1023 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1024 RETVAL->x = 0; 1257 RETVAL->x = 0;
1025 RETVAL->y = 0; 1258 RETVAL->y = 0;
1026 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1027 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1028 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1029 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1030 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1031 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1032 RETVAL->texs = 8192;
1033 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1034 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1035 RETVAL->row = 0; 1266 RETVAL->row = 0;
1036 OUTPUT: 1267 OUTPUT:
1037 RETVAL 1268 RETVAL
1038 1269
1039void 1270void
1040DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1041 CODE: 1272 CODE:
1042{ 1273{
1043 map_clear (self); 1274 map_clear (self);
1044 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
1045 Safefree (self); 1277 Safefree (self);
1046} 1278}
1047 1279
1048void 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
1049clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1050 CODE: 1288 CODE:
1051 map_clear (self); 1289 map_clear (self);
1052 1290
1053void 1291void
1054set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1055 CODE: 1293 CODE:
1056{ 1294{
1057 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1058 { 1296 need_texid (self, tile);
1059 Append (mapface, self->face, self->faces, self->faces);
1060 self->faces *= 2;
1061 }
1062
1063 self->face [face] = texid;
1064} 1297}
1065 1298
1066void 1299void
1067set_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)
1068 CODE: 1301 CODE:
1069{ 1302{
1070 while (self->texs <= texid) 1303 need_texid (self, texid);
1071 {
1072 Append (maptex, self->tex, self->texs, self->texs);
1073 self->texs *= 2;
1074 }
1075 1304
1076 { 1305 {
1077 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1078 1307
1079 tex->name = name; 1308 tex->name = name;
1096 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1097 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098} 1327}
1099 1328
1100int 1329int
1101ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1102 ALIAS: 1331 ALIAS:
1103 oy = 1 1332 oy = 1
1104 x = 2 1333 x = 2
1105 y = 3 1334 y = 3
1106 w = 4 1335 w = 4
1117 } 1346 }
1118 OUTPUT: 1347 OUTPUT:
1119 RETVAL 1348 RETVAL
1120 1349
1121void 1350void
1122scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1123 CODE: 1352 CODE:
1124{ 1353{
1125 if (dx > 0) 1354 if (dx > 0)
1126 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1127 else if (dx < 0) 1356 else if (dx < 0)
1128 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);
1129 1358
1130 if (dy > 0) 1359 if (dy > 0)
1131 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1132 else if (dy < 0) 1361 else if (dy < 0)
1133 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);
1134 1363
1135 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1136 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1137 1366
1138 while (self->y < 0) 1367 while (self->y < 0)
1143 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1144 } 1373 }
1145} 1374}
1146 1375
1147void 1376void
1148map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149 CODE: 1378 CODE:
1150{ 1379{
1151 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1152 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1153 mapcell *cell; 1382 mapcell *cell;
1154 int x, y, flags; 1383 int x, y, flags;
1155 1384
1156 while (data < data_end) 1385 while (data < data_end - 1)
1157 { 1386 {
1158 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1159 1388
1160 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1161 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1162 1391
1163 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1164 1393
1165 if (flags & 15) 1394 if (flags & 15)
1166 { 1395 {
1167 if (cell->darkness < 0) 1396 if (!cell->darkness)
1168 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1169 cell->darkness = 0; 1399 cell->darkness = 256;
1170 cell->face [0] = 0;
1171 cell->face [1] = 0;
1172 cell->face [2] = 0;
1173 } 1400 }
1174 1401
1175 cell->darkness = flags & 8 ? *data++ : 255;
1176
1177 //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 }
1178 1443
1179 if (flags & 4) 1444 if (flags & 4)
1180 { 1445 {
1181 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];
1182 } 1449 }
1183 1450
1184 if (flags & 2) 1451 if (flags & 2)
1185 { 1452 {
1186 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];
1187 } 1456 }
1188 1457
1189 if (flags & 1) 1458 if (flags & 1)
1190 { 1459 {
1191 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];
1192 } 1463 }
1193 } 1464 }
1194 else 1465 else
1195 cell->darkness = -1; 1466 cell->darkness = 0;
1196 } 1467 }
1197} 1468}
1198 1469
1199SV * 1470SV *
1200mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201 CODE: 1472 CODE:
1202{ 1473{
1203 int x1, x; 1474 int x1, x;
1204 int y1, y; 1475 int y1, y;
1205 int z; 1476 int z;
1226 { 1497 {
1227 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1228 1499
1229 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1230 { 1501 {
1231 mapface face = cell->face [z];
1232
1233 if (face)
1234 {
1235 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1236 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1237 int a1 = tex.a; 1504 int a1 = tex.a;
1238 1505
1239 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1240 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1241 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1242 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1243 }
1244 } 1510 }
1245 } 1511 }
1246 1512
1247 *map++ = (r ) 1513 *map++ = (r )
1248 | (g << 8) 1514 | (g << 8)
1255} 1521}
1256 OUTPUT: 1522 OUTPUT:
1257 RETVAL 1523 RETVAL
1258 1524
1259void 1525void
1260draw (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)
1261 PPCODE: 1527 CODE:
1262{ 1528{
1263 int vx, vy;
1264 int x, y, z; 1529 int x, y, z;
1265 int last_name; 1530 int last_name;
1266 mapface face;
1267 int sw4 = (sw + 3) & ~3;
1268 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1269 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1270
1271 memset (darkness, 255, sw4 * sh);
1272 SvPOK_only (darkness_sv);
1273 SvCUR_set (darkness_sv, sw4 * sh);
1274
1275 vx = self->x + (self->w - sw) / 2 - shift_x;
1276 vy = self->y + (self->h - sh) / 2 - shift_y;
1277
1278 /*
1279 int vx = self->vx = self->w >= sw
1280 ? self->x + (self->w - sw) / 2
1281 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1282
1283 int vy = self->vy = self->h >= sh
1284 ? self->y + (self->h - sh) / 2
1285 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286 */
1287 1531
1288 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1289 1533
1534 glEnable (GL_BLEND);
1290 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291 glEnable (GL_BLEND);
1292 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1293 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294 1538
1295 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1296 1540
1297 last_name = 0; 1541 last_name = 0;
1298 1542
1543 mx += self->x;
1544 my += self->y;
1545
1299 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1300 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1301 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1302 { 1549 {
1303 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1304 1551
1305 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1306 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1307 { 1554 {
1308 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1309
1310 darkness[y * sw4 + x] = cell->darkness < 0
1311 ? 255 - FOW_DARKNESS
1312 : 255 - cell->darkness;
1313
1314 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1315 1557
1316 if (face) 1558 if (tile)
1317 { 1559 {
1318 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1319
1320 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1321 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1322 1563
1323 if (last_name != tex.name) 1564 if (last_name != tex.name)
1324 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1325 glEnd (); 1569 glEnd ();
1326 last_name = tex.name;
1327 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1329 } 1572 }
1330 1573
1331 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333 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);
1334 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 }
1335 } 1597 }
1336 } 1598 }
1337 } 1599 }
1338 1600
1339 glEnd (); 1601 glEnd ();
1340 1602
1341 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1342 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 }
1343 1729
1344 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1345 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1346 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1347 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1348} 1734}
1349 1735
1350SV * 1736SV *
1351get_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)
1352 CODE: 1738 CODE:
1353{ 1739{
1354 int x, y, x1, y1; 1740 int x, y, x1, y1;
1355 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1356 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1381 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1382 { 1768 {
1383 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1384 uint8_t flags = 0; 1770 uint8_t flags = 0;
1385 1771
1386 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1387 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1388 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1389 1775
1390 *data++ = flags; 1776 *data++ = flags;
1391 1777
1392 if (flags & 1) 1778 if (flags & 1)
1393 { 1779 {
1780 tileid tile = cell->tile [0];
1394 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1395 *data++ = cell->face [0]; 1782 *data++ = tile;
1396 } 1783 }
1397 1784
1398 if (flags & 2) 1785 if (flags & 2)
1399 { 1786 {
1787 tileid tile = cell->tile [1];
1400 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1401 *data++ = cell->face [1]; 1789 *data++ = tile;
1402 } 1790 }
1403 1791
1404 if (flags & 4) 1792 if (flags & 4)
1405 { 1793 {
1794 tileid tile = cell->tile [2];
1406 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1407 *data++ = cell->face [2]; 1796 *data++ = tile;
1408 } 1797 }
1409 } 1798 }
1410 else 1799 else
1411 *data++ = 0; 1800 *data++ = 0;
1412 } 1801 }
1418} 1807}
1419 OUTPUT: 1808 OUTPUT:
1420 RETVAL 1809 RETVAL
1421 1810
1422void 1811void
1423set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424 PPCODE: 1813 PPCODE:
1425{ 1814{
1426 int x, y, z; 1815 int x, y, z;
1427 int w, h; 1816 int w, h;
1428 int x1, y1; 1817 int x1, y1;
1452 { 1841 {
1453 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1454 1843
1455 if (flags) 1844 if (flags)
1456 { 1845 {
1457 mapface face[3] = { 0, 0, 0 };
1458
1459 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1460 1848
1461 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1462 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1463 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1464 1852
1465 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1466 { 1854 {
1467 cell->darkness = -1; 1855 cell->darkness = 0;
1468 1856
1469 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1470 { 1858 {
1471 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1472 1860
1473 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1474 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1475 } 1868 }
1476 } 1869 }
1477 } 1870 }
1478 } 1871 }
1479 } 1872 }
1480} 1873}
1481 1874
1482MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483 1876
1484CFClient::MixChunk 1877CFPlus::MixChunk
1485new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1486 CODE: 1879 CODE:
1487 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1488 OUTPUT: 1881 OUTPUT:
1489 RETVAL 1882 RETVAL
1490 1883
1491void 1884void
1492DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1493 CODE: 1886 CODE:
1494 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1495 1888
1496int 1889int
1497volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1498 CODE: 1891 CODE:
1499 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1500 OUTPUT: 1893 OUTPUT:
1501 RETVAL 1894 RETVAL
1502 1895
1503int 1896int
1504play (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)
1505 CODE: 1898 CODE:
1506 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507 OUTPUT: 1900 OUTPUT:
1508 RETVAL 1901 RETVAL
1509 1902
1510MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511 1904
1512int 1905int
1513volume (int volume = -1) 1906volume (int volume = -1)
1514 CODE: 1907 CODE:
1515 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1516 OUTPUT: 1909 OUTPUT:
1517 RETVAL 1910 RETVAL
1518 1911
1519CFClient::MixMusic 1912CFPlus::MixMusic
1520new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1521 CODE: 1914 CODE:
1522 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1523 OUTPUT: 1916 OUTPUT:
1524 RETVAL 1917 RETVAL
1525 1918
1526void 1919void
1527DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1528 CODE: 1921 CODE:
1529 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1530 1923
1531int 1924int
1532play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1533 CODE: 1926 CODE:
1534 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1535 OUTPUT: 1928 OUTPUT:
1536 RETVAL 1929 RETVAL
1537 1930
1538MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539 1932
1540BOOT: 1933BOOT:
1541{ 1934{
1542 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543 static const struct { 1936 static const struct {
1544 const char *name; 1937 const char *name;
1545 IV iv; 1938 IV iv;
1546 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1547# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1554 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1555 const_iv (GL_DEPTH_TEST), 1948 const_iv (GL_DEPTH_TEST),
1556 const_iv (GL_ALPHA_TEST), 1949 const_iv (GL_ALPHA_TEST),
1557 const_iv (GL_NORMALIZE), 1950 const_iv (GL_NORMALIZE),
1558 const_iv (GL_RESCALE_NORMAL), 1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1559 const_iv (GL_AND), 1954 const_iv (GL_AND),
1560 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1561 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1562 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1563 const_iv (GL_DST_ALPHA), 1958 const_iv (GL_DST_ALPHA),
1564 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE), 1961 const_iv (GL_SRC_ALPHA_SATURATE),
1567 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1568 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),
1569 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT), 1968 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT), 1969 const_iv (GL_UNSIGNED_INT),
1572 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY), 1971 const_iv (GL_INTENSITY),
1605 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1606 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1607 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1608 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1609 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1610 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1611 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1612 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
1647 OUTPUT: 2046 OUTPUT:
1648 RETVAL 2047 RETVAL
1649 2048
1650int glGetError () 2049int glGetError ()
1651 2050
2051void glFinish ()
2052
1652void glClear (int mask) 2053void glClear (int mask)
1653 2054
1654void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1655 PROTOTYPE: @ 2056 PROTOTYPE: @
1656 2057
1679void glPushMatrix () 2080void glPushMatrix ()
1680 2081
1681void glPopMatrix () 2082void glPopMatrix ()
1682 2083
1683void glLoadIdentity () 2084void glLoadIdentity ()
2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
1684 2089
1685# near_ and far_ are due to microsofts buggy "c" compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
1686void 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_)
1687 2092
1688# near_ and far_ are due to microsofts buggy "c" compiler 2093# near_ and far_ are due to microsofts buggy "c" compiler
1718 r *= a; 2123 r *= a;
1719 g *= a; 2124 g *= a;
1720 b *= a; 2125 b *= a;
1721 } 2126 }
1722 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1723 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1724 MIN ((int)(g * 256.f), 255),
1725 MIN ((int)(b * 256.f), 255),
1726 MIN ((int)(a * 256.f), 255));
1727 2129
1728void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1729 2131
1730void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1731 2133
1808 2210
1809void glEndList () 2211void glEndList ()
1810 2212
1811void glCallList (int list) 2213void glCallList (int list)
1812 2214
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines