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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines