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.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // 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
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h>
15 23
16#include <SDL.h> 24#include <SDL.h>
17#include <SDL_endian.h> 25#include <SDL_endian.h>
18#include <SDL_image.h> 26#include <SDL_image.h>
19#include <SDL_mixer.h> 27#include <SDL_mixer.h>
20#include <SDL_opengl.h> 28#include <SDL_opengl.h>
21 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
22#include <glib/gmacros.h> 33#include <glib/gmacros.h>
23 34
24#include <pango/pango.h> 35#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 36
29#ifndef _WIN32 37#ifndef _WIN32
30# include <sys/types.h> 38# include <sys/types.h>
31# include <sys/socket.h> 39# include <sys/socket.h>
32# include <netinet/in.h> 40# include <netinet/in.h>
33# include <netinet/tcp.h> 41# include <netinet/tcp.h>
34# include <inttypes.h> 42# 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 43#endif
43 44
44#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 46
46#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
47 48
48#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
50 51
51#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
52 53
53#define GL_CALL(type,func,args) \ 54#if 0
54 { \ 55# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 56#else
56 static type fptr_; \ 57# define PARACHUTE 0
57 \ 58#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 59
60static struct
61{
62#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h"
64#undef GL_FUNC
65} gl;
66
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{
69 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else
74 glBlendFunc (sa, da);
75}
76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
68typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
70 85
71typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
87
88static int
89shape_attr_p (PangoLayoutRun *run)
90{
91 GSList *attrs = run->item->analysis.extra_attrs;
92
93 while (attrs)
94 {
95 PangoAttribute *attr = attrs->data;
96
97 if (attr->klass->type == PANGO_ATTR_SHAPE)
98 return 1;
99
100 attrs = attrs->next;
101 }
102
103 return 0;
104}
72 105
73typedef struct cf_layout { 106typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
77 int base_height; 109 int base_height;
78 CFClient__Font font; 110 CFPlus__Font font;
79} *CFClient__Layout; 111} *CFPlus__Layout;
80 112
81static CFClient__Font default_font; 113static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
84 116
85static void 117static void
86substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
87{ 119{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 121#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 123#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 125}
95 126
96static void 127static void
97layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
98{ 129{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
101 */ 132 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
106 137
107 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
108} 139}
109 140
110static void 141static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
114 148
115 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 151
118 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
119} 157}
120 158
121typedef uint16_t mapface; 159typedef uint16_t mapface;
122 160
123typedef struct { 161typedef struct {
126 float s, t; 164 float s, t;
127 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
128} maptex; 166} maptex;
129 167
130typedef struct { 168typedef struct {
131 int16_t darkness; 169 uint32_t player;
132 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
133} mapcell; 173} mapcell;
134 174
135typedef struct { 175typedef struct {
136 int32_t c0, c1; 176 int32_t c0, c1;
137 mapcell *col; 177 mapcell *col;
146 int texs; 186 int texs;
147 maptex *tex; 187 maptex *tex;
148 188
149 int32_t rows; 189 int32_t rows;
150 maprow *row; 190 maprow *row;
151} *CFClient__Map; 191} *CFPlus__Map;
152 192
153static char * 193static char *
154prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
155{ 195{
156 char *p; 196 char *p;
174 214
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 217
178static maprow * 218static maprow *
179map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
180{ 220{
181 if (0 > y) 221 if (0 > y)
182 { 222 {
183 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
222 262
223 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
224} 264}
225 265
226static mapcell * 266static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
228{ 268{
229 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
230} 270}
231 271
232static void 272static void
233map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
234{ 274{
235 int r; 275 int r;
236 276
237 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
246 self->row = 0; 286 self->row = 0;
247 self->rows = 0; 287 self->rows = 0;
248} 288}
249 289
250static void 290static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 292{
253 int x, y; 293 int x, y;
254 maprow *row; 294 maprow *row;
295 mapcell *cell;
255 296
256 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 298 if (y >= 0)
258 { 299 {
259 if (y >= self->rows) 300 if (y >= self->rows)
265 if (x >= row->c0) 306 if (x >= row->c0)
266 { 307 {
267 if (x >= row->c1) 308 if (x >= row->c1)
268 break; 309 break;
269 310
270 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
271 } 317 }
272 } 318 }
273} 319}
274 320
275static void 321static void
296 ev.data2 = 0; 342 ev.data2 = 0;
297 343
298 SDL_PushEvent ((SDL_Event *)&ev); 344 SDL_PushEvent ((SDL_Event *)&ev);
299} 345}
300 346
347static unsigned int
348minpot (unsigned int n)
349{
350 if (!n)
351 return 0;
352
353 --n;
354
355 n |= n >> 1;
356 n |= n >> 2;
357 n |= n >> 4;
358 n |= n >> 8;
359 n |= n >> 16;
360
361 return n + 1;
362}
363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
367
301MODULE = CFClient PACKAGE = CFClient 368MODULE = CFPlus PACKAGE = CFPlus
302 369
303PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
304 371
305BOOT: 372BOOT:
306{ 373{
307 HV *stash = gv_stashpv ("CFClient", 1); 374 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 375 static const struct {
309 const char *name; 376 const char *name;
310 IV iv; 377 IV iv;
311 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
313 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
314 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
315 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
316 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
317 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
326 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
327 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
328 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
329 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
330 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
331 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
332 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
333 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
334 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
335 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
390 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
391 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
392 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
393 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
394 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
395 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
396 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
397 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
398 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
399 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
400 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
401 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
402 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
403 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
404 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
405 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
406 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
407 const_iv (KMOD_CTRL),
408 const_iv (KMOD_SHIFT),
409 const_iv (KMOD_ALT),
410 const_iv (KMOD_META)
411# undef const_iv 487# undef const_iv
412 }; 488 };
413 489
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416} 495}
496
497int
498in_destruct ()
499 CODE:
500 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT:
502 RETVAL
503
504NV floor (NV x)
505
506NV ceil (NV x)
417 507
418void 508void
419pango_init () 509pango_init ()
420 CODE: 510 CODE:
421{ 511{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 512 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 515}
430 516
431int 517int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 519
434void 520void
435SDL_Quit () 521SDL_Quit ()
436 522
437void 523void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 533
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 536
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 541
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
457 547
458 SDL_EnableUNICODE (1); 548 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 550
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 569SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 570 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 571 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 572 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 573 );
574 if (RETVAL)
575 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 576 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578# include "glfunc.h"
579# undef GL_FUNC
580 }
485 OUTPUT: 581 OUTPUT:
486 RETVAL 582 RETVAL
487 583
488void 584void
489SDL_GL_SwapBuffers () 585SDL_GL_SwapBuffers ()
507 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
508 case SDL_KEYUP: 604 case SDL_KEYUP:
509 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
510 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
511 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
512 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
513 break; 610 break;
514 611
515 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 641 break;
545 } 642 }
546 643
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 645 }
549} 646}
550 647
551int 648int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
565 CODE: 662 CODE:
566#ifndef _WIN32 663#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 665#endif
569 666
570char * 667void
571gl_vendor () 668win32_proxy_info ()
572 CODE: 669 PPCODE:
573 RETVAL = (char *)glGetString (GL_VENDOR); 670{
574 OUTPUT: 671#ifdef _WIN32
575 RETVAL 672 char buffer[2048];
673 DWORD buflen;
576 674
577char * 675 EXTEND (SP, 3);
578gl_version () 676
579 CODE: 677 buflen = sizeof (buffer);
580 RETVAL = (char *)glGetString (GL_VERSION); 678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
581 OUTPUT: 679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
582 RETVAL 680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
583 682
584char * 683 buflen = sizeof (buffer);
585gl_extensions () 684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
586 CODE: 685 {
587 RETVAL = (char *)glGetString (GL_EXTENSIONS); 686 PUSHs (newSVpv (buffer, 0));
588 OUTPUT: 687
589 RETVAL 688 buflen = sizeof (buffer);
689 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
690 PUSHs (newSVpv (buffer, 0));
691 }
692 }
693#endif
694}
590 695
591void 696void
592add_font (char *file) 697add_font (char *file)
593 CODE: 698 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 700
600void 701void
601load_image_inline (SV *image_) 702load_image_inline (SV *image_)
602 ALIAS: 703 ALIAS:
603 load_image_file = 1 704 load_image_file = 1
645 746
646 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 747 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647 748
648 assert (surface2->pitch == surface2->w * 4); 749 assert (surface2->pitch == surface2->w * 4);
649 750
751 SDL_LockSurface (surface2);
650 EXTEND (SP, 5); 752 EXTEND (SP, 6);
651 PUSHs (sv_2mortal (newSViv (surface2->w))); 753 PUSHs (sv_2mortal (newSViv (surface2->w)));
652 PUSHs (sv_2mortal (newSViv (surface2->h))); 754 PUSHs (sv_2mortal (newSViv (surface2->h)));
653 SDL_LockSurface (surface2);
654 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 755 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655 SDL_UnlockSurface (surface2);
656 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 756 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 757 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 758 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
759 SDL_UnlockSurface (surface2);
659 760
660 SDL_FreeSurface (surface); 761 SDL_FreeSurface (surface);
661 SDL_FreeSurface (surface2); 762 SDL_FreeSurface (surface2);
662} 763}
663 764
699 CODE: 800 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 801 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 802#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 804#endif
704 exit (1); 805 _exit (1);
705 806
807void
808_exit (int retval = 0)
809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
813 _exit (retval);
814#endif
815
706MODULE = CFClient PACKAGE = CFClient::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
707 817
708CFClient::Font 818CFPlus::Font
709new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
710 CODE: 820 CODE:
711{ 821{
712 int count; 822 int count;
713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
716} 826}
717 OUTPUT: 827 OUTPUT:
718 RETVAL 828 RETVAL
719 829
720void 830void
721DESTROY (CFClient::Font self) 831DESTROY (CFPlus::Font self)
722 CODE: 832 CODE:
723 pango_font_description_free (self); 833 pango_font_description_free (self);
724 834
725void 835void
726make_default (CFClient::Font self) 836make_default (CFPlus::Font self)
727 CODE: 837 CODE:
728 default_font = self; 838 default_font = self;
729 839
730MODULE = CFClient PACKAGE = CFClient::Layout 840MODULE = CFPlus PACKAGE = CFPlus::Layout
731 841
732CFClient::Layout 842void
733new (SV *class, int rgba = 0) 843reset_glyph_cache ()
734 CODE: 844 CODE:
735#if _WIN32 845 tc_clear ();
736 rgba = 0;//D 846
737#endif 847CFPlus::Layout
848new (SV *class)
849 CODE:
738 New (0, RETVAL, 1, struct cf_layout); 850 New (0, RETVAL, 1, struct cf_layout);
739 851
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 852 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 853 RETVAL->r = 1.;
743 RETVAL->g = 1.; 854 RETVAL->g = 1.;
744 RETVAL->b = 1.; 855 RETVAL->b = 1.;
745 RETVAL->a = 1.; 856 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 857 RETVAL->base_height = MIN_FONT_HEIGHT;
750 layout_update_font (RETVAL); 861 layout_update_font (RETVAL);
751 OUTPUT: 862 OUTPUT:
752 RETVAL 863 RETVAL
753 864
754void 865void
755DESTROY (CFClient::Layout self) 866DESTROY (CFPlus::Layout self)
756 CODE: 867 CODE:
757 g_object_unref (self->pl); 868 g_object_unref (self->pl);
758 Safefree (self); 869 Safefree (self);
759 870
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 871void
768set_text (CFClient::Layout self, SV *text_) 872set_text (CFPlus::Layout self, SV *text_)
769 CODE: 873 CODE:
770{ 874{
771 STRLEN textlen; 875 STRLEN textlen;
772 char *text = SvPVutf8 (text_, textlen); 876 char *text = SvPVutf8 (text_, textlen);
773 877
774 pango_layout_set_text (self->pl, text, textlen); 878 pango_layout_set_text (self->pl, text, textlen);
775} 879}
776 880
777void 881void
778set_markup (CFClient::Layout self, SV *text_) 882set_markup (CFPlus::Layout self, SV *text_)
779 CODE: 883 CODE:
780{ 884{
781 STRLEN textlen; 885 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 886 char *text = SvPVutf8 (text_, textlen);
783 887
784 pango_layout_set_markup (self->pl, text, textlen); 888 pango_layout_set_markup (self->pl, text, textlen);
785} 889}
786 890
891void
892set_shapes (CFPlus::Layout self, ...)
893 CODE:
894{
895 PangoAttrList *attrs = 0;
896 const char *text = pango_layout_get_text (self->pl);
897 const char *pos = text;
898 int arg = 4;
899
900 while (arg < items && (pos = strstr (pos, OBJ_STR)))
901 {
902 PangoRectangle inkrect, rect;
903 PangoAttribute *attr;
904
905 int x = SvIV (ST (arg - 3));
906 int y = SvIV (ST (arg - 2));
907 int w = SvIV (ST (arg - 1));
908 int h = SvIV (ST (arg ));
909
910 inkrect.x = 0;
911 inkrect.y = 0;
912 inkrect.width = 0;
913 inkrect.height = 0;
914
915 rect.x = x * PANGO_SCALE;
916 rect.y = y * PANGO_SCALE;
917 rect.width = w * PANGO_SCALE;
918 rect.height = h * PANGO_SCALE;
919
920 if (!attrs)
921 attrs = pango_layout_get_attributes (self->pl);
922
923 attr = pango_attr_shape_new (&inkrect, &rect);
924 attr->start_index = pos - text;
925 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
926 pango_attr_list_insert (attrs, attr);
927
928 arg += 4;
929 pos += sizeof (OBJ_STR) - 1;
930 }
931
932 if (attrs)
933 pango_layout_set_attributes (self->pl, attrs);
934}
935
936void
937get_shapes (CFPlus::Layout self)
938 PPCODE:
939{
940 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
941
942 do
943 {
944 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
945
946 if (run && shape_attr_p (run))
947 {
948 PangoRectangle extents;
949 pango_layout_iter_get_run_extents (iter, 0, &extents);
950
951 EXTEND (SP, 2);
952 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
953 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
954 }
955 }
956 while (pango_layout_iter_next_run (iter));
957
958 pango_layout_iter_free (iter);
959}
960
961int
962has_wrapped (CFPlus::Layout self)
963 CODE:
964{
965 int lines = 1;
966 const char *text = pango_layout_get_text (self->pl);
967
968 while (*text)
969 lines += *text++ == '\n';
970
971 RETVAL = lines < pango_layout_get_line_count (self->pl);
972}
973 OUTPUT:
974 RETVAL
975
787SV * 976SV *
788get_text (CFClient::Layout self) 977get_text (CFPlus::Layout self)
789 CODE: 978 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 980 sv_utf8_decode (RETVAL);
792 OUTPUT: 981 OUTPUT:
793 RETVAL 982 RETVAL
794 983
795void 984void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797 CODE: 986 CODE:
798 self->r = r; 987 self->r = r;
799 self->g = g; 988 self->g = g;
800 self->b = b; 989 self->b = b;
801 self->a = a; 990 self->a = a;
802 991
803void 992void
804set_font (CFClient::Layout self, CFClient::Font font = 0) 993set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805 CODE: 994 CODE:
806 if (self->font != font) 995 if (self->font != font)
807 { 996 {
808 self->font = font; 997 self->font = font;
809 layout_update_font (self); 998 layout_update_font (self);
810 } 999 }
811 1000
812void 1001void
813set_height (CFClient::Layout self, int base_height) 1002set_height (CFPlus::Layout self, int base_height)
814 CODE: 1003 CODE:
815 if (self->base_height != base_height) 1004 if (self->base_height != base_height)
816 { 1005 {
817 self->base_height = base_height; 1006 self->base_height = base_height;
818 layout_update_font (self); 1007 layout_update_font (self);
819 } 1008 }
820 1009
821void 1010void
822set_width (CFClient::Layout self, int max_width = -1) 1011set_width (CFPlus::Layout self, int max_width = -1)
823 CODE: 1012 CODE:
824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1013 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825 1014
826void 1015void
827set_indent (CFClient::Layout self, int indent) 1016set_indent (CFPlus::Layout self, int indent)
828 CODE: 1017 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830 1019
831void 1020void
832set_spacing (CFClient::Layout self, int spacing) 1021set_spacing (CFPlus::Layout self, int spacing)
833 CODE: 1022 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835 1024
836void 1025void
837set_ellipsise (CFClient::Layout self, int ellipsise) 1026set_ellipsise (CFPlus::Layout self, int ellipsise)
838 CODE: 1027 CODE:
839 pango_layout_set_ellipsize (self->pl, 1028 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE 1032 : PANGO_ELLIPSIZE_NONE
844 ); 1033 );
845 1034
846void 1035void
847set_single_paragraph_mode (CFClient::Layout self, int spm) 1036set_single_paragraph_mode (CFPlus::Layout self, int spm)
848 CODE: 1037 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850 1039
851void 1040void
852size (CFClient::Layout self) 1041size (CFPlus::Layout self)
853 PPCODE: 1042 PPCODE:
854{ 1043{
855 int w, h; 1044 int w, h;
856 1045
857 layout_get_pixel_size (self, &w, &h); 1046 layout_get_pixel_size (self, &w, &h);
860 PUSHs (sv_2mortal (newSViv (w))); 1049 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 1050 PUSHs (sv_2mortal (newSViv (h)));
862} 1051}
863 1052
864int 1053int
1054descent (CFPlus::Layout self)
1055 CODE:
1056{
1057 PangoRectangle rect;
1058 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1059 pango_layout_line_get_pixel_extents (line, 0, &rect);
1060 RETVAL = PANGO_DESCENT (rect);
1061}
1062 OUTPUT:
1063 RETVAL
1064
1065int
865xy_to_index (CFClient::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
866 CODE: 1067 CODE:
867{ 1068{
868 int index, trailing; 1069 int index, trailing;
869 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870 RETVAL = index; 1071 RETVAL = index + trailing;
871} 1072}
872 OUTPUT: 1073 OUTPUT:
873 RETVAL 1074 RETVAL
874 1075
875void 1076void
876cursor_pos (CFClient::Layout self, int index) 1077cursor_pos (CFPlus::Layout self, int index)
877 PPCODE: 1078 PPCODE:
878{ 1079{
879 PangoRectangle strong_pos; 1080 PangoRectangle strong_pos;
880 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881 1082
884 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1087}
887 1088
888void 1089void
889render (CFClient::Layout self) 1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
890 PPCODE: 1091 PPCODE:
891{ 1092{
892 SV *retval; 1093 int line, x;
893 int w, h;
894 1094
895 layout_get_pixel_size (self, &w, &h); 1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
896 1097
897 if (self->rgba)
898 {
899 cairo_surface_t *surface;
900 cairo_t *cairo;
901
902 retval = newSV (w * h * 4);
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 {
920 uint32_t *p = (uint32_t *)SvPVX (retval);
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 {
925 uint32_t rgba = *p;
926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
939 rgba = SDL_SwapBE32 (rgba);
940 *p++ = rgba;
941 }
942 }
943
944 EXTEND (SP, 5); 1098 EXTEND (SP, 2);
945 PUSHs (sv_2mortal (newSViv (w))); 1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
946 PUSHs (sv_2mortal (newSViv (h))); 1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 }
951 else 1121 else
952 { 1122 {
953 FT_Bitmap bitmap;
954
955 retval = newSV (w * h);
956 SvPOK_only (retval);
957 SvCUR_set (retval, w * h);
958
959 bitmap.rows = h;
960 bitmap.width = w;
961 bitmap.pitch = w;
962 bitmap.buffer = (unsigned char*)SvPVX (retval);
963 bitmap.num_grays = 256;
964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966 memset (bitmap.buffer, 0, w * h);
967
968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970 EXTEND (SP, 5);
971 PUSHs (sv_2mortal (newSViv (w))); 1123 PUSHs (sv_2mortal (newSViv (index)));
972 PUSHs (sv_2mortal (newSViv (h))); 1124 PUSHs (sv_2mortal (newSViv (trailing)));
973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 } 1125 }
977} 1126}
978 1127
1128void
1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1130 PPCODE:
1131 pango_opengl_render_layout_subpixel (
1132 self->pl,
1133 x * PANGO_SCALE, y * PANGO_SCALE,
1134 self->r, self->g, self->b, self->a,
1135 flags
1136 );
1137
979MODULE = CFClient PACKAGE = CFClient::Texture 1138MODULE = CFPlus PACKAGE = CFPlus::Texture
980 1139
981void 1140void
1141pad2pot (SV *data_, SV *w_, SV *h_)
1142 CODE:
1143{
1144 int ow = SvIV (w_);
1145 int oh = SvIV (h_);
1146
1147 if (ow && oh)
1148 {
1149 int nw = minpot (ow);
1150 int nh = minpot (oh);
1151
1152 if (nw != ow || nh != oh)
1153 {
1154 if (SvOK (data_))
1155 {
1156 STRLEN datalen;
1157 char *data = SvPVbyte (data_, datalen);
1158 int bpp = datalen / (ow * oh);
1159 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1160
1161 SvPOK_only (result_);
1162 SvCUR_set (result_, nw * nh * bpp);
1163
1164 memset (SvPVX (result_), 0, nw * nh * bpp);
1165 while (oh--)
1166 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167
1168 sv_setsv (data_, result_);
1169 }
1170
1171 sv_setiv (w_, nw);
1172 sv_setiv (h_, nh);
1173 }
1174 }
1175}
1176
1177void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1178draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1179 PROTOTYPE: $$$;$$
984 ALIAS: 1180 ALIAS:
985 draw_quad_alpha = 1 1181 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1182 draw_quad_alpha_premultiplied = 2
987 CODE: 1183 CODE:
988{ 1184{
989 HV *hv = (HV *)SvRV (self); 1185 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1186 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1187 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1188 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1189
995 if (items < 5) 1190 if (items < 5)
996 { 1191 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1192 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1193 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1194 }
1000 1195
1001 if (ix) 1196 if (ix)
1002 { 1197 {
1003 glEnable (GL_BLEND); 1198 glEnable (GL_BLEND);
1199
1200 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1201 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1202 else
1203 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1204 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1205
1005 glEnable (GL_ALPHA_TEST); 1206 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1207 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1208 }
1008 1209
1009 glBindTexture (GL_TEXTURE_2D, name); 1210 glBindTexture (GL_TEXTURE_2D, name);
1010
1011 if (wrap_mode)
1012 {
1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015 }
1016 1211
1017 glBegin (GL_QUADS); 1212 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1213 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1214 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1215 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1026 glDisable (GL_ALPHA_TEST); 1221 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1222 glDisable (GL_BLEND);
1028 } 1223 }
1029} 1224}
1030 1225
1031MODULE = CFClient PACKAGE = CFClient::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1227
1033CFClient::Map 1228CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1229new (SV *class)
1035 CODE: 1230 CODE:
1036 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1232 RETVAL->x = 0;
1038 RETVAL->y = 0; 1233 RETVAL->y = 0;
1039 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1040 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1041 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1042 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1043 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1044 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1045 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
1048 RETVAL->row = 0; 1243 RETVAL->row = 0;
1049 OUTPUT: 1244 OUTPUT:
1050 RETVAL 1245 RETVAL
1051 1246
1052void 1247void
1053DESTROY (CFClient::Map self) 1248DESTROY (CFPlus::Map self)
1054 CODE: 1249 CODE:
1055{ 1250{
1056 map_clear (self); 1251 map_clear (self);
1057 Safefree (self->face); 1252 Safefree (self->face);
1253 Safefree (self->tex);
1058 Safefree (self); 1254 Safefree (self);
1059} 1255}
1060 1256
1061void 1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1262
1263void
1062clear (CFClient::Map self) 1264clear (CFPlus::Map self)
1063 CODE: 1265 CODE:
1064 map_clear (self); 1266 map_clear (self);
1065 1267
1066void 1268void
1067set_face (CFClient::Map self, int face, int texid) 1269set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1270 CODE:
1069{ 1271{
1070 while (self->faces <= face) 1272 while (self->faces <= face)
1071 { 1273 {
1072 Append (mapface, self->face, self->faces, self->faces); 1274 Append (mapface, self->face, self->faces, self->faces);
1075 1277
1076 self->face [face] = texid; 1278 self->face [face] = texid;
1077} 1279}
1078 1280
1079void 1281void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1283 CODE:
1082{ 1284{
1083 while (self->texs <= texid) 1285 while (self->texs <= texid)
1084 { 1286 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1287 Append (maptex, self->tex, self->texs, self->texs);
1097 tex->r = r; 1299 tex->r = r;
1098 tex->g = g; 1300 tex->g = g;
1099 tex->b = b; 1301 tex->b = b;
1100 tex->a = a; 1302 tex->a = a;
1101 } 1303 }
1304
1305 // somewhat hackish, but for textures that require it, it really
1306 // improves the look, and most others don't suffer.
1307 glBindTexture (GL_TEXTURE_2D, name);
1308 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1309 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1310 // use uglier nearest interpolation because linear suffers
1311 // from transparent color bleeding and ugly wrapping effects.
1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102} 1313}
1103 1314
1104int 1315int
1105ox (CFClient::Map self) 1316ox (CFPlus::Map self)
1106 ALIAS: 1317 ALIAS:
1107 oy = 1 1318 oy = 1
1319 x = 2
1320 y = 3
1321 w = 4
1322 h = 5
1108 CODE: 1323 CODE:
1109 switch (ix) 1324 switch (ix)
1110 { 1325 {
1111 case 0: RETVAL = self->ox; break; 1326 case 0: RETVAL = self->ox; break;
1112 case 1: RETVAL = self->oy; break; 1327 case 1: RETVAL = self->oy; break;
1328 case 2: RETVAL = self->x; break;
1329 case 3: RETVAL = self->y; break;
1330 case 4: RETVAL = self->w; break;
1331 case 5: RETVAL = self->h; break;
1113 } 1332 }
1114 OUTPUT: 1333 OUTPUT:
1115 RETVAL 1334 RETVAL
1116 1335
1117void 1336void
1118scroll (CFClient::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1119 CODE: 1338 CODE:
1120{ 1339{
1121 if (dx > 0) 1340 if (dx > 0)
1122 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1123 else if (dx < 0) 1342 else if (dx < 0)
1124 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1125 1344
1126 if (dy > 0) 1345 if (dy > 0)
1127 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1128 else if (dy < 0) 1347 else if (dy < 0)
1129 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1130 1349
1131 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1132 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1133 1352
1134 while (self->y < 0) 1353 while (self->y < 0)
1139 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
1140 } 1359 }
1141} 1360}
1142 1361
1143void 1362void
1144map1a_update (CFClient::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
1145 CODE: 1364 CODE:
1146{ 1365{
1147 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1148 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
1149 mapcell *cell; 1368 mapcell *cell;
1150 int x, y, flags; 1369 int x, y, flags;
1151 1370
1152 while (data < data_end) 1371 while (data < data_end - 1)
1153 { 1372 {
1154 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
1155 1374
1156 x = ((flags >> 10) & 63) + self->x; 1375 x = self->x + ((flags >> 10) & 63);
1157 y = ((flags >> 4) & 63) + self->y; 1376 y = self->y + ((flags >> 4) & 63);
1158 1377
1159 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
1160 1379
1161 if (flags & 15) 1380 if (flags & 15)
1162 { 1381 {
1163 if (cell->darkness < 0) 1382 if (!cell->darkness)
1164 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1165 cell->darkness = 0; 1385 cell->darkness = 256;
1166 cell->face [0] = 0;
1167 cell->face [1] = 0;
1168 cell->face [2] = 0;
1169 } 1386 }
1170 1387
1171 cell->darkness = flags & 8 ? *data++ : 255;
1172
1173 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1389
1390 if (flags & 8)
1391 {
1392 if (extmap)
1393 {
1394 uint8_t ext, cmd;
1395
1396 do
1397 {
1398 ext = *data++;
1399 cmd = ext & 0x3f;
1400
1401 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health
1404 {
1405 cell->stat_width = 1;
1406 cell->stat_hp = *data++;
1407 }
1408 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width
1411 {
1412 if (*data == 4)
1413 ; // decode player tag
1414
1415 data += *data + 1;
1416 }
1417 else if (cmd == 8) // cell flags
1418 cell->flags = *data++;
1419 else if (ext & 0x40) // unknown, multibyte => skip
1420 data += *data + 1;
1421 else
1422 data++;
1423 }
1424 while (ext & 0x80);
1425 }
1426 else
1427 cell->darkness = *data++ + 1;
1428 }
1174 1429
1175 if (flags & 4) 1430 if (flags & 4)
1176 { 1431 {
1177 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1178 } 1433 }
1186 { 1441 {
1187 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1188 } 1443 }
1189 } 1444 }
1190 else 1445 else
1191 cell->darkness = -1; 1446 cell->darkness = 0;
1192 } 1447 }
1193} 1448}
1194 1449
1195SV * 1450SV *
1196mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1197 CODE: 1452 CODE:
1198{ 1453{
1199 int x1, x; 1454 int x1, x;
1200 int y1, y; 1455 int y1, y;
1201 int z; 1456 int z;
1251} 1506}
1252 OUTPUT: 1507 OUTPUT:
1253 RETVAL 1508 RETVAL
1254 1509
1255void 1510void
1256draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1257 PPCODE: 1512 CODE:
1258{ 1513{
1259 int vx, vy;
1260 int x, y, z; 1514 int x, y, z;
1261 int last_name; 1515 int last_name;
1262 mapface face; 1516 mapface face;
1263 int sw4 = (sw + 3) & ~3;
1264 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1265 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1266
1267 memset (darkness, 255, sw4 * sh);
1268 SvPOK_only (darkness_sv);
1269 SvCUR_set (darkness_sv, sw4 * sh);
1270
1271 vx = self->x + (self->w - sw) / 2 - shift_x;
1272 vy = self->y + (self->h - sh) / 2 - shift_y;
1273
1274 /*
1275 int vx = self->vx = self->w >= sw
1276 ? self->x + (self->w - sw) / 2
1277 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1278
1279 int vy = self->vy = self->h >= sh
1280 ? self->y + (self->h - sh) / 2
1281 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282 */
1283 1517
1284 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1285 1519
1520 glEnable (GL_BLEND);
1286 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287 glEnable (GL_BLEND);
1288 glEnable (GL_TEXTURE_2D); 1522 glEnable (GL_TEXTURE_2D);
1289 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290 1524
1291 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1292 1526
1293 last_name = 0; 1527 last_name = 0;
1294 1528
1529 mx += self->x;
1530 my += self->y;
1531
1295 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1296 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1297 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1298 { 1535 {
1299 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1300 1537
1301 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1302 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1303 { 1540 {
1304 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1305
1306 darkness[y * sw4 + x] = cell->darkness < 0
1307 ? 255 - FOW_DARKNESS
1308 : 255 - cell->darkness;
1309 1542
1310 face = cell->face [z]; 1543 face = cell->face [z];
1311 1544
1312 if (face) 1545 if (face && face < self->texs)
1313 { 1546 {
1314 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1315
1316 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1317 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1318 1550
1319 if (last_name != tex.name) 1551 if (last_name != tex.name)
1320 { 1552 {
1321 glEnd (); 1553 glEnd ();
1322 last_name = tex.name;
1323 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1324 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1325 } 1556 }
1326 1557
1327 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1328 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1329 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1330 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1331 } 1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1)
1567 {
1568 maptex tex = self->tex [1];
1569 int px = (x + 1) * 32 - tex.w + 2;
1570 int py = (y + 1) * 32 - tex.h - 6;
1571
1572 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574 glBegin (GL_QUADS);
1575
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580 }
1581 }
1332 } 1582 }
1333 } 1583 }
1334 1584
1335 glEnd (); 1585 glEnd ();
1336 1586
1337 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1338 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1589
1590 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows)
1593 {
1594 maprow *row = self->row + (y + my);
1595
1596 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1)
1598 {
1599 mapcell *cell = row->col + (x + mx - row->c0);
1600
1601 int px = x * 32;
1602 int py = y * 32;
1603
1604 if (cell->stat_hp)
1605 {
1606 int width = cell->stat_width * 32;
1607 int thick = sh / 28 + 1 + cell->stat_width;
1608
1609 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py);
1612
1613 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1614 glRectf (px + 2,
1615 py - thick - 1,
1616 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1617 }
1618 }
1619 }
1620}
1621
1622void
1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1624 CODE:
1625{
1626 static float color[16][3] = {
1627 { 0.00F, 0.00F, 0.00F },
1628 { 1.00F, 1.00F, 1.00F },
1629 { 0.00F, 0.00F, 0.55F },
1630 { 1.00F, 0.00F, 0.00F },
1631
1632 { 1.00F, 0.54F, 0.00F },
1633 { 0.11F, 0.56F, 1.00F },
1634 { 0.93F, 0.46F, 0.00F },
1635 { 0.18F, 0.54F, 0.34F },
1636
1637 { 0.56F, 0.73F, 0.56F },
1638 { 0.80F, 0.80F, 0.80F },
1639 { 0.55F, 0.41F, 0.13F },
1640 { 0.99F, 0.77F, 0.26F },
1641
1642 { 0.74F, 0.65F, 0.41F },
1643
1644 { 0.00F, 1.00F, 1.00F },
1645 { 1.00F, 0.00F, 1.00F },
1646 { 1.00F, 1.00F, 0.00F },
1647 };
1648
1649 int x, y;
1650
1651 glEnable (GL_TEXTURE_2D);
1652 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1653 glEnable (GL_BLEND);
1654 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1655 glBegin (GL_QUADS);
1656
1657 for (y = 0; y < h; y++)
1658 for (x = 0; x < w; x++)
1659 {
1660 unsigned char m = data [x + y * w];
1661
1662 if (m)
1663 {
1664 float *c = color [m & 15];
1665
1666 float tx1 = m & 0x40 ? 0.5 : 0.;
1667 float tx2 = tx1 + 0.5;
1668
1669 glColor4f (c[0], c[1], c[2], 0.75);
1670 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1671 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1672 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1673 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1674 }
1675 }
1676
1677 glEnd ();
1678 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D);
1680}
1681
1682void
1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1684 PPCODE:
1685{
1686 int x, y;
1687 int sw4 = (sw + 3) & ~3;
1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1690
1691 memset (darkness, 255, sw4 * sh);
1692 SvPOK_only (darkness_sv);
1693 SvCUR_set (darkness_sv, sw4 * sh);
1694
1695 mx += self->x;
1696 my += self->y;
1697
1698 for (y = 0; y < sh; y++)
1699 if (0 <= y + my && y + my < self->rows)
1700 {
1701 maprow *row = self->row + (y + my);
1702
1703 for (x = 0; x < sw; x++)
1704 if (row->c0 <= x + mx && x + mx < row->c1)
1705 {
1706 mapcell *cell = row->col + (x + mx - row->c0);
1707
1708 darkness[y * sw4 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1)
1710 : 255 - FOW_DARKNESS;
1711 }
1712 }
1339 1713
1340 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1341 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
1342 PUSHs (sv_2mortal (newSViv (sh))); 1716 PUSHs (sv_2mortal (newSViv (sh)));
1343 PUSHs (darkness_sv); 1717 PUSHs (darkness_sv);
1344} 1718}
1345 1719
1346SV * 1720SV *
1347get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1348 CODE: 1722 CODE:
1349{ 1723{
1350 int x, y, x1, y1; 1724 int x, y, x1, y1;
1351 SV *data_sv = newSV (w * h * 7 + 5); 1725 SV *data_sv = newSV (w * h * 7 + 5);
1352 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1726 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1414} 1788}
1415 OUTPUT: 1789 OUTPUT:
1416 RETVAL 1790 RETVAL
1417 1791
1418void 1792void
1419set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1420 PPCODE: 1794 PPCODE:
1421{ 1795{
1422 int x, y, z; 1796 int x, y, z;
1423 int w, h; 1797 int w, h;
1424 int x1, y1; 1798 int x1, y1;
1456 1830
1457 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1458 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1459 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1460 1834
1461 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1462 { 1836 {
1463 cell->darkness = -1; 1837 cell->darkness = 0;
1464 1838
1465 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1466 { 1840 {
1467 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1468 1842
1473 } 1847 }
1474 } 1848 }
1475 } 1849 }
1476} 1850}
1477 1851
1478MODULE = CFClient PACKAGE = CFClient::MixChunk 1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1479 1853
1480CFClient::MixChunk 1854CFPlus::MixChunk
1481new_from_file (SV *class, char *path) 1855new_from_file (SV *class, char *path)
1482 CODE: 1856 CODE:
1483 RETVAL = Mix_LoadWAV (path); 1857 RETVAL = Mix_LoadWAV (path);
1484 OUTPUT: 1858 OUTPUT:
1485 RETVAL 1859 RETVAL
1486 1860
1487void 1861void
1488DESTROY (CFClient::MixChunk self) 1862DESTROY (CFPlus::MixChunk self)
1489 CODE: 1863 CODE:
1490 Mix_FreeChunk (self); 1864 Mix_FreeChunk (self);
1491 1865
1492int 1866int
1493volume (CFClient::MixChunk self, int volume = -1) 1867volume (CFPlus::MixChunk self, int volume = -1)
1494 CODE: 1868 CODE:
1495 RETVAL = Mix_VolumeChunk (self, volume); 1869 RETVAL = Mix_VolumeChunk (self, volume);
1496 OUTPUT: 1870 OUTPUT:
1497 RETVAL 1871 RETVAL
1498 1872
1499int 1873int
1500play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1874play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1501 CODE: 1875 CODE:
1502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1503 OUTPUT: 1877 OUTPUT:
1504 RETVAL 1878 RETVAL
1505 1879
1506MODULE = CFClient PACKAGE = CFClient::MixMusic 1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1507 1881
1508int 1882int
1509volume (int volume = -1) 1883volume (int volume = -1)
1510 CODE: 1884 CODE:
1511 RETVAL = Mix_VolumeMusic (volume); 1885 RETVAL = Mix_VolumeMusic (volume);
1512 OUTPUT: 1886 OUTPUT:
1513 RETVAL 1887 RETVAL
1514 1888
1515CFClient::MixMusic 1889CFPlus::MixMusic
1516new_from_file (SV *class, char *path) 1890new_from_file (SV *class, char *path)
1517 CODE: 1891 CODE:
1518 RETVAL = Mix_LoadMUS (path); 1892 RETVAL = Mix_LoadMUS (path);
1519 OUTPUT: 1893 OUTPUT:
1520 RETVAL 1894 RETVAL
1521 1895
1522void 1896void
1523DESTROY (CFClient::MixMusic self) 1897DESTROY (CFPlus::MixMusic self)
1524 CODE: 1898 CODE:
1525 Mix_FreeMusic (self); 1899 Mix_FreeMusic (self);
1526 1900
1527int 1901int
1528play (CFClient::MixMusic self, int loops = -1) 1902play (CFPlus::MixMusic self, int loops = -1)
1529 CODE: 1903 CODE:
1530 RETVAL = Mix_PlayMusic (self, loops); 1904 RETVAL = Mix_PlayMusic (self, loops);
1531 OUTPUT: 1905 OUTPUT:
1532 RETVAL 1906 RETVAL
1533 1907
1534MODULE = CFClient PACKAGE = CFClient::OpenGL 1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1535 1909
1536BOOT: 1910BOOT:
1537{ 1911{
1538 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1539 static const struct { 1913 static const struct {
1540 const char *name; 1914 const char *name;
1541 IV iv; 1915 IV iv;
1542 } *civ, const_iv[] = { 1916 } *civ, const_iv[] = {
1543# define const_iv(name) { # name, (IV)name } 1917# define const_iv(name) { # name, (IV)name }
1550 const_iv (GL_SCISSOR_TEST), 1924 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST), 1925 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST), 1926 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE), 1927 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL), 1928 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT),
1930 const_iv (GL_BACK),
1555 const_iv (GL_AND), 1931 const_iv (GL_AND),
1556 const_iv (GL_ONE), 1932 const_iv (GL_ONE),
1557 const_iv (GL_ZERO), 1933 const_iv (GL_ZERO),
1558 const_iv (GL_SRC_ALPHA), 1934 const_iv (GL_SRC_ALPHA),
1559 const_iv (GL_SRC_ALPHA_SATURATE), 1935 const_iv (GL_DST_ALPHA),
1560 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1936 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561 const_iv (GL_ONE_MINUS_DST_ALPHA), 1937 const_iv (GL_ONE_MINUS_DST_ALPHA),
1938 const_iv (GL_SRC_ALPHA_SATURATE),
1562 const_iv (GL_RGB), 1939 const_iv (GL_RGB),
1563 const_iv (GL_RGBA), 1940 const_iv (GL_RGBA),
1941 const_iv (GL_RGBA4),
1942 const_iv (GL_RGBA8),
1943 const_iv (GL_RGB5_A1),
1564 const_iv (GL_UNSIGNED_BYTE), 1944 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT), 1945 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT), 1946 const_iv (GL_UNSIGNED_INT),
1567 const_iv (GL_ALPHA), 1947 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY), 1948 const_iv (GL_INTENSITY),
1577 const_iv (GL_TEXTURE_MAG_FILTER), 1957 const_iv (GL_TEXTURE_MAG_FILTER),
1578 const_iv (GL_TEXTURE_MIN_FILTER), 1958 const_iv (GL_TEXTURE_MIN_FILTER),
1579 const_iv (GL_TEXTURE_ENV_MODE), 1959 const_iv (GL_TEXTURE_ENV_MODE),
1580 const_iv (GL_TEXTURE_WRAP_S), 1960 const_iv (GL_TEXTURE_WRAP_S),
1581 const_iv (GL_TEXTURE_WRAP_T), 1961 const_iv (GL_TEXTURE_WRAP_T),
1962 const_iv (GL_REPEAT),
1582 const_iv (GL_CLAMP), 1963 const_iv (GL_CLAMP),
1583 const_iv (GL_REPEAT), 1964 const_iv (GL_CLAMP_TO_EDGE),
1584 const_iv (GL_NEAREST), 1965 const_iv (GL_NEAREST),
1585 const_iv (GL_LINEAR), 1966 const_iv (GL_LINEAR),
1586 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1967 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1968 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1969 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1599 const_iv (GL_SEPARABLE_2D), 1980 const_iv (GL_SEPARABLE_2D),
1600 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1601 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1602 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1603 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1604 const_iv (GL_LINE_LOOP), 1986 const_iv (GL_LINE_LOOP),
1605 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1606 const_iv (GL_QUAD_STRIP), 1988 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES), 1989 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP), 1990 const_iv (GL_TRIANGLE_STRIP),
1618 2000
1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621} 2003}
1622 2004
2005char *
2006gl_vendor ()
2007 CODE:
2008 RETVAL = (char *)glGetString (GL_VENDOR);
2009 OUTPUT:
2010 RETVAL
2011
2012char *
2013gl_version ()
2014 CODE:
2015 RETVAL = (char *)glGetString (GL_VERSION);
2016 OUTPUT:
2017 RETVAL
2018
2019char *
2020gl_extensions ()
2021 CODE:
2022 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2023 OUTPUT:
2024 RETVAL
2025
1623int glGetError () 2026int glGetError ()
2027
2028void glFinish ()
1624 2029
1625void glClear (int mask) 2030void glClear (int mask)
1626 2031
1627void glClearColor (float r, float g, float b, float a = 1.0) 2032void glClearColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 2033 PROTOTYPE: @
1635 2040
1636void glHint (int target, int mode) 2041void glHint (int target, int mode)
1637 2042
1638void glBlendFunc (int sfactor, int dfactor) 2043void glBlendFunc (int sfactor, int dfactor)
1639 2044
2045void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2046 CODE:
2047 gl_BlendFuncSeparate (sa, da, saa, daa);
2048
1640void glDepthMask (int flag) 2049void glDepthMask (int flag)
1641 2050
1642void glLogicOp (int opcode) 2051void glLogicOp (int opcode)
1643 2052
1644void glColorMask (int red, int green, int blue, int alpha) 2053void glColorMask (int red, int green, int blue, int alpha)
1648void glPushMatrix () 2057void glPushMatrix ()
1649 2058
1650void glPopMatrix () 2059void glPopMatrix ()
1651 2060
1652void glLoadIdentity () 2061void glLoadIdentity ()
2062
2063void glDrawBuffer (int buffer)
2064
2065void glReadBuffer (int buffer)
1653 2066
1654# near_ and far_ are due to microsofts buggy "c" compiler 2067# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656 2069
1657# near_ and far_ are due to microsofts buggy "c" compiler 2070# near_ and far_ are due to microsofts buggy "c" compiler
1677 2090
1678void glEnd () 2091void glEnd ()
1679 2092
1680void glColor (float r, float g, float b, float a = 1.0) 2093void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 2094 PROTOTYPE: @
2095 ALIAS:
2096 glColor_premultiply = 1
1682 CODE: 2097 CODE:
2098 if (ix)
2099 {
2100 r *= a;
2101 g *= a;
2102 b *= a;
2103 }
1683 // microsoft visual "c" rounds instead of truncating... 2104 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 2105 glColor4f (r, g, b, a);
1685 MIN ((int)(g * 255.f), 255),
1686 MIN ((int)(b * 255.f), 255),
1687 MIN ((int)(a * 255.f), 255));
1688 2106
1689void glInterleavedArrays (int format, int stride, char *data) 2107void glInterleavedArrays (int format, int stride, char *data)
1690 2108
1691void glDrawElements (int mode, int count, int type, char *indices) 2109void glDrawElements (int mode, int count, int type, char *indices)
1692 2110
1715 2133
1716void glBindTexture (int target, int name) 2134void glBindTexture (int target, int name)
1717 2135
1718void glConvolutionParameter (int target, int pname, float params) 2136void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 2137 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2138 if (gl.ConvolutionParameterf)
2139 gl.ConvolutionParameterf (target, pname, params);
1721 2140
1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2141void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE: 2142 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2143 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 2144 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 2145
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2146void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE: 2147 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2148 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 2149 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 2150
1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2151void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733 2152
1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2153void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735 2154
1768 2187
1769void glEndList () 2188void glEndList ()
1770 2189
1771void glCallList (int list) 2190void glCallList (int list)
1772 2191
1773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines