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.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines