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.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines