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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines