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.79 by root, Sun May 14 22:24:14 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
19#include <math.h>
12#include <string.h> 20#include <string.h>
13#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h>
14 23
15#include <SDL.h> 24#include <SDL.h>
16#include <SDL_endian.h> 25#include <SDL_endian.h>
17#include <SDL_image.h> 26#include <SDL_image.h>
18#include <SDL_mixer.h> 27#include <SDL_mixer.h>
19#include <SDL_opengl.h> 28#include <SDL_opengl.h>
20 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
21#include <glib/gmacros.h> 33#include <glib/gmacros.h>
22 34
23#include <pango/pango.h> 35#include <pango/pango.h>
24#include <pango/pangofc-fontmap.h>
25#include <pango/pangoft2.h>
26#include <pango/pangocairo.h>
27 36
28#ifndef _WIN32 37#ifndef _WIN32
29# include <sys/types.h> 38# include <sys/types.h>
30# include <sys/socket.h> 39# include <sys/socket.h>
31# include <netinet/in.h> 40# include <netinet/in.h>
32# include <netinet/tcp.h> 41# include <netinet/tcp.h>
33# include <inttypes.h> 42# include <inttypes.h>
34#else
35 typedef unsigned char uint8_t;
36 typedef unsigned short uint16_t;
37 typedef unsigned int uint32_t;
38 typedef signed char int8_t;
39 typedef signed short int16_t;
40 typedef signed int int32_t;
41#endif 43#endif
42 44
43#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
44 46
45#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
46 48
47#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
48#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
49 51
50#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
51 53
52#define GL_CALL(type,func,args) \ 54#if 0
53 { \ 55# define PARACHUTE SDL_INIT_NOPARACHUTE
54 static int init_; \ 56#else
55 static type fptr_; \ 57# define PARACHUTE 0
56 \ 58#endif
57 if (!init_) \
58 { \
59 init_ = 1; \
60 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
61 } \
62 \
63 if (fptr_) \
64 fptr_ args; \
65 }
66 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
67typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
68typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
69 85
70typedef 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}
71 105
72typedef struct cf_layout { 106typedef struct cf_layout {
73 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
74 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
76 int base_height; 109 int base_height;
77 CFClient__Font font; 110 CFPlus__Font font;
78} *CFClient__Layout; 111} *CFPlus__Layout;
79 112
80static CFClient__Font default_font; 113static CFPlus__Font default_font;
81static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
82static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
83 116
84static void 117static void
85substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
86{ 119{
87 FcPatternAddBool (pattern, FC_HINTING , 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
121#ifdef FC_HINT_STYLE
122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
123#endif
88 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
89} 125}
90 126
91static void 127static void
92layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
93{ 129{
94 /* 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
95 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
96 */ 132 */
97 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
101 137
102 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
103} 139}
104 140
105static void 141static void
106layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
107{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
108 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
109 148
110 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
111 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
112 151
113 *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;
114} 157}
115 158
116typedef uint16_t mapface; 159typedef uint16_t mapface;
117 160
118typedef struct { 161typedef struct {
121 float s, t; 164 float s, t;
122 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
123} maptex; 166} maptex;
124 167
125typedef struct { 168typedef struct {
126 int16_t darkness; 169 uint32_t player;
127 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
128} mapcell; 173} mapcell;
129 174
130typedef struct { 175typedef struct {
131 int32_t c0, c1; 176 int32_t c0, c1;
132 mapcell *col; 177 mapcell *col;
141 int texs; 186 int texs;
142 maptex *tex; 187 maptex *tex;
143 188
144 int32_t rows; 189 int32_t rows;
145 maprow *row; 190 maprow *row;
146} *CFClient__Map; 191} *CFPlus__Map;
147 192
148static char * 193static char *
149prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
150{ 195{
151 char *p; 196 char *p;
169 214
170#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))
171#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))
172 217
173static maprow * 218static maprow *
174map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
175{ 220{
176 if (0 > y) 221 if (0 > y)
177 { 222 {
178 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
179 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
217 262
218 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
219} 264}
220 265
221static mapcell * 266static mapcell *
222map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
223{ 268{
224 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
225} 270}
226 271
227static void 272static void
228map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
229{ 274{
230 int r; 275 int r;
231 276
232 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
233 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
241 self->row = 0; 286 self->row = 0;
242 self->rows = 0; 287 self->rows = 0;
243} 288}
244 289
245static void 290static void
246map_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)
247{ 292{
248 int x, y; 293 int x, y;
249 maprow *row; 294 maprow *row;
295 mapcell *cell;
250 296
251 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
252 if (y >= 0) 298 if (y >= 0)
253 { 299 {
254 if (y >= self->rows) 300 if (y >= self->rows)
260 if (x >= row->c0) 306 if (x >= row->c0)
261 { 307 {
262 if (x >= row->c1) 308 if (x >= row->c1)
263 break; 309 break;
264 310
265 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;
266 } 317 }
267 } 318 }
268} 319}
269 320
270static void 321static void
291 ev.data2 = 0; 342 ev.data2 = 0;
292 343
293 SDL_PushEvent ((SDL_Event *)&ev); 344 SDL_PushEvent ((SDL_Event *)&ev);
294} 345}
295 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
296MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
297 365
298PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
299 367
300BOOT: 368BOOT:
301{ 369{
302 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
303 static const struct { 371 static const struct {
304 const char *name; 372 const char *name;
305 IV iv; 373 IV iv;
306 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
307# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
408 476
409 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; )
410 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411} 479}
412 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
413void 492void
414pango_init () 493pango_init ()
415 CODE: 494 CODE:
416{ 495{
417 // delayed, so it can pick up new fonts added by AddFontResourceEx
418 ft2_fontmap = pango_ft2_font_map_new (); 496 opengl_fontmap = pango_opengl_font_map_new ();
419 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);
420 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
421
422 cairo_fontmap = pango_cairo_font_map_get_default ();
423 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
424} 499}
425 500
426int 501int
427SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
428 503
429void 504void
430SDL_Quit () 505SDL_Quit ()
431 506
432void 507void
438 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442 517
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
520
443 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447 525
448 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
451 531
452 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 534
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
464 544
465 ++m; 545 ++m;
466 } 546 }
467} 547}
468 548
549char *
550SDL_GetError ()
551
469int 552int
470SDL_SetVideoMode (int w, int h, int fullscreen) 553SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 554 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 555 RETVAL = !!SDL_SetVideoMode (
473 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474 ); 557 );
558 if (RETVAL)
559 {
475 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 }
476 OUTPUT: 565 OUTPUT:
477 RETVAL 566 RETVAL
478 567
479void 568void
480SDL_GL_SwapBuffers () 569SDL_GL_SwapBuffers ()
570
571char *
572SDL_GetKeyName (int sym)
481 573
482void 574void
483SDL_PollEvent () 575SDL_PollEvent ()
484 PPCODE: 576 PPCODE:
485{ 577{
504 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506 break; 598 break;
507 599
508 case SDL_MOUSEMOTION: 600 case SDL_MOUSEMOTION:
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
509 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514 break; 608 break;
515 609
516 case SDL_MOUSEBUTTONDOWN: 610 case SDL_MOUSEBUTTONDOWN:
517 case SDL_MOUSEBUTTONUP: 611 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
613
518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break; 618 break;
526 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528 break; 624 break;
529 } 625 }
530 626
531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
532 } 628 }
533} 629}
534 630
535int 631int
536Mix_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)
549 CODE: 645 CODE:
550#ifndef _WIN32 646#ifndef _WIN32
551 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552#endif 648#endif
553 649
554char * 650void
555gl_version () 651win32_proxy_info ()
556 CODE: 652 PPCODE:
557 RETVAL = (char *)glGetString (GL_VERSION); 653{
558 OUTPUT: 654#ifdef _WIN32
559 RETVAL 655 char buffer[2048];
656 DWORD buflen;
560 657
561char * 658 EXTEND (SP, 3);
562gl_extensions () 659
563 CODE: 660 buflen = sizeof (buffer);
564 RETVAL = (char *)glGetString (GL_EXTENSIONS); 661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
565 OUTPUT: 662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
566 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}
567 678
568void 679void
569add_font (char *file) 680add_font (char *file)
570 CODE: 681 CODE:
571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572#ifdef _WIN32
573 // cairo... sigh... requires win2000
574 AddFontResourceEx (file, FR_PRIVATE, 0);
575#endif
576 683
577void 684void
578load_image_inline (SV *image_) 685load_image_inline (SV *image_)
579 ALIAS: 686 ALIAS:
580 load_image_file = 1 687 load_image_file = 1
622 729
623 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624 731
625 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
626 733
734 SDL_LockSurface (surface2);
627 EXTEND (SP, 5); 735 EXTEND (SP, 6);
628 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
629 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
630 SDL_LockSurface (surface2);
631 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
632 SDL_UnlockSurface (surface2);
633 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)));
634 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
636 743
637 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
638 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
639} 746}
640 747
664} 771}
665 772
666void 773void
667error (char *message) 774error (char *message)
668 CODE: 775 CODE:
776 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 777#ifdef _WIN32
670 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
671#else 795#else
672 fprintf (stderr, "ERROR: %s\n", message); 796 _exit (retval);
673#endif 797#endif
674 798
675void
676fatal (char *message)
677 CODE:
678#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif
683 exit (1);
684
685MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
686 800
687CFClient::Font 801CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
689 CODE: 803 CODE:
690{ 804{
691 int count; 805 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 809}
696 OUTPUT: 810 OUTPUT:
697 RETVAL 811 RETVAL
698 812
699void 813void
700DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
701 CODE: 815 CODE:
702 pango_font_description_free (self); 816 pango_font_description_free (self);
703 817
704void 818void
705make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
706 CODE: 820 CODE:
707 default_font = self; 821 default_font = self;
708 822
709MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
710 824
711CFClient::Layout 825void
712new (SV *class, int rgba = 0) 826reset_glyph_cache ()
827 CODE:
828 tc_clear ();
829
830CFPlus::Layout
831new (SV *class)
713 CODE: 832 CODE:
714 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
715 834
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
717 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 836 RETVAL->r = 1.;
719 RETVAL->g = 1.; 837 RETVAL->g = 1.;
720 RETVAL->b = 1.; 838 RETVAL->b = 1.;
721 RETVAL->a = 1.; 839 RETVAL->a = 1.;
722 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
726 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
727 OUTPUT: 845 OUTPUT:
728 RETVAL 846 RETVAL
729 847
730void 848void
731DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
732 CODE: 850 CODE:
733 g_object_unref (self->pl); 851 g_object_unref (self->pl);
734 Safefree (self); 852 Safefree (self);
735 853
736int
737is_rgba (CFClient::Layout self)
738 CODE:
739 RETVAL = self->rgba;
740 OUTPUT:
741 RETVAL
742
743void 854void
744set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
745 CODE: 856 CODE:
746{ 857{
747 STRLEN textlen; 858 STRLEN textlen;
748 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
749 860
750 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
751} 862}
752 863
753void 864void
754set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
755 CODE: 866 CODE:
756{ 867{
757 STRLEN textlen; 868 STRLEN textlen;
758 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
759 870
760 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
761} 872}
762 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
763SV * 959SV *
764get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
765 CODE: 961 CODE:
766 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767 SvUTF8_on (RETVAL); 963 sv_utf8_decode (RETVAL);
768 OUTPUT: 964 OUTPUT:
769 RETVAL 965 RETVAL
770 966
771void 967void
772set_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.)
773 CODE: 969 CODE:
774 self->r = r; 970 self->r = r;
775 self->g = g; 971 self->g = g;
776 self->b = b; 972 self->b = b;
777 self->a = a; 973 self->a = a;
778 974
779void 975void
780set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781 CODE: 977 CODE:
782 if (self->font != font) 978 if (self->font != font)
783 { 979 {
784 self->font = font; 980 self->font = font;
785 layout_update_font (self); 981 layout_update_font (self);
786 } 982 }
787 983
788void 984void
789set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
790 CODE: 986 CODE:
791 if (self->base_height != base_height) 987 if (self->base_height != base_height)
792 { 988 {
793 self->base_height = base_height; 989 self->base_height = base_height;
794 layout_update_font (self); 990 layout_update_font (self);
795 } 991 }
796 992
797void 993void
798set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
799 CODE: 995 CODE:
800 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);
801 997
802void 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
803size (CFClient::Layout self) 1024size (CFPlus::Layout self)
804 PPCODE: 1025 PPCODE:
805{ 1026{
806 int w, h; 1027 int w, h;
807 1028
808 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
811 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
812 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
813} 1034}
814 1035
815int 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
816xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
817 CODE: 1050 CODE:
818{ 1051{
819 int index, trailing; 1052 int index, trailing;
820 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);
821 RETVAL = index; 1054 RETVAL = index;
822} 1055}
823 OUTPUT: 1056 OUTPUT:
824 RETVAL 1057 RETVAL
825 1058
826void 1059void
827cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
828 PPCODE: 1061 PPCODE:
829{ 1062{
830 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
831 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832 1065
835 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837} 1070}
838 1071
839void 1072void
840render (CFClient::Layout self) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
841 PPCODE: 1074 PPCODE:
842{ 1075 pango_opengl_render_layout_subpixel (
843 SV *retval; 1076 self->pl,
844 int w, h; 1077 x * PANGO_SCALE, y * PANGO_SCALE,
1078 self->r, self->g, self->b, self->a,
1079 flags
1080 );
845 1081
846 layout_get_pixel_size (self, &w, &h); 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
847 1083
848 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)
849 { 1092 {
850 cairo_surface_t *surface; 1093 int nw = minpot (ow);
851 cairo_t *cairo; 1094 int nh = minpot (oh);
852 1095
853 retval = newSV (w * h * 4); 1096 if (nw != ow || nh != oh)
854 SvPOK_only (retval);
855 SvCUR_set (retval, w * h * 4);
856
857 memset (SvPVX (retval), 0, w * h * 4);
858
859 surface = cairo_image_surface_create_for_data (
860 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
861 cairo = cairo_create (surface);
862 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
863
864 pango_cairo_show_layout (cairo, self->pl);
865
866 cairo_destroy (cairo);
867 cairo_surface_destroy (surface);
868
869 // what a mess, and its premultiplied, too :(
870 { 1097 {
871 uint32_t *p = (uint32_t *)SvPVX (retval); 1098 if (SvOK (data_))
872 uint32_t *e = p + w * h;
873
874 while (p < e)
875 { 1099 {
876 uint32_t rgba = *p; 1100 STRLEN datalen;
877 rgba = (rgba >> 24) | (rgba << 8); 1101 char *data = SvPVbyte (data_, datalen);
878 rgba = SDL_SwapBE32 (rgba); 1102 int bpp = datalen / (ow * oh);
879 *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_);
880 } 1113 }
1114
1115 sv_setiv (w_, nw);
1116 sv_setiv (h_, nh);
881 } 1117 }
882
883 EXTEND (SP, 5);
884 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h)));
886 PUSHs (sv_2mortal (retval));
887 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
888 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889 } 1118 }
890 else
891 {
892 FT_Bitmap bitmap;
893
894 retval = newSV (w * h);
895 SvPOK_only (retval);
896 SvCUR_set (retval, w * h);
897
898 bitmap.rows = h;
899 bitmap.width = w;
900 bitmap.pitch = w;
901 bitmap.buffer = (unsigned char*)SvPVX (retval);
902 bitmap.num_grays = 256;
903 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
904
905 memset (bitmap.buffer, 0, w * h);
906
907 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
908
909 EXTEND (SP, 5);
910 PUSHs (sv_2mortal (newSViv (w)));
911 PUSHs (sv_2mortal (newSViv (h)));
912 PUSHs (sv_2mortal (retval));
913 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 }
916} 1119}
917 1120
918MODULE = CFClient PACKAGE = CFClient::Texture
919
920void 1121void
921draw_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.)
922 PROTOTYPE: $$$;$$ 1123 PROTOTYPE: $$$;$$
923 ALIAS: 1124 ALIAS:
924 draw_quad_alpha = 1 1125 draw_quad_alpha = 1
925 draw_quad_alpha_premultiplied = 2 1126 draw_quad_alpha_premultiplied = 2
926 CODE: 1127 CODE:
927{ 1128{
928 HV *hv = (HV *)SvRV (self); 1129 HV *hv = (HV *)SvRV (self);
929 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1130 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1131 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1132 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933 1133
934 if (items < 5) 1134 if (items < 5)
935 { 1135 {
936 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1136 w = SvNV (*hv_fetch (hv, "w", 1, 1));
937 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1137 h = SvNV (*hv_fetch (hv, "h", 1, 1));
938 } 1138 }
939 1139
940 if (ix) 1140 if (ix)
941 { 1141 {
942 glEnable (GL_BLEND); 1142 glEnable (GL_BLEND);
1143
1144 if (ix == 2)
943 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);
944 } 1152 }
945 1153
946 glBindTexture (GL_TEXTURE_2D, name); 1154 glBindTexture (GL_TEXTURE_2D, name);
947
948 if (wrap_mode)
949 {
950 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952 }
953 1155
954 glBegin (GL_QUADS); 1156 glBegin (GL_QUADS);
955 glTexCoord2f (0, 0); glVertex2f (x , y ); 1157 glTexCoord2f (0, 0); glVertex2f (x , y );
956 glTexCoord2f (0, t); glVertex2f (x , y + h); 1158 glTexCoord2f (0, t); glVertex2f (x , y + h);
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1159 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1160 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1161 glEnd ();
960 1162
961 if (ix) 1163 if (ix)
1164 {
1165 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1167 }
963} 1168}
964 1169
965MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
966 1171
967CFClient::Map 1172CFPlus::Map
968new (SV *class, int map_width, int map_height) 1173new (SV *class)
969 CODE: 1174 CODE:
970 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
971 RETVAL->x = 0; 1176 RETVAL->x = 0;
972 RETVAL->y = 0; 1177 RETVAL->y = 0;
973 RETVAL->w = map_width; 1178 RETVAL->w = 0;
974 RETVAL->h = map_height; 1179 RETVAL->h = 0;
975 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
976 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
977 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
978 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
979 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
982 RETVAL->row = 0; 1187 RETVAL->row = 0;
983 OUTPUT: 1188 OUTPUT:
984 RETVAL 1189 RETVAL
985 1190
986void 1191void
987DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
988 CODE: 1193 CODE:
989{ 1194{
990 map_clear (self); 1195 map_clear (self);
991 Safefree (self->face); 1196 Safefree (self->face);
1197 Safefree (self->tex);
992 Safefree (self); 1198 Safefree (self);
993} 1199}
994 1200
995void 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
996clear (CFClient::Map self) 1208clear (CFPlus::Map self)
997 CODE: 1209 CODE:
998 map_clear (self); 1210 map_clear (self);
999 1211
1000void 1212void
1001set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1002 CODE: 1214 CODE:
1003{ 1215{
1004 while (self->faces <= face) 1216 while (self->faces <= face)
1005 { 1217 {
1006 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
1009 1221
1010 self->face [face] = texid; 1222 self->face [face] = texid;
1011} 1223}
1012 1224
1013void 1225void
1014set_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)
1015 CODE: 1227 CODE:
1016{ 1228{
1017 while (self->texs <= texid) 1229 while (self->texs <= texid)
1018 { 1230 {
1019 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
1031 tex->r = r; 1243 tex->r = r;
1032 tex->g = g; 1244 tex->g = g;
1033 tex->b = b; 1245 tex->b = b;
1034 tex->a = a; 1246 tex->a = a;
1035 } 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);
1036} 1257}
1037 1258
1038int 1259int
1039ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1040 ALIAS: 1261 ALIAS:
1041 oy = 1 1262 oy = 1
1263 x = 2
1264 y = 3
1265 w = 4
1266 h = 5
1042 CODE: 1267 CODE:
1043 switch (ix) 1268 switch (ix)
1044 { 1269 {
1045 case 0: RETVAL = self->ox; break; 1270 case 0: RETVAL = self->ox; break;
1046 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;
1047 } 1276 }
1048 OUTPUT: 1277 OUTPUT:
1049 RETVAL 1278 RETVAL
1050 1279
1051void 1280void
1052scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1053 CODE: 1282 CODE:
1054{ 1283{
1055 if (dx > 0) 1284 if (dx > 0)
1056 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1057 else if (dx < 0) 1286 else if (dx < 0)
1058 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);
1059 1288
1060 if (dy > 0) 1289 if (dy > 0)
1061 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1062 else if (dy < 0) 1291 else if (dy < 0)
1063 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);
1064 1293
1065 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1066 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1067 1296
1068 while (self->y < 0) 1297 while (self->y < 0)
1073 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1074 } 1303 }
1075} 1304}
1076 1305
1077void 1306void
1078map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1079 CODE: 1308 CODE:
1080{ 1309{
1081 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1082 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1083 mapcell *cell; 1312 mapcell *cell;
1084 int x, y, flags; 1313 int x, y, flags;
1085 1314
1086 while (data < data_end) 1315 while (data < data_end - 1)
1087 { 1316 {
1088 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1089 1318
1090 x = ((flags >> 10) & 63) + self->x; 1319 x = self->x + ((flags >> 10) & 63);
1091 y = ((flags >> 4) & 63) + self->y; 1320 y = self->y + ((flags >> 4) & 63);
1092 1321
1093 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1094 1323
1095 if (flags & 15) 1324 if (flags & 15)
1096 { 1325 {
1097 if (cell->darkness < 0) 1326 if (!cell->darkness)
1098 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1099 cell->darkness = 0; 1329 cell->darkness = 256;
1100 cell->face [0] = 0;
1101 cell->face [1] = 0;
1102 cell->face [2] = 0;
1103 } 1330 }
1104 1331
1105 cell->darkness = flags & 8 ? *data++ : 255;
1106
1107 //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 }
1108 1373
1109 if (flags & 4) 1374 if (flags & 4)
1110 { 1375 {
1111 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;
1112 } 1377 }
1120 { 1385 {
1121 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;
1122 } 1387 }
1123 } 1388 }
1124 else 1389 else
1125 cell->darkness = -1; 1390 cell->darkness = 0;
1126 } 1391 }
1127} 1392}
1128 1393
1129SV * 1394SV *
1130mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1131 CODE: 1396 CODE:
1132{ 1397{
1133 int x1, x; 1398 int x1, x;
1134 int y1, y; 1399 int y1, y;
1135 int z; 1400 int z;
1185} 1450}
1186 OUTPUT: 1451 OUTPUT:
1187 RETVAL 1452 RETVAL
1188 1453
1189void 1454void
1190draw (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)
1191 PPCODE: 1456 CODE:
1192{ 1457{
1193 int vx, vy;
1194 int x, y, z; 1458 int x, y, z;
1195 int last_name; 1459 int last_name;
1196 mapface face; 1460 mapface face;
1197 int sw4 = (sw + 3) & ~3;
1198 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1199 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1200
1201 memset (darkness, 255, sw4 * sh);
1202 SvPOK_only (darkness_sv);
1203 SvCUR_set (darkness_sv, sw4 * sh);
1204
1205 vx = self->x + (self->w - sw) / 2 - shift_x;
1206 vy = self->y + (self->h - sh) / 2 - shift_y;
1207
1208 /*
1209 int vx = self->vx = self->w >= sw
1210 ? self->x + (self->w - sw) / 2
1211 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1212
1213 int vy = self->vy = self->h >= sh
1214 ? self->y + (self->h - sh) / 2
1215 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1216 */
1217 1461
1218 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1219 1463
1464 glEnable (GL_BLEND);
1220 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221 glEnable (GL_BLEND);
1222 glEnable (GL_TEXTURE_2D); 1466 glEnable (GL_TEXTURE_2D);
1223 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224 1468
1225 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1226 1470
1227 last_name = 0; 1471 last_name = 0;
1228 1472
1473 mx += self->x;
1474 my += self->y;
1475
1229 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1230 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1231 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1232 { 1479 {
1233 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1234 1481
1235 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1236 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1237 { 1484 {
1238 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1239
1240 darkness[y * sw4 + x] = cell->darkness < 0
1241 ? 255 - FOW_DARKNESS
1242 : 255 - cell->darkness;
1243 1486
1244 face = cell->face [z]; 1487 face = cell->face [z];
1245 1488
1246 if (face) 1489 if (face && face < self->texs)
1247 { 1490 {
1248 maptex tex = self->tex [face]; 1491 maptex tex = self->tex [face];
1249
1250 int px = (x + 1) * 32 - tex.w; 1492 int px = (x + 1) * 32 - tex.w;
1251 int py = (y + 1) * 32 - tex.h; 1493 int py = (y + 1) * 32 - tex.h;
1252 1494
1253 if (last_name != tex.name) 1495 if (last_name != tex.name)
1254 { 1496 {
1255 glEnd (); 1497 glEnd ();
1256 last_name = tex.name;
1257 glBindTexture (GL_TEXTURE_2D, last_name); 1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1258 glBegin (GL_QUADS); 1499 glBegin (GL_QUADS);
1259 } 1500 }
1260 1501
1261 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1262 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1263 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);
1264 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1265 } 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 }
1266 } 1526 }
1267 } 1527 }
1268 1528
1269 glEnd (); 1529 glEnd ();
1270 1530
1271 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1272 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 }
1273 1657
1274 EXTEND (SP, 3); 1658 EXTEND (SP, 3);
1275 PUSHs (sv_2mortal (newSViv (sw4))); 1659 PUSHs (sv_2mortal (newSViv (sw4)));
1276 PUSHs (sv_2mortal (newSViv (sh))); 1660 PUSHs (sv_2mortal (newSViv (sh)));
1277 PUSHs (darkness_sv); 1661 PUSHs (darkness_sv);
1278} 1662}
1279 1663
1280SV * 1664SV *
1281get_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)
1282 CODE: 1666 CODE:
1283{ 1667{
1284 int x, y, x1, y1; 1668 int x, y, x1, y1;
1285 SV *data_sv = newSV (w * h * 7 + 5); 1669 SV *data_sv = newSV (w * h * 7 + 5);
1286 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1348} 1732}
1349 OUTPUT: 1733 OUTPUT:
1350 RETVAL 1734 RETVAL
1351 1735
1352void 1736void
1353set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1737set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1354 PPCODE: 1738 PPCODE:
1355{ 1739{
1356 int x, y, z; 1740 int x, y, z;
1357 int w, h; 1741 int w, h;
1358 int x1, y1; 1742 int x1, y1;
1390 1774
1391 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1392 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1393 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1394 1778
1395 if (cell->darkness <= 0) 1779 if (cell->darkness == 0)
1396 { 1780 {
1397 cell->darkness = -1; 1781 cell->darkness = 0;
1398 1782
1399 for (z = 0; z <= 2; z++) 1783 for (z = 0; z <= 2; z++)
1400 { 1784 {
1401 cell->face[z] = face[z]; 1785 cell->face[z] = face[z];
1402 1786
1407 } 1791 }
1408 } 1792 }
1409 } 1793 }
1410} 1794}
1411 1795
1412MODULE = CFClient PACKAGE = CFClient::MixChunk 1796MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413 1797
1414CFClient::MixChunk 1798CFPlus::MixChunk
1415new_from_file (SV *class, char *path) 1799new_from_file (SV *class, char *path)
1416 CODE: 1800 CODE:
1417 RETVAL = Mix_LoadWAV (path); 1801 RETVAL = Mix_LoadWAV (path);
1418 OUTPUT: 1802 OUTPUT:
1419 RETVAL 1803 RETVAL
1420 1804
1421void 1805void
1422DESTROY (CFClient::MixChunk self) 1806DESTROY (CFPlus::MixChunk self)
1423 CODE: 1807 CODE:
1424 Mix_FreeChunk (self); 1808 Mix_FreeChunk (self);
1425 1809
1426int 1810int
1427volume (CFClient::MixChunk self, int volume = -1) 1811volume (CFPlus::MixChunk self, int volume = -1)
1428 CODE: 1812 CODE:
1429 RETVAL = Mix_VolumeChunk (self, volume); 1813 RETVAL = Mix_VolumeChunk (self, volume);
1430 OUTPUT: 1814 OUTPUT:
1431 RETVAL 1815 RETVAL
1432 1816
1433int 1817int
1434play (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)
1435 CODE: 1819 CODE:
1436 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1820 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437 OUTPUT: 1821 OUTPUT:
1438 RETVAL 1822 RETVAL
1439 1823
1440MODULE = CFClient PACKAGE = CFClient::MixMusic 1824MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441 1825
1442int 1826int
1443volume (int volume = -1) 1827volume (int volume = -1)
1444 CODE: 1828 CODE:
1445 RETVAL = Mix_VolumeMusic (volume); 1829 RETVAL = Mix_VolumeMusic (volume);
1446 OUTPUT: 1830 OUTPUT:
1447 RETVAL 1831 RETVAL
1448 1832
1449CFClient::MixMusic 1833CFPlus::MixMusic
1450new_from_file (SV *class, char *path) 1834new_from_file (SV *class, char *path)
1451 CODE: 1835 CODE:
1452 RETVAL = Mix_LoadMUS (path); 1836 RETVAL = Mix_LoadMUS (path);
1453 OUTPUT: 1837 OUTPUT:
1454 RETVAL 1838 RETVAL
1455 1839
1456void 1840void
1457DESTROY (CFClient::MixMusic self) 1841DESTROY (CFPlus::MixMusic self)
1458 CODE: 1842 CODE:
1459 Mix_FreeMusic (self); 1843 Mix_FreeMusic (self);
1460 1844
1461int 1845int
1462play (CFClient::MixMusic self, int loops = -1) 1846play (CFPlus::MixMusic self, int loops = -1)
1463 CODE: 1847 CODE:
1464 RETVAL = Mix_PlayMusic (self, loops); 1848 RETVAL = Mix_PlayMusic (self, loops);
1465 OUTPUT: 1849 OUTPUT:
1466 RETVAL 1850 RETVAL
1467 1851
1468MODULE = CFClient PACKAGE = CFClient::OpenGL 1852MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469 1853
1470BOOT: 1854BOOT:
1471{ 1855{
1472 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1856 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473 static const struct { 1857 static const struct {
1474 const char *name; 1858 const char *name;
1475 IV iv; 1859 IV iv;
1476 } *civ, const_iv[] = { 1860 } *civ, const_iv[] = {
1477# define const_iv(name) { # name, (IV)name } 1861# define const_iv(name) { # name, (IV)name }
1478 const_iv (GL_COLOR_MATERIAL), 1862 const_iv (GL_COLOR_MATERIAL),
1479 const_iv (GL_SMOOTH), 1863 const_iv (GL_SMOOTH),
1480 const_iv (GL_FLAT), 1864 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER), 1865 const_iv (GL_DITHER),
1482 const_iv (GL_BLEND), 1866 const_iv (GL_BLEND),
1867 const_iv (GL_CULL_FACE),
1483 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),
1484 const_iv (GL_AND), 1875 const_iv (GL_AND),
1485 const_iv (GL_ONE), 1876 const_iv (GL_ONE),
1486 const_iv (GL_ZERO), 1877 const_iv (GL_ZERO),
1487 const_iv (GL_SRC_ALPHA), 1878 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE), 1879 const_iv (GL_DST_ALPHA),
1489 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1880 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1881 const_iv (GL_ONE_MINUS_DST_ALPHA),
1882 const_iv (GL_SRC_ALPHA_SATURATE),
1491 const_iv (GL_RGB), 1883 const_iv (GL_RGB),
1492 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),
1493 const_iv (GL_UNSIGNED_BYTE), 1888 const_iv (GL_UNSIGNED_BYTE),
1889 const_iv (GL_UNSIGNED_SHORT),
1890 const_iv (GL_UNSIGNED_INT),
1494 const_iv (GL_ALPHA), 1891 const_iv (GL_ALPHA),
1892 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1893 const_iv (GL_LUMINANCE),
1894 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1895 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1896 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1897 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1898 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1899 const_iv (GL_TEXTURE_2D),
1502 const_iv (GL_TEXTURE_MAG_FILTER), 1901 const_iv (GL_TEXTURE_MAG_FILTER),
1503 const_iv (GL_TEXTURE_MIN_FILTER), 1902 const_iv (GL_TEXTURE_MIN_FILTER),
1504 const_iv (GL_TEXTURE_ENV_MODE), 1903 const_iv (GL_TEXTURE_ENV_MODE),
1505 const_iv (GL_TEXTURE_WRAP_S), 1904 const_iv (GL_TEXTURE_WRAP_S),
1506 const_iv (GL_TEXTURE_WRAP_T), 1905 const_iv (GL_TEXTURE_WRAP_T),
1906 const_iv (GL_REPEAT),
1507 const_iv (GL_CLAMP), 1907 const_iv (GL_CLAMP),
1508 const_iv (GL_REPEAT), 1908 const_iv (GL_CLAMP_TO_EDGE),
1509 const_iv (GL_NEAREST), 1909 const_iv (GL_NEAREST),
1510 const_iv (GL_LINEAR), 1910 const_iv (GL_LINEAR),
1511 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1911 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1912 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1913 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1914 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP), 1915 const_iv (GL_GENERATE_MIPMAP),
1516 const_iv (GL_MODULATE), 1916 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL), 1917 const_iv (GL_DECAL),
1518 const_iv (GL_REPLACE), 1918 const_iv (GL_REPLACE),
1919 const_iv (GL_DEPTH_BUFFER_BIT),
1519 const_iv (GL_COLOR_BUFFER_BIT), 1920 const_iv (GL_COLOR_BUFFER_BIT),
1520 const_iv (GL_PROJECTION), 1921 const_iv (GL_PROJECTION),
1521 const_iv (GL_MODELVIEW), 1922 const_iv (GL_MODELVIEW),
1522 const_iv (GL_COLOR_LOGIC_OP), 1923 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D), 1924 const_iv (GL_SEPARABLE_2D),
1524 const_iv (GL_CONVOLUTION_2D), 1925 const_iv (GL_CONVOLUTION_2D),
1525 const_iv (GL_CONVOLUTION_BORDER_MODE), 1926 const_iv (GL_CONVOLUTION_BORDER_MODE),
1526 const_iv (GL_CONSTANT_BORDER), 1927 const_iv (GL_CONSTANT_BORDER),
1527 const_iv (GL_LINES), 1928 const_iv (GL_LINES),
1929 const_iv (GL_LINE_STRIP),
1930 const_iv (GL_LINE_LOOP),
1528 const_iv (GL_QUADS), 1931 const_iv (GL_QUADS),
1529 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),
1530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1936 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531 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),
1532# undef const_iv 1942# undef const_iv
1533 }; 1943 };
1534 1944
1535 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; )
1536 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1946 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537} 1947}
1538 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
1539int glGetError () 1970int glGetError ()
1971
1972void glFinish ()
1540 1973
1541void glClear (int mask) 1974void glClear (int mask)
1542 1975
1543void glClearColor (float r, float g, float b, float a = 1.0) 1976void glClearColor (float r, float g, float b, float a = 1.0)
1544 PROTOTYPE: @ 1977 PROTOTYPE: @
1551 1984
1552void glHint (int target, int mode) 1985void glHint (int target, int mode)
1553 1986
1554void glBlendFunc (int sfactor, int dfactor) 1987void glBlendFunc (int sfactor, int dfactor)
1555 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
1556void glLogicOp (int opcode) 1995void glLogicOp (int opcode)
1557 1996
1558void glColorMask (int red, int green, int blue, int alpha) 1997void glColorMask (int red, int green, int blue, int alpha)
1559 1998
1560void glMatrixMode (int mode) 1999void glMatrixMode (int mode)
1563 2002
1564void glPopMatrix () 2003void glPopMatrix ()
1565 2004
1566void glLoadIdentity () 2005void glLoadIdentity ()
1567 2006
2007void glDrawBuffer (int buffer)
2008
2009void glReadBuffer (int buffer)
2010
1568# 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
1569void 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_)
1570 2016
1571void glViewport (int x, int y, int width, int height) 2017void glViewport (int x, int y, int width, int height)
1572 2018
1573void glScissor (int x, int y, int width, int height) 2019void glScissor (int x, int y, int width, int height)
1588 2034
1589void glEnd () 2035void glEnd ()
1590 2036
1591void glColor (float r, float g, float b, float a = 1.0) 2037void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 2038 PROTOTYPE: @
2039 ALIAS:
2040 glColor_premultiply = 1
1593 CODE: 2041 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 2042 if (ix)
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 2043 {
2044 r *= a;
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);
1596 2061
1597void glVertex (float x, float y, float z = 0.) 2062void glVertex (float x, float y, float z = 0.)
1598 CODE: 2063 CODE:
1599 glVertex3f (x, y, z); 2064 glVertex3f (x, y, z);
1600 2065
1612 2077
1613void glBindTexture (int target, int name) 2078void glBindTexture (int target, int name)
1614 2079
1615void glConvolutionParameter (int target, int pname, float params) 2080void glConvolutionParameter (int target, int pname, float params)
1616 CODE: 2081 CODE:
1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2082 if (gl.ConvolutionParameterf)
2083 gl.ConvolutionParameterf (target, pname, params);
1618 2084
1619void 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)
1620 CODE: 2086 CODE:
1621 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2087 if (gl.ConvolutionFilter2D)
1622 (target, internalformat, width, height, format, type, data)); 2088 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623 2089
1624void 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)
1625 CODE: 2091 CODE:
1626 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2092 if (gl.SeparableFilter2D)
1627 (target, internalformat, width, height, format, type, row, column)); 2093 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628 2094
1629void 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)
1630 2096
1631void 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)
1632 2098
1633void glRasterPos (int x, int y) 2099void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634 CODE:
1635 glRasterPos2i (x, y);
1636 2100
1637void 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)
1638 2102
1639int glGenTexture () 2103int glGenTexture ()
1640 CODE: 2104 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines