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.57 by root, Fri Apr 21 07:09:10 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
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
3#endif 9#endif
4 10
5#include "EXTERN.h" 11#include "EXTERN.h"
6#include "perl.h" 12#include "perl.h"
7#include "XSUB.h" 13#include "XSUB.h"
8 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <math.h>
9#include <string.h> 20#include <string.h>
10#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h>
11 23
12#include <SDL.h> 24#include <SDL.h>
25#include <SDL_endian.h>
13#include <SDL_image.h> 26#include <SDL_image.h>
14#include <SDL_mixer.h> 27#include <SDL_mixer.h>
15#include <SDL_opengl.h> 28#include <SDL_opengl.h>
16 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
17#include <glib/gmacros.h> 33#include <glib/gmacros.h>
18 34
19#include <pango/pango.h> 35#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 36
23#ifndef _WIN32 37#ifndef _WIN32
24# include <sys/types.h> 38# include <sys/types.h>
25# include <sys/socket.h> 39# include <sys/socket.h>
26# include <netinet/in.h> 40# include <netinet/in.h>
27# include <netinet/tcp.h> 41# include <netinet/tcp.h>
28# include <inttypes.h> 42# include <inttypes.h>
29#else
30 typedef unsigned char uint8_t;
31 typedef unsigned short uint16_t;
32 typedef unsigned int uint32_t;
33 typedef signed char int8_t;
34 typedef signed short int16_t;
35 typedef signed int int32_t;
36#endif 43#endif
37 44
38#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
39 46
40#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
41 48
42#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
44 51
52#define MIN_FONT_HEIGHT 10
53
54#if 0
55# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else
57# define PARACHUTE 0
58#endif
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
45typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
46typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
47 85
48static PangoContext *context; 86typedef PangoFontDescription *CFPlus__Font;
49static PangoFontMap *fontmap; 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}
50 105
51typedef struct cf_layout { 106typedef struct cf_layout {
52 PangoLayout *pl; 107 PangoLayout *pl;
108 float r, g, b, a; // default color for rgba mode
53 int base_height; 109 int base_height;
110 CFPlus__Font font;
54} *CFClient__Layout; 111} *CFPlus__Layout;
112
113static CFPlus__Font default_font;
114static PangoContext *opengl_context;
115static PangoFontMap *opengl_fontmap;
55 116
56static void 117static void
57substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
58{ 119{
59 FcPatternAddBool (pattern, FC_HINTING , 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
121#ifdef FC_HINT_STYLE
122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
123#endif
60 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61} 125}
62 126
63static void 127static void
64layout_update (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
65{ 129{
66 /* 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
67 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
68 */ 132 */
69 PangoFontDescription *font = pango_context_get_font_description (context); 133 PangoFontDescription *font = self->font ? self->font : default_font;
70 134
71 int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73 if (pango_font_description_get_size (font) != height)
74 {
75 pango_font_description_set_absolute_size (font, height); 135 pango_font_description_set_absolute_size (font,
76 pango_layout_context_changed (self->pl); 136 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77 } 137
138 pango_layout_set_font_description (self->pl, font);
78} 139}
79 140
80static void 141static void
81layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
82{ 143{
83 layout_update (self); 144 PangoRectangle rect;
84 145
146 // get_pixel_* wrongly rounds down
85 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
86 148
87 *w = (*w + 3) & ~3; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
88 if (!*w) *w = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
89 if (!*h) *h = 1; 151
152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
90} 157}
91 158
92typedef uint16_t mapface; 159typedef uint16_t mapface;
93 160
94typedef struct { 161typedef struct {
97 float s, t; 164 float s, t;
98 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
99} maptex; 166} maptex;
100 167
101typedef struct { 168typedef struct {
102 int16_t darkness; 169 uint32_t player;
103 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
104} mapcell; 173} mapcell;
105 174
106typedef struct { 175typedef struct {
107 int32_t c0, c1; 176 int32_t c0, c1;
108 mapcell *col; 177 mapcell *col;
117 int texs; 186 int texs;
118 maptex *tex; 187 maptex *tex;
119 188
120 int32_t rows; 189 int32_t rows;
121 maprow *row; 190 maprow *row;
122} *CFClient__Map; 191} *CFPlus__Map;
123 192
124static char * 193static char *
125prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
126{ 195{
127 char *p; 196 char *p;
145 214
146#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))
147#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))
148 217
149static maprow * 218static maprow *
150map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
151{ 220{
152 if (0 > y) 221 if (0 > y)
153 { 222 {
154 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
155 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
193 262
194 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
195} 264}
196 265
197static mapcell * 266static mapcell *
198map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
199{ 268{
200 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
201} 270}
202 271
203static void 272static void
204map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
205{ 274{
206 int r; 275 int r;
207 276
208 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
209 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
217 self->row = 0; 286 self->row = 0;
218 self->rows = 0; 287 self->rows = 0;
219} 288}
220 289
221static void 290static void
222map_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)
223{ 292{
224 int x, y; 293 int x, y;
225 maprow *row; 294 maprow *row;
295 mapcell *cell;
226 296
227 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
228 if (y >= 0) 298 if (y >= 0)
229 { 299 {
230 if (y >= self->rows) 300 if (y >= self->rows)
236 if (x >= row->c0) 306 if (x >= row->c0)
237 { 307 {
238 if (x >= row->c1) 308 if (x >= row->c1)
239 break; 309 break;
240 310
241 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;
242 } 317 }
243 } 318 }
244} 319}
245 320
246static void 321static void
247music_finished () 322music_finished (void)
248{ 323{
249 SDL_UserEvent ev; 324 SDL_UserEvent ev;
250 325
251 ev.type = SDL_USEREVENT; 326 ev.type = SDL_USEREVENT;
252 ev.code = 0; 327 ev.code = 0;
254 ev.data2 = 0; 329 ev.data2 = 0;
255 330
256 SDL_PushEvent ((SDL_Event *)&ev); 331 SDL_PushEvent ((SDL_Event *)&ev);
257} 332}
258 333
334static void
335channel_finished (int channel)
336{
337 SDL_UserEvent ev;
338
339 ev.type = SDL_USEREVENT;
340 ev.code = 1;
341 ev.data1 = (void *)(long)channel;
342 ev.data2 = 0;
343
344 SDL_PushEvent ((SDL_Event *)&ev);
345}
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
259MODULE = CFClient PACKAGE = CFClient 368MODULE = CFPlus PACKAGE = CFPlus
260 369
261PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
262 371
263BOOT: 372BOOT:
264{ 373{
265 HV *stash = gv_stashpv ("CFClient", 1); 374 HV *stash = gv_stashpv ("CFPlus", 1);
266 static const struct { 375 static const struct {
267 const char *name; 376 const char *name;
268 IV iv; 377 IV iv;
269 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
270# 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
271 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
272 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
273 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
274 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
275 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
284 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
285 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
286 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
287 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
288 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
289 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
290 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
291 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
292 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
293 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
348 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
349 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
350 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
351 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
352 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
353 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
354 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
355 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
356 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
357 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
358 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
359 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
360 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
361 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
362 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
363 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
364 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
365 const_iv (KMOD_CTRL),
366 const_iv (KMOD_SHIFT),
367 const_iv (KMOD_ALT),
368 const_iv (KMOD_META)
369# undef const_iv 487# undef const_iv
370 }; 488 };
371 489
372 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; )
373 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
374 492
375 fontmap = pango_ft2_font_map_new (); 493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
376 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
377 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
378} 495}
379 496
380int 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)
507
508void
509pango_init ()
510 CODE:
511{
512 opengl_fontmap = pango_opengl_font_map_new ();
513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
515}
516
517int
381SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
382 519
383void 520void
384SDL_Quit () 521SDL_Quit ()
385 522
386void 523void
392 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 529 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
393 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
396 533
534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
536
397 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
401 541
402 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
403 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
404 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
405 547
406 SDL_EnableUNICODE (1); 548 SDL_EnableUNICODE (1);
407 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
408 550
409 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
418 560
419 ++m; 561 ++m;
420 } 562 }
421} 563}
422 564
565char *
566SDL_GetError ()
567
423int 568int
424SDL_SetVideoMode (int w, int h, int fullscreen) 569SDL_SetVideoMode (int w, int h, int fullscreen)
425 CODE: 570 CODE:
426 RETVAL = !!SDL_SetVideoMode ( 571 RETVAL = !!SDL_SetVideoMode (
427 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 572 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
428 ); 573 );
574 if (RETVAL)
575 {
429 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 }
430 OUTPUT: 581 OUTPUT:
431 RETVAL 582 RETVAL
432 583
433void 584void
434SDL_GL_SwapBuffers () 585SDL_GL_SwapBuffers ()
586
587char *
588SDL_GetKeyName (int sym)
435 589
436void 590void
437SDL_PollEvent () 591SDL_PollEvent ()
438 PPCODE: 592 PPCODE:
439{ 593{
441 595
442 while (SDL_PollEvent (&ev)) 596 while (SDL_PollEvent (&ev))
443 { 597 {
444 HV *hv = newHV (); 598 HV *hv = newHV ();
445 hv_store (hv, "type", 4, newSViv (ev.type), 0); 599 hv_store (hv, "type", 4, newSViv (ev.type), 0);
600
446 switch (ev.type) 601 switch (ev.type)
447 { 602 {
448 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
449 case SDL_KEYUP: 604 case SDL_KEYUP:
450 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
451 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
452 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 */
453 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
454 break; 610 break;
455 611
456 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
457 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
458 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 614 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
459 break; 615 break;
460 616
461 case SDL_MOUSEMOTION: 617 case SDL_MOUSEMOTION:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
462 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 620 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
463 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 621 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
464 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 622 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
465 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 623 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
466 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 624 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
467 break; 625 break;
468 626
469 case SDL_MOUSEBUTTONDOWN: 627 case SDL_MOUSEBUTTONDOWN:
470 case SDL_MOUSEBUTTONUP: 628 case SDL_MOUSEBUTTONUP:
629 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
630
471 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 631 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 632 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 633 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 634 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
635 break;
636
637 case SDL_USEREVENT:
638 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
641 break;
475 } 642 }
476 643
477 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
478 } 645 }
479} 646}
480 647
481int 648int
482Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
483 POSTCALL: 650 POSTCALL:
484 Mix_HookMusicFinished (music_finished); 651 Mix_HookMusicFinished (music_finished);
652 Mix_ChannelFinished (channel_finished);
485 653
486void 654void
487Mix_CloseAudio () 655Mix_CloseAudio ()
488 656
489int 657int
494 CODE: 662 CODE:
495#ifndef _WIN32 663#ifndef _WIN32
496 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
497#endif 665#endif
498 666
499char * 667void
500gl_version () 668win32_proxy_info ()
501 CODE: 669 PPCODE:
502 RETVAL = (char *)glGetString (GL_VERSION); 670{
503 OUTPUT: 671#ifdef _WIN32
504 RETVAL 672 char buffer[2048];
673 DWORD buflen;
505 674
506char * 675 EXTEND (SP, 3);
507gl_extensions () 676
508 CODE: 677 buflen = sizeof (buffer);
509 RETVAL = (char *)glGetString (GL_EXTENSIONS); 678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
510 OUTPUT: 679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
511 RETVAL 680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
682
683 buflen = sizeof (buffer);
684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
685 {
686 PUSHs (newSVpv (buffer, 0));
687
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}
512 695
513void 696void
514add_font (char *file) 697add_font (char *file)
515 CODE: 698 CODE:
516 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
517
518void
519set_font (char *file)
520 CODE:
521{
522 int count;
523 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
524 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525 FcPatternDestroy (pattern);
526 pango_context_set_font_description (context, font);
527}
528 700
529void 701void
530load_image_inline (SV *image_) 702load_image_inline (SV *image_)
531 ALIAS: 703 ALIAS:
532 load_image_file = 1 704 load_image_file = 1
574 746
575 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 747 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
576 748
577 assert (surface2->pitch == surface2->w * 4); 749 assert (surface2->pitch == surface2->w * 4);
578 750
751 SDL_LockSurface (surface2);
579 EXTEND (SP, 5); 752 EXTEND (SP, 6);
580 PUSHs (sv_2mortal (newSViv (surface2->w))); 753 PUSHs (sv_2mortal (newSViv (surface2->w)));
581 PUSHs (sv_2mortal (newSViv (surface2->h))); 754 PUSHs (sv_2mortal (newSViv (surface2->h)));
582 SDL_LockSurface (surface2);
583 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 755 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
584 SDL_UnlockSurface (surface2);
585 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)));
586 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 757 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
587 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 758 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
759 SDL_UnlockSurface (surface2);
588 760
589 SDL_FreeSurface (surface); 761 SDL_FreeSurface (surface);
590 SDL_FreeSurface (surface2); 762 SDL_FreeSurface (surface2);
591} 763}
592 764
614 PUSHs (sv_2mortal (newSViv (b / y))); 786 PUSHs (sv_2mortal (newSViv (b / y)));
615 PUSHs (sv_2mortal (newSViv (a / y))); 787 PUSHs (sv_2mortal (newSViv (a / y)));
616} 788}
617 789
618void 790void
791error (char *message)
792 CODE:
793 fprintf (stderr, "ERROR: %s\n", message);
794#ifdef _WIN32
795 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
796#endif
797
798void
619fatal (char *message) 799fatal (char *message)
620 CODE: 800 CODE:
801 fprintf (stderr, "FATAL: %s\n", message);
621#ifdef _WIN32 802#ifdef _WIN32
622 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
804#endif
805 _exit (1);
806
807void
808_exit (int retval = 0)
809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
623#else 812#else
624 fprintf (stderr, "FATAL: %s\n", message); 813 _exit (retval);
625#endif 814#endif
626 exit (1);
627 815
816MODULE = CFPlus PACKAGE = CFPlus::Font
817
818CFPlus::Font
819new_from_file (SV *class, char *path, int id = 0)
820 CODE:
821{
822 int count;
823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
824 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
825 FcPatternDestroy (pattern);
826}
827 OUTPUT:
828 RETVAL
829
830void
831DESTROY (CFPlus::Font self)
832 CODE:
833 pango_font_description_free (self);
834
835void
836make_default (CFPlus::Font self)
837 CODE:
838 default_font = self;
839
628MODULE = CFClient PACKAGE = CFClient::Layout 840MODULE = CFPlus PACKAGE = CFPlus::Layout
629 841
630CFClient::Layout 842void
631new (SV *class, int base_height = 10) 843reset_glyph_cache ()
844 CODE:
845 tc_clear ();
846
847CFPlus::Layout
848new (SV *class)
632 CODE: 849 CODE:
633 New (0, RETVAL, 1, struct cf_layout); 850 New (0, RETVAL, 1, struct cf_layout);
634 RETVAL->base_height = base_height; 851
635 RETVAL->pl = pango_layout_new (context); 852 RETVAL->pl = pango_layout_new (opengl_context);
853 RETVAL->r = 1.;
854 RETVAL->g = 1.;
855 RETVAL->b = 1.;
856 RETVAL->a = 1.;
857 RETVAL->base_height = MIN_FONT_HEIGHT;
858 RETVAL->font = 0;
859
636 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 860 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
861 layout_update_font (RETVAL);
637 OUTPUT: 862 OUTPUT:
638 RETVAL 863 RETVAL
639 864
640void 865void
641DESTROY (CFClient::Layout self) 866DESTROY (CFPlus::Layout self)
642 CODE: 867 CODE:
643 g_object_unref (self->pl); 868 g_object_unref (self->pl);
644 Safefree (self); 869 Safefree (self);
645 870
646void 871void
647set_text (CFClient::Layout self, SV *text_) 872set_text (CFPlus::Layout self, SV *text_)
648 CODE: 873 CODE:
649{ 874{
650 STRLEN textlen; 875 STRLEN textlen;
651 char *text = SvPVutf8 (text_, textlen); 876 char *text = SvPVutf8 (text_, textlen);
652 877
653 pango_layout_set_text (self->pl, text, textlen); 878 pango_layout_set_text (self->pl, text, textlen);
654} 879}
655 880
656void 881void
657set_markup (CFClient::Layout self, SV *text_) 882set_markup (CFPlus::Layout self, SV *text_)
658 CODE: 883 CODE:
659{ 884{
660 STRLEN textlen; 885 STRLEN textlen;
661 char *text = SvPVutf8 (text_, textlen); 886 char *text = SvPVutf8 (text_, textlen);
662 887
663 pango_layout_set_markup (self->pl, text, textlen); 888 pango_layout_set_markup (self->pl, text, textlen);
664} 889}
665 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
666SV * 976SV *
667get_text (CFClient::Layout self) 977get_text (CFPlus::Layout self)
668 CODE: 978 CODE:
669 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
670 SvUTF8_on (RETVAL); 980 sv_utf8_decode (RETVAL);
671 OUTPUT: 981 OUTPUT:
672 RETVAL 982 RETVAL
673 983
674void 984void
985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
986 CODE:
987 self->r = r;
988 self->g = g;
989 self->b = b;
990 self->a = a;
991
992void
993set_font (CFPlus::Layout self, CFPlus::Font font = 0)
994 CODE:
995 if (self->font != font)
996 {
997 self->font = font;
998 layout_update_font (self);
999 }
1000
1001void
675set_height (CFClient::Layout self, int base_height) 1002set_height (CFPlus::Layout self, int base_height)
676 CODE: 1003 CODE:
1004 if (self->base_height != base_height)
1005 {
677 self->base_height = base_height; 1006 self->base_height = base_height;
1007 layout_update_font (self);
1008 }
678 1009
679void 1010void
680set_width (CFClient::Layout self, int max_width = -1) 1011set_width (CFPlus::Layout self, int max_width = -1)
681 CODE: 1012 CODE:
682 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);
683 1014
684void 1015void
1016set_indent (CFPlus::Layout self, int indent)
1017 CODE:
1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1019
1020void
1021set_spacing (CFPlus::Layout self, int spacing)
1022 CODE:
1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1024
1025void
1026set_ellipsise (CFPlus::Layout self, int ellipsise)
1027 CODE:
1028 pango_layout_set_ellipsize (self->pl,
1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1032 : PANGO_ELLIPSIZE_NONE
1033 );
1034
1035void
1036set_single_paragraph_mode (CFPlus::Layout self, int spm)
1037 CODE:
1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1039
1040void
685size (CFClient::Layout self) 1041size (CFPlus::Layout self)
686 PPCODE: 1042 PPCODE:
687{ 1043{
688 int w, h; 1044 int w, h;
689 1045
690 layout_update (self);
691 layout_get_pixel_size (self, &w, &h); 1046 layout_get_pixel_size (self, &w, &h);
692 1047
693 EXTEND (SP, 2); 1048 EXTEND (SP, 2);
694 PUSHs (sv_2mortal (newSViv (w))); 1049 PUSHs (sv_2mortal (newSViv (w)));
695 PUSHs (sv_2mortal (newSViv (h))); 1050 PUSHs (sv_2mortal (newSViv (h)));
696} 1051}
697 1052
698int 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
699xy_to_index (CFClient::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
700 CODE: 1067 CODE:
701{ 1068{
702 int index, trailing; 1069 int index, trailing;
703
704 layout_update (self);
705 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);
706
707 RETVAL = index; 1071 RETVAL = index + trailing;
708} 1072}
709 OUTPUT: 1073 OUTPUT:
710 RETVAL 1074 RETVAL
711 1075
712void 1076void
713cursor_pos (CFClient::Layout self, int index) 1077cursor_pos (CFPlus::Layout self, int index)
714 PPCODE: 1078 PPCODE:
715{ 1079{
716 PangoRectangle strong_pos; 1080 PangoRectangle strong_pos;
717 layout_update (self);
718 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719 1082
720 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
721 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
723 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
724} 1087}
725 1088
726void 1089void
727render (CFClient::Layout self) 1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
728 PPCODE: 1091 PPCODE:
729{ 1092{
730 SV *retval; 1093 int line, x;
731 int w, h;
732 FT_Bitmap bitmap;
733 1094
734 layout_update (self); 1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
735 layout_get_pixel_size (self, &w, &h); 1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
736 1097
737 retval = newSV (w * h);
738 SvPOK_only (retval);
739 SvCUR_set (retval, w * h);
740
741 bitmap.rows = h;
742 bitmap.width = w;
743 bitmap.pitch = w;
744 bitmap.buffer = (unsigned char*)SvPVX (retval);
745 bitmap.num_grays = 256;
746 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
747
748 memset (bitmap.buffer, 0, w * h);
749
750 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
751
752 EXTEND (SP, 3); 1098 EXTEND (SP, 2);
753 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)
1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1121 else
1122 {
754 PUSHs (sv_2mortal (newSViv (h))); 1123 PUSHs (sv_2mortal (newSViv (index)));
755 PUSHs (sv_2mortal (retval)); 1124 PUSHs (sv_2mortal (newSViv (trailing)));
1125 }
756} 1126}
757 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
758MODULE = CFClient PACKAGE = CFClient::Texture 1138MODULE = CFPlus PACKAGE = CFPlus::Texture
759 1139
760void 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
761draw_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.)
762 PROTOTYPE: $$$;$$ 1179 PROTOTYPE: $$$;$$
1180 ALIAS:
1181 draw_quad_alpha = 1
1182 draw_quad_alpha_premultiplied = 2
763 CODE: 1183 CODE:
764{ 1184{
765 HV *hv = (HV *)SvRV (self); 1185 HV *hv = (HV *)SvRV (self);
766 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1186 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
767 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1187 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
768 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1188 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
769 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
770 1189
771 if (items < 5) 1190 if (items < 5)
772 { 1191 {
773 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1192 w = SvNV (*hv_fetch (hv, "w", 1, 1));
774 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1193 h = SvNV (*hv_fetch (hv, "h", 1, 1));
775 } 1194 }
776 1195
1196 if (ix)
1197 {
1198 glEnable (GL_BLEND);
1199
1200 if (ix == 2)
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
1206 glEnable (GL_ALPHA_TEST);
1207 glAlphaFunc (GL_GREATER, 0.01f);
1208 }
1209
777 glBindTexture (GL_TEXTURE_2D, name); 1210 glBindTexture (GL_TEXTURE_2D, name);
778 if (wrap_mode) { 1211
779 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
780 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
781 }
782 glBegin (GL_QUADS); 1212 glBegin (GL_QUADS);
783 glTexCoord2f (0, 0); glVertex2f (x , y ); 1213 glTexCoord2f (0, 0); glVertex2f (x , y );
784 glTexCoord2f (0, t); glVertex2f (x , y + h); 1214 glTexCoord2f (0, t); glVertex2f (x , y + h);
785 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1215 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
786 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1216 glTexCoord2f (s, 0); glVertex2f (x + w, y );
787 glEnd (); 1217 glEnd ();
788}
789 1218
1219 if (ix)
1220 {
1221 glDisable (GL_ALPHA_TEST);
1222 glDisable (GL_BLEND);
1223 }
1224}
1225
790MODULE = CFClient PACKAGE = CFClient::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
791 1227
792CFClient::Map 1228CFPlus::Map
793new (SV *class, int map_width, int map_height) 1229new (SV *class)
794 CODE: 1230 CODE:
795 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
796 RETVAL->x = 0; 1232 RETVAL->x = 0;
797 RETVAL->y = 0; 1233 RETVAL->y = 0;
798 RETVAL->w = map_width; 1234 RETVAL->w = 0;
799 RETVAL->h = map_height; 1235 RETVAL->h = 0;
800 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
801 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
802 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
803 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
804 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
807 RETVAL->row = 0; 1243 RETVAL->row = 0;
808 OUTPUT: 1244 OUTPUT:
809 RETVAL 1245 RETVAL
810 1246
811void 1247void
812DESTROY (CFClient::Map self) 1248DESTROY (CFPlus::Map self)
813 CODE: 1249 CODE:
814{ 1250{
815 map_clear (self); 1251 map_clear (self);
816 Safefree (self->face); 1252 Safefree (self->face);
1253 Safefree (self->tex);
817 Safefree (self); 1254 Safefree (self);
818} 1255}
819 1256
820void 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
821clear (CFClient::Map self) 1264clear (CFPlus::Map self)
822 CODE: 1265 CODE:
823 map_clear (self); 1266 map_clear (self);
824 1267
825void 1268void
826set_face (CFClient::Map self, int face, int texid) 1269set_face (CFPlus::Map self, int face, int texid)
827 CODE: 1270 CODE:
828{ 1271{
829 while (self->faces <= face) 1272 while (self->faces <= face)
830 { 1273 {
831 Append (mapface, self->face, self->faces, self->faces); 1274 Append (mapface, self->face, self->faces, self->faces);
834 1277
835 self->face [face] = texid; 1278 self->face [face] = texid;
836} 1279}
837 1280
838void 1281void
839set_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)
840 CODE: 1283 CODE:
841{ 1284{
842 while (self->texs <= texid) 1285 while (self->texs <= texid)
843 { 1286 {
844 Append (maptex, self->tex, self->texs, self->texs); 1287 Append (maptex, self->tex, self->texs, self->texs);
856 tex->r = r; 1299 tex->r = r;
857 tex->g = g; 1300 tex->g = g;
858 tex->b = b; 1301 tex->b = b;
859 tex->a = a; 1302 tex->a = a;
860 } 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);
861} 1313}
862 1314
863int 1315int
864ox (CFClient::Map self) 1316ox (CFPlus::Map self)
865 ALIAS: 1317 ALIAS:
866 oy = 1 1318 oy = 1
1319 x = 2
1320 y = 3
1321 w = 4
1322 h = 5
867 CODE: 1323 CODE:
868 switch (ix) 1324 switch (ix)
869 { 1325 {
870 case 0: RETVAL = self->ox; break; 1326 case 0: RETVAL = self->ox; break;
871 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;
872 } 1332 }
873 OUTPUT: 1333 OUTPUT:
874 RETVAL 1334 RETVAL
875 1335
876void 1336void
877scroll (CFClient::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
878 CODE: 1338 CODE:
879{ 1339{
880 if (dx > 0) 1340 if (dx > 0)
881 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
882 else if (dx < 0) 1342 else if (dx < 0)
883 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);
884 1344
885 if (dy > 0) 1345 if (dy > 0)
886 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
887 else if (dy < 0) 1347 else if (dy < 0)
888 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);
889 1349
890 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
891 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
892 1352
893 while (self->y < 0) 1353 while (self->y < 0)
898 self->y += MAP_EXTEND_Y; 1358 self->y += MAP_EXTEND_Y;
899 } 1359 }
900} 1360}
901 1361
902void 1362void
903map1a_update (CFClient::Map self, SV *data_) 1363map1a_update (CFPlus::Map self, SV *data_, int extmap)
904 CODE: 1364 CODE:
905{ 1365{
906 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
907 uint8_t *data_end = (uint8_t *)SvEND (data_); 1367 uint8_t *data_end = (uint8_t *)SvEND (data_);
908 mapcell *cell; 1368 mapcell *cell;
909 int x, y, flags; 1369 int x, y, flags;
910 1370
911 while (data < data_end) 1371 while (data < data_end - 1)
912 { 1372 {
913 flags = (data [0] << 8) + data [1]; data += 2; 1373 flags = (data [0] << 8) + data [1]; data += 2;
914 1374
915 x = ((flags >> 10) & 63) + self->x; 1375 x = self->x + ((flags >> 10) & 63);
916 y = ((flags >> 4) & 63) + self->y; 1376 y = self->y + ((flags >> 4) & 63);
917 1377
918 cell = map_get_cell (self, x, y); 1378 cell = map_get_cell (self, x, y);
919 1379
920 if (flags & 15) 1380 if (flags & 15)
921 { 1381 {
922 if (cell->darkness < 0) 1382 if (!cell->darkness)
923 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
924 cell->darkness = 0; 1385 cell->darkness = 256;
925 cell->face [0] = 0;
926 cell->face [1] = 0;
927 cell->face [2] = 0;
928 } 1386 }
929 1387
930 cell->darkness = flags & 8 ? *data++ : 255;
931
932 //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 }
933 1429
934 if (flags & 4) 1430 if (flags & 4)
935 { 1431 {
936 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;
937 } 1433 }
945 { 1441 {
946 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;
947 } 1443 }
948 } 1444 }
949 else 1445 else
950 cell->darkness = -1; 1446 cell->darkness = 0;
951 } 1447 }
952} 1448}
953 1449
954SV * 1450SV *
955mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
956 CODE: 1452 CODE:
957{ 1453{
958 int x1, x; 1454 int x1, x;
959 int y1, y; 1455 int y1, y;
960 int z; 1456 int z;
1010} 1506}
1011 OUTPUT: 1507 OUTPUT:
1012 RETVAL 1508 RETVAL
1013 1509
1014void 1510void
1015draw (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)
1016 PPCODE: 1512 CODE:
1017{ 1513{
1018 int vx, vy;
1019 int x, y, z; 1514 int x, y, z;
1020 int last_name; 1515 int last_name;
1021 mapface face; 1516 mapface face;
1022 int sw4 = (sw + 3) & ~3;
1023 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1024 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1025
1026 memset (darkness, 255, sw4 * sh);
1027 SvPOK_only (darkness_sv);
1028 SvCUR_set (darkness_sv, sw4 * sh);
1029
1030 vx = self->x + (self->w - sw) / 2 - shift_x;
1031 vy = self->y + (self->h - sh) / 2 - shift_y;
1032
1033 /*
1034 int vx = self->vx = self->w >= sw
1035 ? self->x + (self->w - sw) / 2
1036 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1037
1038 int vy = self->vy = self->h >= sh
1039 ? self->y + (self->h - sh) / 2
1040 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1041 */
1042 1517
1043 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1044 1519
1520 glEnable (GL_BLEND);
1045 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1046 glEnable (GL_BLEND);
1047 glEnable (GL_TEXTURE_2D); 1522 glEnable (GL_TEXTURE_2D);
1048 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1049 1524
1050 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1051 1526
1052 last_name = 0; 1527 last_name = 0;
1053 1528
1529 mx += self->x;
1530 my += self->y;
1531
1054 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1055 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1056 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1057 { 1535 {
1058 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1059 1537
1060 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1061 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1062 { 1540 {
1063 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1064
1065 darkness[y * sw4 + x] = cell->darkness < 0
1066 ? 255 - FOW_DARKNESS
1067 : 255 - cell->darkness;
1068 1542
1069 face = cell->face [z]; 1543 face = cell->face [z];
1070 1544
1071 if (face) 1545 if (face && face < self->texs)
1072 { 1546 {
1073 maptex tex = self->tex [face]; 1547 maptex tex = self->tex [face];
1074
1075 int px = (x + 1) * 32 - tex.w; 1548 int px = (x + 1) * 32 - tex.w;
1076 int py = (y + 1) * 32 - tex.h; 1549 int py = (y + 1) * 32 - tex.h;
1077 1550
1078 if (last_name != tex.name) 1551 if (last_name != tex.name)
1079 { 1552 {
1080 glEnd (); 1553 glEnd ();
1081 last_name = tex.name;
1082 glBindTexture (GL_TEXTURE_2D, last_name); 1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1083 glBegin (GL_QUADS); 1555 glBegin (GL_QUADS);
1084 } 1556 }
1085 1557
1086 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1087 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1088 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);
1089 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1090 } 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 }
1091 } 1582 }
1092 } 1583 }
1093 1584
1094 glEnd (); 1585 glEnd ();
1095 1586
1096 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1097 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 }
1098 1713
1099 EXTEND (SP, 3); 1714 EXTEND (SP, 3);
1100 PUSHs (sv_2mortal (newSViv (sw4))); 1715 PUSHs (sv_2mortal (newSViv (sw4)));
1101 PUSHs (sv_2mortal (newSViv (sh))); 1716 PUSHs (sv_2mortal (newSViv (sh)));
1102 PUSHs (darkness_sv); 1717 PUSHs (darkness_sv);
1103} 1718}
1104 1719
1105SV * 1720SV *
1106get_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)
1107 CODE: 1722 CODE:
1108{ 1723{
1109 int x, y, x1, y1; 1724 int x, y, x1, y1;
1110 SV *data_sv = newSV (w * h * 7 + 5); 1725 SV *data_sv = newSV (w * h * 7 + 5);
1111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1726 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1173} 1788}
1174 OUTPUT: 1789 OUTPUT:
1175 RETVAL 1790 RETVAL
1176 1791
1177void 1792void
1178set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1179 PPCODE: 1794 PPCODE:
1180{ 1795{
1181 int x, y, z; 1796 int x, y, z;
1182 int w, h; 1797 int w, h;
1183 int x1, y1; 1798 int x1, y1;
1215 1830
1216 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1217 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1218 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1219 1834
1220 if (cell->darkness <= 0) 1835 if (cell->darkness == 0)
1221 { 1836 {
1222 cell->darkness = -1; 1837 cell->darkness = 0;
1223 1838
1224 for (z = 0; z <= 2; z++) 1839 for (z = 0; z <= 2; z++)
1225 { 1840 {
1226 cell->face[z] = face[z]; 1841 cell->face[z] = face[z];
1227 1842
1232 } 1847 }
1233 } 1848 }
1234 } 1849 }
1235} 1850}
1236 1851
1237MODULE = CFClient PACKAGE = CFClient::MixChunk 1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1238 1853
1239CFClient::MixChunk 1854CFPlus::MixChunk
1240new_from_file (SV *class, char *path) 1855new_from_file (SV *class, char *path)
1241 CODE: 1856 CODE:
1242 RETVAL = Mix_LoadWAV (path); 1857 RETVAL = Mix_LoadWAV (path);
1243 OUTPUT: 1858 OUTPUT:
1244 RETVAL 1859 RETVAL
1245 1860
1246void 1861void
1247DESTROY (CFClient::MixChunk self) 1862DESTROY (CFPlus::MixChunk self)
1248 CODE: 1863 CODE:
1249 Mix_FreeChunk (self); 1864 Mix_FreeChunk (self);
1250 1865
1251int 1866int
1252volume (CFClient::MixChunk self, int volume = -1) 1867volume (CFPlus::MixChunk self, int volume = -1)
1253 CODE: 1868 CODE:
1254 RETVAL = Mix_VolumeChunk (self, volume); 1869 RETVAL = Mix_VolumeChunk (self, volume);
1255 OUTPUT: 1870 OUTPUT:
1256 RETVAL 1871 RETVAL
1257 1872
1258int 1873int
1259play (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)
1260 CODE: 1875 CODE:
1261 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1262 OUTPUT: 1877 OUTPUT:
1263 RETVAL 1878 RETVAL
1264 1879
1265MODULE = CFClient PACKAGE = CFClient::MixMusic 1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1266 1881
1267int 1882int
1268volume (int volume = -1) 1883volume (int volume = -1)
1269 CODE: 1884 CODE:
1270 RETVAL = Mix_VolumeMusic (volume); 1885 RETVAL = Mix_VolumeMusic (volume);
1271 OUTPUT: 1886 OUTPUT:
1272 RETVAL 1887 RETVAL
1273 1888
1274CFClient::MixMusic 1889CFPlus::MixMusic
1275new_from_file (SV *class, char *path) 1890new_from_file (SV *class, char *path)
1276 CODE: 1891 CODE:
1277 RETVAL = Mix_LoadMUS (path); 1892 RETVAL = Mix_LoadMUS (path);
1278 OUTPUT: 1893 OUTPUT:
1279 RETVAL 1894 RETVAL
1280 1895
1281void 1896void
1282DESTROY (CFClient::MixMusic self) 1897DESTROY (CFPlus::MixMusic self)
1283 CODE: 1898 CODE:
1284 Mix_FreeMusic (self); 1899 Mix_FreeMusic (self);
1285 1900
1286int 1901int
1287play (CFClient::MixMusic self, int loops = -1) 1902play (CFPlus::MixMusic self, int loops = -1)
1288 CODE: 1903 CODE:
1289 RETVAL = Mix_PlayMusic (self, loops); 1904 RETVAL = Mix_PlayMusic (self, loops);
1290 OUTPUT: 1905 OUTPUT:
1291 RETVAL 1906 RETVAL
1292 1907
1293MODULE = CFClient PACKAGE = CFClient::OpenGL 1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1294 1909
1295BOOT: 1910BOOT:
1296{ 1911{
1297 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1298 static const struct { 1913 static const struct {
1299 const char *name; 1914 const char *name;
1300 IV iv; 1915 IV iv;
1301 } *civ, const_iv[] = { 1916 } *civ, const_iv[] = {
1302# define const_iv(name) { # name, (IV)name } 1917# define const_iv(name) { # name, (IV)name }
1303 const_iv (GL_COLOR_MATERIAL), 1918 const_iv (GL_COLOR_MATERIAL),
1304 const_iv (GL_SMOOTH), 1919 const_iv (GL_SMOOTH),
1305 const_iv (GL_FLAT), 1920 const_iv (GL_FLAT),
1921 const_iv (GL_DITHER),
1306 const_iv (GL_BLEND), 1922 const_iv (GL_BLEND),
1923 const_iv (GL_CULL_FACE),
1924 const_iv (GL_SCISSOR_TEST),
1925 const_iv (GL_DEPTH_TEST),
1926 const_iv (GL_ALPHA_TEST),
1927 const_iv (GL_NORMALIZE),
1928 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT),
1930 const_iv (GL_BACK),
1307 const_iv (GL_AND), 1931 const_iv (GL_AND),
1932 const_iv (GL_ONE),
1933 const_iv (GL_ZERO),
1308 const_iv (GL_SRC_ALPHA), 1934 const_iv (GL_SRC_ALPHA),
1935 const_iv (GL_DST_ALPHA),
1309 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1936 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1937 const_iv (GL_ONE_MINUS_DST_ALPHA),
1938 const_iv (GL_SRC_ALPHA_SATURATE),
1310 const_iv (GL_RGB), 1939 const_iv (GL_RGB),
1311 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),
1312 const_iv (GL_UNSIGNED_BYTE), 1944 const_iv (GL_UNSIGNED_BYTE),
1313 const_iv (GL_ALPHA4), 1945 const_iv (GL_UNSIGNED_SHORT),
1946 const_iv (GL_UNSIGNED_INT),
1314 const_iv (GL_ALPHA), 1947 const_iv (GL_ALPHA),
1948 const_iv (GL_INTENSITY),
1949 const_iv (GL_LUMINANCE),
1950 const_iv (GL_LUMINANCE_ALPHA),
1315 const_iv (GL_FLOAT), 1951 const_iv (GL_FLOAT),
1316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1952 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317 const_iv (GL_COMPILE), 1953 const_iv (GL_COMPILE),
1318 const_iv (GL_TEXTURE_1D), 1954 const_iv (GL_TEXTURE_1D),
1319 const_iv (GL_TEXTURE_2D), 1955 const_iv (GL_TEXTURE_2D),
1321 const_iv (GL_TEXTURE_MAG_FILTER), 1957 const_iv (GL_TEXTURE_MAG_FILTER),
1322 const_iv (GL_TEXTURE_MIN_FILTER), 1958 const_iv (GL_TEXTURE_MIN_FILTER),
1323 const_iv (GL_TEXTURE_ENV_MODE), 1959 const_iv (GL_TEXTURE_ENV_MODE),
1324 const_iv (GL_TEXTURE_WRAP_S), 1960 const_iv (GL_TEXTURE_WRAP_S),
1325 const_iv (GL_TEXTURE_WRAP_T), 1961 const_iv (GL_TEXTURE_WRAP_T),
1962 const_iv (GL_REPEAT),
1326 const_iv (GL_CLAMP), 1963 const_iv (GL_CLAMP),
1327 const_iv (GL_REPEAT), 1964 const_iv (GL_CLAMP_TO_EDGE),
1328 const_iv (GL_NEAREST), 1965 const_iv (GL_NEAREST),
1329 const_iv (GL_LINEAR), 1966 const_iv (GL_LINEAR),
1330 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1967 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1968 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1969 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1970 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334 const_iv (GL_GENERATE_MIPMAP), 1971 const_iv (GL_GENERATE_MIPMAP),
1335 const_iv (GL_LINEAR),
1336 const_iv (GL_MODULATE), 1972 const_iv (GL_MODULATE),
1973 const_iv (GL_DECAL),
1337 const_iv (GL_REPLACE), 1974 const_iv (GL_REPLACE),
1975 const_iv (GL_DEPTH_BUFFER_BIT),
1338 const_iv (GL_COLOR_BUFFER_BIT), 1976 const_iv (GL_COLOR_BUFFER_BIT),
1339 const_iv (GL_PROJECTION), 1977 const_iv (GL_PROJECTION),
1340 const_iv (GL_MODELVIEW), 1978 const_iv (GL_MODELVIEW),
1341 const_iv (GL_COLOR_LOGIC_OP), 1979 const_iv (GL_COLOR_LOGIC_OP),
1980 const_iv (GL_SEPARABLE_2D),
1342 const_iv (GL_CONVOLUTION_2D), 1981 const_iv (GL_CONVOLUTION_2D),
1343 const_iv (GL_CONVOLUTION_BORDER_MODE), 1982 const_iv (GL_CONVOLUTION_BORDER_MODE),
1344 const_iv (GL_CONSTANT_BORDER), 1983 const_iv (GL_CONSTANT_BORDER),
1345 const_iv (GL_LINES), 1984 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP),
1986 const_iv (GL_LINE_LOOP),
1346 const_iv (GL_QUADS), 1987 const_iv (GL_QUADS),
1347 const_iv (GL_LINE_LOOP), 1988 const_iv (GL_QUAD_STRIP),
1989 const_iv (GL_TRIANGLES),
1990 const_iv (GL_TRIANGLE_STRIP),
1991 const_iv (GL_TRIANGLE_FAN),
1348 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1992 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1349 const_iv (GL_FASTEST), 1993 const_iv (GL_FASTEST),
1994 const_iv (GL_V2F),
1995 const_iv (GL_V3F),
1996 const_iv (GL_T2F_V3F),
1997 const_iv (GL_T2F_N3F_V3F),
1350# undef const_iv 1998# undef const_iv
1351 }; 1999 };
1352 2000
1353 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; )
1354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1355} 2003}
1356 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
1357int glGetError () 2026int glGetError ()
2027
2028void glFinish ()
1358 2029
1359void glClear (int mask) 2030void glClear (int mask)
1360 2031
1361void glClearColor (float r, float g, float b, float a = 1.0) 2032void glClearColor (float r, float g, float b, float a = 1.0)
1362 PROTOTYPE: @ 2033 PROTOTYPE: @
1369 2040
1370void glHint (int target, int mode) 2041void glHint (int target, int mode)
1371 2042
1372void glBlendFunc (int sfactor, int dfactor) 2043void glBlendFunc (int sfactor, int dfactor)
1373 2044
2045void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2046 CODE:
2047 gl_BlendFuncSeparate (sa, da, saa, daa);
2048
2049void glDepthMask (int flag)
2050
1374void glLogicOp (int opcode) 2051void glLogicOp (int opcode)
1375 2052
2053void glColorMask (int red, int green, int blue, int alpha)
2054
1376void glMatrixMode (int mode) 2055void glMatrixMode (int mode)
1377 2056
1378void glPushMatrix () 2057void glPushMatrix ()
1379 2058
1380void glPopMatrix () 2059void glPopMatrix ()
1381 2060
1382void glLoadIdentity () 2061void glLoadIdentity ()
1383 2062
2063void glDrawBuffer (int buffer)
2064
2065void glReadBuffer (int buffer)
2066
2067# near_ and far_ are due to microsofts buggy "c" compiler
2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2069
2070# near_ and far_ are due to microsofts buggy "c" compiler
1384void glOrtho (double left, double right, double bottom, double top, double near, double far) 2071void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1385 2072
1386void glViewport (int x, int y, int width, int height) 2073void glViewport (int x, int y, int width, int height)
2074
2075void glScissor (int x, int y, int width, int height)
1387 2076
1388void glTranslate (float x, float y, float z = 0.) 2077void glTranslate (float x, float y, float z = 0.)
1389 CODE: 2078 CODE:
1390 glTranslatef (x, y, z); 2079 glTranslatef (x, y, z);
1391 2080
1392void glScale (float x, float y, float z) 2081void glScale (float x, float y, float z = 1.)
1393 CODE: 2082 CODE:
1394 glScalef (x, y, z); 2083 glScalef (x, y, z);
1395 2084
1396void glRotate (float angle, float x, float y, float z) 2085void glRotate (float angle, float x, float y, float z)
1397 CODE: 2086 CODE:
1401 2090
1402void glEnd () 2091void glEnd ()
1403 2092
1404void glColor (float r, float g, float b, float a = 1.0) 2093void glColor (float r, float g, float b, float a = 1.0)
1405 PROTOTYPE: @ 2094 PROTOTYPE: @
2095 ALIAS:
2096 glColor_premultiply = 1
1406 CODE: 2097 CODE:
2098 if (ix)
2099 {
2100 r *= a;
2101 g *= a;
2102 b *= a;
2103 }
2104 // microsoft visual "c" rounds instead of truncating...
1407 glColor4f (r, g, b, a); 2105 glColor4f (r, g, b, a);
2106
2107void glInterleavedArrays (int format, int stride, char *data)
2108
2109void glDrawElements (int mode, int count, int type, char *indices)
2110
2111# 1.2 void glDrawRangeElements (int mode, int start, int end
2112
2113void glRasterPos (float x, float y, float z = 0.)
2114 CODE:
2115 glRasterPos3f (0, 0, z);
2116 glBitmap (0, 0, 0, 0, x, y, 0);
1408 2117
1409void glVertex (float x, float y, float z = 0.) 2118void glVertex (float x, float y, float z = 0.)
1410 CODE: 2119 CODE:
1411 glVertex3f (x, y, z); 2120 glVertex3f (x, y, z);
1412 2121
1424 2133
1425void glBindTexture (int target, int name) 2134void glBindTexture (int target, int name)
1426 2135
1427void glConvolutionParameter (int target, int pname, float params) 2136void glConvolutionParameter (int target, int pname, float params)
1428 CODE: 2137 CODE:
2138 if (gl.ConvolutionParameterf)
1429 glConvolutionParameterf (target, pname, params); 2139 gl.ConvolutionParameterf (target, pname, params);
1430 2140
1431void 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)
2142 CODE:
2143 if (gl.ConvolutionFilter2D)
2144 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2145
2146void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2147 CODE:
2148 if (gl.SeparableFilter2D)
2149 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1432 2150
1433void 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)
1434 2152
1435void 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)
2154
2155void glDrawPixels (int width, int height, int format, int type, char *pixels)
2156
2157void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436 2158
1437int glGenTexture () 2159int glGenTexture ()
1438 CODE: 2160 CODE:
1439{ 2161{
1440 GLuint name; 2162 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines