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.103 by root, Sun Jun 4 23:05:05 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
873new (SV *class)
874 CODE:
725 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
726 876
727 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 877 RETVAL->pl = pango_layout_new (opengl_context);
728 RETVAL->rgba = rgba;
729 RETVAL->r = 1.; 878 RETVAL->r = 1.;
730 RETVAL->g = 1.; 879 RETVAL->g = 1.;
731 RETVAL->b = 1.; 880 RETVAL->b = 1.;
732 RETVAL->a = 1.; 881 RETVAL->a = 1.;
733 RETVAL->base_height = MIN_FONT_HEIGHT; 882 RETVAL->base_height = MIN_FONT_HEIGHT;
737 layout_update_font (RETVAL); 886 layout_update_font (RETVAL);
738 OUTPUT: 887 OUTPUT:
739 RETVAL 888 RETVAL
740 889
741void 890void
742DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
743 CODE: 892 CODE:
744 g_object_unref (self->pl); 893 g_object_unref (self->pl);
745 Safefree (self); 894 Safefree (self);
746 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
747int 986int
748is_rgba (CFClient::Layout self) 987has_wrapped (CFPlus::Layout self)
749 CODE: 988 CODE:
750 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}
751 OUTPUT: 998 OUTPUT:
752 RETVAL 999 RETVAL
753 1000
754void
755set_text (CFClient::Layout self, SV *text_)
756 CODE:
757{
758 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen);
760
761 pango_layout_set_text (self->pl, text, textlen);
762}
763
764void
765set_markup (CFClient::Layout self, SV *text_)
766 CODE:
767{
768 STRLEN textlen;
769 char *text = SvPVutf8 (text_, textlen);
770
771 pango_layout_set_markup (self->pl, text, textlen);
772}
773
774SV * 1001SV *
775get_text (CFClient::Layout self) 1002get_text (CFPlus::Layout self)
776 CODE: 1003 CODE:
777 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778 SvUTF8_on (RETVAL); 1005 sv_utf8_decode (RETVAL);
779 OUTPUT: 1006 OUTPUT:
780 RETVAL 1007 RETVAL
781 1008
782void 1009void
783set_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.)
784 CODE: 1011 CODE:
785 self->r = r; 1012 self->r = r;
786 self->g = g; 1013 self->g = g;
787 self->b = b; 1014 self->b = b;
788 self->a = a; 1015 self->a = a;
789 1016
790void 1017void
791set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792 CODE: 1019 CODE:
793 if (self->font != font) 1020 if (self->font != font)
794 { 1021 {
795 self->font = font; 1022 self->font = font;
796 layout_update_font (self); 1023 layout_update_font (self);
797 } 1024 }
798 1025
799void 1026void
800set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
801 CODE: 1028 CODE:
802 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
803 { 1030 {
804 self->base_height = base_height; 1031 self->base_height = base_height;
805 layout_update_font (self); 1032 layout_update_font (self);
806 } 1033 }
807 1034
808void 1035void
809set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
810 CODE: 1037 CODE:
811 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);
812 1039
813void 1040void
814set_indent (CFClient::Layout self, int indent) 1041set_indent (CFPlus::Layout self, int indent)
815 CODE: 1042 CODE:
816 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817 1044
818void 1045void
819set_spacing (CFClient::Layout self, int spacing) 1046set_spacing (CFPlus::Layout self, int spacing)
820 CODE: 1047 CODE:
821 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822 1049
823void 1050void
824set_ellipsise (CFClient::Layout self, int ellipsise) 1051set_ellipsise (CFPlus::Layout self, int ellipsise)
825 CODE: 1052 CODE:
826 pango_layout_set_ellipsize (self->pl, 1053 pango_layout_set_ellipsize (self->pl,
827 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
828 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
830 : PANGO_ELLIPSIZE_NONE 1057 : PANGO_ELLIPSIZE_NONE
831 ); 1058 );
832 1059
833void 1060void
834set_single_paragraph_mode (CFClient::Layout self, int spm) 1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
835 CODE: 1062 CODE:
836 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837 1064
838void 1065void
839size (CFClient::Layout self) 1066size (CFPlus::Layout self)
840 PPCODE: 1067 PPCODE:
841{ 1068{
842 int w, h; 1069 int w, h;
843 1070
844 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
847 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
848 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
849} 1076}
850 1077
851int 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
852xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
853 CODE: 1092 CODE:
854{ 1093{
855 int index, trailing; 1094 int index, trailing;
856 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);
857 RETVAL = index; 1096 RETVAL = index + trailing;
858} 1097}
859 OUTPUT: 1098 OUTPUT:
860 RETVAL 1099 RETVAL
861 1100
862void 1101void
863cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
864 PPCODE: 1103 PPCODE:
865{ 1104{
866 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
867 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868 1107
871 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873} 1112}
874 1113
875void 1114void
876render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
877 PPCODE: 1116 PPCODE:
878{ 1117{
879 SV *retval; 1118 int line, x;
880 int w, h;
881 1119
882 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 */
883 1122
884 if (self->rgba)
885 {
886 cairo_surface_t *surface;
887 cairo_t *cairo;
888
889 retval = newSV (w * h * 4);
890 SvPOK_only (retval);
891 SvCUR_set (retval, w * h * 4);
892
893 memset (SvPVX (retval), 0, w * h * 4);
894
895 surface = cairo_image_surface_create_for_data (
896 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
897 cairo = cairo_create (surface);
898 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900 pango_cairo_show_layout (cairo, self->pl);
901
902 cairo_destroy (cairo);
903 cairo_surface_destroy (surface);
904
905 // what a mess, and its premultiplied, too :(
906 {
907 uint32_t *p = (uint32_t *)SvPVX (retval);
908 uint32_t *e = p + w * h;
909
910 while (p < e)
911 {
912 uint32_t rgba = *p;
913 rgba = (rgba >> 24) | (rgba << 8);
914#if 0
915#ifdef _WIN32
916 {//D
917 uint8_t r = rgba >> 24;
918 uint8_t g = rgba >> 16;
919 uint8_t b = rgba >> 8;
920 uint8_t a = rgba >> 0;
921
922 rgba = (rgba & 0xffffff00) | a;
923 }
924#endif
925#endif
926 rgba = SDL_SwapBE32 (rgba);
927 *p++ = rgba;
928 }
929 }
930
931 EXTEND (SP, 5); 1123 EXTEND (SP, 2);
932 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)
933 PUSHs (sv_2mortal (newSViv (h))); 1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
934 PUSHs (sv_2mortal (retval));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 }
938 else 1146 else
939 { 1147 {
940 FT_Bitmap bitmap;
941
942 retval = newSV (w * h);
943 SvPOK_only (retval);
944 SvCUR_set (retval, w * h);
945
946 bitmap.rows = h;
947 bitmap.width = w;
948 bitmap.pitch = w;
949 bitmap.buffer = (unsigned char*)SvPVX (retval);
950 bitmap.num_grays = 256;
951 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953 memset (bitmap.buffer, 0, w * h);
954
955 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957 EXTEND (SP, 5);
958 PUSHs (sv_2mortal (newSViv (w))); 1148 PUSHs (sv_2mortal (newSViv (index)));
959 PUSHs (sv_2mortal (newSViv (h))); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
960 PUSHs (sv_2mortal (retval));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 } 1150 }
964} 1151}
965 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
966MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
967 1164
968void 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
969draw_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.)
970 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
971 ALIAS: 1205 ALIAS:
972 draw_quad_alpha = 1 1206 draw_quad_alpha = 1
973 draw_quad_alpha_premultiplied = 2 1207 draw_quad_alpha_premultiplied = 2
974 CODE: 1208 CODE:
990 1224
991 if (ix == 2) 1225 if (ix == 2)
992 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1226 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993 else 1227 else
994 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1228 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995 GL_ONE_MINUS_DST_ALPHA, GL_ONE); 1229 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996 1230
997 glEnable (GL_ALPHA_TEST); 1231 glEnable (GL_ALPHA_TEST);
998 glAlphaFunc (GL_GREATER, 0.01f); 1232 glAlphaFunc (GL_GREATER, 0.01f);
999 } 1233 }
1000 1234
1012 glDisable (GL_ALPHA_TEST); 1246 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1247 glDisable (GL_BLEND);
1014 } 1248 }
1015} 1249}
1016 1250
1017MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1252
1019CFClient::Map 1253CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1254new (SV *class)
1021 CODE: 1255 CODE:
1022 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1257 RETVAL->x = 0;
1024 RETVAL->y = 0; 1258 RETVAL->y = 0;
1025 RETVAL->w = map_width; 1259 RETVAL->w = 0;
1026 RETVAL->h = map_height; 1260 RETVAL->h = 0;
1027 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
1028 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
1029 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1030 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1031 RETVAL->texs = 8192;
1032 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1033 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
1034 RETVAL->row = 0; 1266 RETVAL->row = 0;
1035 OUTPUT: 1267 OUTPUT:
1036 RETVAL 1268 RETVAL
1037 1269
1038void 1270void
1039DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
1040 CODE: 1272 CODE:
1041{ 1273{
1042 map_clear (self); 1274 map_clear (self);
1043 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
1044 Safefree (self); 1277 Safefree (self);
1045} 1278}
1046 1279
1047void 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
1048clear (CFClient::Map self) 1287clear (CFPlus::Map self)
1049 CODE: 1288 CODE:
1050 map_clear (self); 1289 map_clear (self);
1051 1290
1052void 1291void
1053set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
1054 CODE: 1293 CODE:
1055{ 1294{
1056 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
1057 { 1296 need_texid (self, tile);
1058 Append (mapface, self->face, self->faces, self->faces);
1059 self->faces *= 2;
1060 }
1061
1062 self->face [face] = texid;
1063} 1297}
1064 1298
1065void 1299void
1066set_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)
1067 CODE: 1301 CODE:
1068{ 1302{
1069 while (self->texs <= texid) 1303 need_texid (self, texid);
1070 {
1071 Append (maptex, self->tex, self->texs, self->texs);
1072 self->texs *= 2;
1073 }
1074 1304
1075 { 1305 {
1076 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
1077 1307
1078 tex->name = name; 1308 tex->name = name;
1095 // from transparent color bleeding and ugly wrapping effects. 1325 // from transparent color bleeding and ugly wrapping effects.
1096 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097} 1327}
1098 1328
1099int 1329int
1100ox (CFClient::Map self) 1330ox (CFPlus::Map self)
1101 ALIAS: 1331 ALIAS:
1102 oy = 1 1332 oy = 1
1103 x = 2 1333 x = 2
1104 y = 3 1334 y = 3
1105 w = 4 1335 w = 4
1116 } 1346 }
1117 OUTPUT: 1347 OUTPUT:
1118 RETVAL 1348 RETVAL
1119 1349
1120void 1350void
1121scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
1122 CODE: 1352 CODE:
1123{ 1353{
1124 if (dx > 0) 1354 if (dx > 0)
1125 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
1126 else if (dx < 0) 1356 else if (dx < 0)
1127 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);
1128 1358
1129 if (dy > 0) 1359 if (dy > 0)
1130 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
1131 else if (dy < 0) 1361 else if (dy < 0)
1132 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);
1133 1363
1134 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
1135 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
1136 1366
1137 while (self->y < 0) 1367 while (self->y < 0)
1142 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
1143 } 1373 }
1144} 1374}
1145 1375
1146void 1376void
1147map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148 CODE: 1378 CODE:
1149{ 1379{
1150 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1151 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
1152 mapcell *cell; 1382 mapcell *cell;
1153 int x, y, flags; 1383 int x, y, flags;
1154 1384
1155 while (data < data_end) 1385 while (data < data_end - 1)
1156 { 1386 {
1157 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
1158 1388
1159 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
1160 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
1161 1391
1162 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
1163 1393
1164 if (flags & 15) 1394 if (flags & 15)
1165 { 1395 {
1166 if (cell->darkness < 0) 1396 if (!cell->darkness)
1167 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
1168 cell->darkness = 0; 1399 cell->darkness = 256;
1169 cell->face [0] = 0;
1170 cell->face [1] = 0;
1171 cell->face [2] = 0;
1172 } 1400 }
1173 1401
1174 cell->darkness = flags & 8 ? *data++ : 255;
1175
1176 //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 }
1177 1443
1178 if (flags & 4) 1444 if (flags & 4)
1179 { 1445 {
1180 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];
1181 } 1449 }
1182 1450
1183 if (flags & 2) 1451 if (flags & 2)
1184 { 1452 {
1185 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];
1186 } 1456 }
1187 1457
1188 if (flags & 1) 1458 if (flags & 1)
1189 { 1459 {
1190 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];
1191 } 1463 }
1192 } 1464 }
1193 else 1465 else
1194 cell->darkness = -1; 1466 cell->darkness = 0;
1195 } 1467 }
1196} 1468}
1197 1469
1198SV * 1470SV *
1199mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200 CODE: 1472 CODE:
1201{ 1473{
1202 int x1, x; 1474 int x1, x;
1203 int y1, y; 1475 int y1, y;
1204 int z; 1476 int z;
1225 { 1497 {
1226 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1227 1499
1228 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1229 { 1501 {
1230 mapface face = cell->face [z];
1231
1232 if (face)
1233 {
1234 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1235 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1236 int a1 = tex.a; 1504 int a1 = tex.a;
1237 1505
1238 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1239 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1240 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1241 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1242 }
1243 } 1510 }
1244 } 1511 }
1245 1512
1246 *map++ = (r ) 1513 *map++ = (r )
1247 | (g << 8) 1514 | (g << 8)
1254} 1521}
1255 OUTPUT: 1522 OUTPUT:
1256 RETVAL 1523 RETVAL
1257 1524
1258void 1525void
1259draw (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)
1260 PPCODE: 1527 CODE:
1261{ 1528{
1262 int vx, vy;
1263 int x, y, z; 1529 int x, y, z;
1264 int last_name; 1530 int last_name;
1265 mapface face;
1266 int sw4 = (sw + 3) & ~3;
1267 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1268 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1269
1270 memset (darkness, 255, sw4 * sh);
1271 SvPOK_only (darkness_sv);
1272 SvCUR_set (darkness_sv, sw4 * sh);
1273
1274 vx = self->x + (self->w - sw) / 2 - shift_x;
1275 vy = self->y + (self->h - sh) / 2 - shift_y;
1276
1277 /*
1278 int vx = self->vx = self->w >= sw
1279 ? self->x + (self->w - sw) / 2
1280 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281
1282 int vy = self->vy = self->h >= sh
1283 ? self->y + (self->h - sh) / 2
1284 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285 */
1286 1531
1287 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1288 1533
1534 glEnable (GL_BLEND);
1289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290 glEnable (GL_BLEND);
1291 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1292 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293 1538
1294 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1295 1540
1296 last_name = 0; 1541 last_name = 0;
1297 1542
1543 mx += self->x;
1544 my += self->y;
1545
1298 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1299 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1300 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1301 { 1549 {
1302 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1303 1551
1304 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1305 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1306 { 1554 {
1307 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1308
1309 darkness[y * sw4 + x] = cell->darkness < 0
1310 ? 255 - FOW_DARKNESS
1311 : 255 - cell->darkness;
1312
1313 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1314 1557
1315 if (face) 1558 if (tile)
1316 { 1559 {
1317 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1318
1319 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1320 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1321 1563
1322 if (last_name != tex.name) 1564 if (last_name != tex.name)
1323 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1324 glEnd (); 1569 glEnd ();
1325 last_name = tex.name;
1326 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1327 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1328 } 1572 }
1329 1573
1330 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1331 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1332 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);
1333 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 }
1334 } 1597 }
1335 } 1598 }
1336 } 1599 }
1337 1600
1338 glEnd (); 1601 glEnd ();
1339 1602
1340 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1341 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 }
1342 1729
1343 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1344 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1345 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1346 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1347} 1734}
1348 1735
1349SV * 1736SV *
1350get_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)
1351 CODE: 1738 CODE:
1352{ 1739{
1353 int x, y, x1, y1; 1740 int x, y, x1, y1;
1354 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1355 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1380 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1381 { 1768 {
1382 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1383 uint8_t flags = 0; 1770 uint8_t flags = 0;
1384 1771
1385 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1386 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1387 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1388 1775
1389 *data++ = flags; 1776 *data++ = flags;
1390 1777
1391 if (flags & 1) 1778 if (flags & 1)
1392 { 1779 {
1780 tileid tile = cell->tile [0];
1393 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1394 *data++ = cell->face [0]; 1782 *data++ = tile;
1395 } 1783 }
1396 1784
1397 if (flags & 2) 1785 if (flags & 2)
1398 { 1786 {
1787 tileid tile = cell->tile [1];
1399 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1400 *data++ = cell->face [1]; 1789 *data++ = tile;
1401 } 1790 }
1402 1791
1403 if (flags & 4) 1792 if (flags & 4)
1404 { 1793 {
1794 tileid tile = cell->tile [2];
1405 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1406 *data++ = cell->face [2]; 1796 *data++ = tile;
1407 } 1797 }
1408 } 1798 }
1409 else 1799 else
1410 *data++ = 0; 1800 *data++ = 0;
1411 } 1801 }
1417} 1807}
1418 OUTPUT: 1808 OUTPUT:
1419 RETVAL 1809 RETVAL
1420 1810
1421void 1811void
1422set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423 PPCODE: 1813 PPCODE:
1424{ 1814{
1425 int x, y, z; 1815 int x, y, z;
1426 int w, h; 1816 int w, h;
1427 int x1, y1; 1817 int x1, y1;
1451 { 1841 {
1452 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1453 1843
1454 if (flags) 1844 if (flags)
1455 { 1845 {
1456 mapface face[3] = { 0, 0, 0 };
1457
1458 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1459 1848
1460 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1461 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1462 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1463 1852
1464 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1465 { 1854 {
1466 cell->darkness = -1; 1855 cell->darkness = 0;
1467 1856
1468 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1469 { 1858 {
1470 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1471 1860
1472 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || !self->tex [t].name)
1862 {
1473 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1474 } 1868 }
1475 } 1869 }
1476 } 1870 }
1477 } 1871 }
1478 } 1872 }
1479} 1873}
1480 1874
1481MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482 1876
1483CFClient::MixChunk 1877CFPlus::MixChunk
1484new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1485 CODE: 1879 CODE:
1486 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1487 OUTPUT: 1881 OUTPUT:
1488 RETVAL 1882 RETVAL
1489 1883
1490void 1884void
1491DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1492 CODE: 1886 CODE:
1493 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1494 1888
1495int 1889int
1496volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1497 CODE: 1891 CODE:
1498 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1499 OUTPUT: 1893 OUTPUT:
1500 RETVAL 1894 RETVAL
1501 1895
1502int 1896int
1503play (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)
1504 CODE: 1898 CODE:
1505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506 OUTPUT: 1900 OUTPUT:
1507 RETVAL 1901 RETVAL
1508 1902
1509MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510 1904
1511int 1905int
1512volume (int volume = -1) 1906volume (int volume = -1)
1513 CODE: 1907 CODE:
1514 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1515 OUTPUT: 1909 OUTPUT:
1516 RETVAL 1910 RETVAL
1517 1911
1518CFClient::MixMusic 1912CFPlus::MixMusic
1519new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1520 CODE: 1914 CODE:
1521 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1522 OUTPUT: 1916 OUTPUT:
1523 RETVAL 1917 RETVAL
1524 1918
1525void 1919void
1526DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1527 CODE: 1921 CODE:
1528 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1529 1923
1530int 1924int
1531play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1532 CODE: 1926 CODE:
1533 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1534 OUTPUT: 1928 OUTPUT:
1535 RETVAL 1929 RETVAL
1536 1930
1537MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538 1932
1539BOOT: 1933BOOT:
1540{ 1934{
1541 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542 static const struct { 1936 static const struct {
1543 const char *name; 1937 const char *name;
1544 IV iv; 1938 IV iv;
1545 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1546# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1553 const_iv (GL_SCISSOR_TEST), 1947 const_iv (GL_SCISSOR_TEST),
1554 const_iv (GL_DEPTH_TEST), 1948 const_iv (GL_DEPTH_TEST),
1555 const_iv (GL_ALPHA_TEST), 1949 const_iv (GL_ALPHA_TEST),
1556 const_iv (GL_NORMALIZE), 1950 const_iv (GL_NORMALIZE),
1557 const_iv (GL_RESCALE_NORMAL), 1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1558 const_iv (GL_AND), 1954 const_iv (GL_AND),
1559 const_iv (GL_ONE), 1955 const_iv (GL_ONE),
1560 const_iv (GL_ZERO), 1956 const_iv (GL_ZERO),
1561 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1562 const_iv (GL_SRC_ALPHA_SATURATE), 1958 const_iv (GL_DST_ALPHA),
1563 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564 const_iv (GL_ONE_MINUS_DST_ALPHA), 1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1961 const_iv (GL_SRC_ALPHA_SATURATE),
1565 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1566 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),
1567 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1568 const_iv (GL_UNSIGNED_SHORT), 1968 const_iv (GL_UNSIGNED_SHORT),
1569 const_iv (GL_UNSIGNED_INT), 1969 const_iv (GL_UNSIGNED_INT),
1570 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1571 const_iv (GL_INTENSITY), 1971 const_iv (GL_INTENSITY),
1603 const_iv (GL_SEPARABLE_2D), 2003 const_iv (GL_SEPARABLE_2D),
1604 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1605 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1606 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1607 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
1608 const_iv (GL_LINE_LOOP), 2009 const_iv (GL_LINE_LOOP),
1609 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1610 const_iv (GL_QUAD_STRIP), 2011 const_iv (GL_QUAD_STRIP),
1611 const_iv (GL_TRIANGLES), 2012 const_iv (GL_TRIANGLES),
1612 const_iv (GL_TRIANGLE_STRIP), 2013 const_iv (GL_TRIANGLE_STRIP),
1645 OUTPUT: 2046 OUTPUT:
1646 RETVAL 2047 RETVAL
1647 2048
1648int glGetError () 2049int glGetError ()
1649 2050
2051void glFinish ()
2052
1650void glClear (int mask) 2053void glClear (int mask)
1651 2054
1652void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1653 PROTOTYPE: @ 2056 PROTOTYPE: @
1654 2057
1677void glPushMatrix () 2080void glPushMatrix ()
1678 2081
1679void glPopMatrix () 2082void glPopMatrix ()
1680 2083
1681void glLoadIdentity () 2084void glLoadIdentity ()
2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
1682 2089
1683# near_ and far_ are due to microsofts buggy "c" compiler 2090# near_ and far_ are due to microsofts buggy "c" compiler
1684void 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_)
1685 2092
1686# near_ and far_ are due to microsofts buggy "c" compiler 2093# near_ and far_ are due to microsofts buggy "c" compiler
1716 r *= a; 2123 r *= a;
1717 g *= a; 2124 g *= a;
1718 b *= a; 2125 b *= a;
1719 } 2126 }
1720 // microsoft visual "c" rounds instead of truncating... 2127 // microsoft visual "c" rounds instead of truncating...
1721 glColor4ub (MIN ((int)(r * 256.f), 255), 2128 glColor4f (r, g, b, a);
1722 MIN ((int)(g * 256.f), 255),
1723 MIN ((int)(b * 256.f), 255),
1724 MIN ((int)(a * 256.f), 255));
1725 2129
1726void glInterleavedArrays (int format, int stride, char *data) 2130void glInterleavedArrays (int format, int stride, char *data)
1727 2131
1728void glDrawElements (int mode, int count, int type, char *indices) 2132void glDrawElements (int mode, int count, int type, char *indices)
1729 2133
1806 2210
1807void glEndList () 2211void glEndList ()
1808 2212
1809void glCallList (int list) 2213void glCallList (int list)
1810 2214
1811

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines