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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines