ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.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
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, 1); 524 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 525
526 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
527 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
528
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 531 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 532 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 533
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 534 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
535#if SDL_VERSION_ATLEAST(1,2,10)
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 536 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 537 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
538#endif
456 539
457 SDL_EnableUNICODE (1); 540 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 541 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 542
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 543 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
469 552
470 ++m; 553 ++m;
471 } 554 }
472} 555}
473 556
557char *
558SDL_GetError ()
559
474int 560int
475SDL_SetVideoMode (int w, int h, int fullscreen) 561SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 562 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 563 RETVAL = !!SDL_SetVideoMode (
478 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 564 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
479 ); 565 );
566 if (RETVAL)
567 {
480 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 }
481 OUTPUT: 573 OUTPUT:
482 RETVAL 574 RETVAL
483 575
484void 576void
485SDL_GL_SwapBuffers () 577SDL_GL_SwapBuffers ()
578
579char *
580SDL_GetKeyName (int sym)
486 581
487void 582void
488SDL_PollEvent () 583SDL_PollEvent ()
489 PPCODE: 584 PPCODE:
490{ 585{
509 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 604 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511 break; 606 break;
512 607
513 case SDL_MOUSEMOTION: 608 case SDL_MOUSEMOTION:
609 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
514 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 611 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 612 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 613 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 614 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 615 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519 break; 616 break;
520 617
521 case SDL_MOUSEBUTTONDOWN: 618 case SDL_MOUSEBUTTONDOWN:
522 case SDL_MOUSEBUTTONUP: 619 case SDL_MOUSEBUTTONUP:
620 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
621
523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 622 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 623 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 624 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 625 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break; 626 break;
531 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 630 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
532 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 631 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
533 break; 632 break;
534 } 633 }
535 634
536 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 635 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
537 } 636 }
538} 637}
539 638
540int 639int
541Mix_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)
554 CODE: 653 CODE:
555#ifndef _WIN32 654#ifndef _WIN32
556 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 655 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557#endif 656#endif
558 657
559char * 658void
560gl_version () 659win32_proxy_info ()
561 CODE: 660 PPCODE:
562 RETVAL = (char *)glGetString (GL_VERSION); 661{
563 OUTPUT: 662#ifdef _WIN32
564 RETVAL 663 char buffer[2048];
664 DWORD buflen;
565 665
566char * 666 EXTEND (SP, 3);
567gl_extensions () 667
568 CODE: 668 buflen = sizeof (buffer);
569 RETVAL = (char *)glGetString (GL_EXTENSIONS); 669 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
570 OUTPUT: 670 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
571 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}
572 686
573void 687void
574add_font (char *file) 688add_font (char *file)
575 CODE: 689 CODE:
576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 690 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577#ifdef _WIN32
578 // cairo... sigh... requires win2000
579 AddFontResourceEx (file, FR_PRIVATE, 0);
580#endif
581 691
582void 692void
583load_image_inline (SV *image_) 693load_image_inline (SV *image_)
584 ALIAS: 694 ALIAS:
585 load_image_file = 1 695 load_image_file = 1
627 737
628 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 738 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629 739
630 assert (surface2->pitch == surface2->w * 4); 740 assert (surface2->pitch == surface2->w * 4);
631 741
742 SDL_LockSurface (surface2);
632 EXTEND (SP, 5); 743 EXTEND (SP, 6);
633 PUSHs (sv_2mortal (newSViv (surface2->w))); 744 PUSHs (sv_2mortal (newSViv (surface2->w)));
634 PUSHs (sv_2mortal (newSViv (surface2->h))); 745 PUSHs (sv_2mortal (newSViv (surface2->h)));
635 SDL_LockSurface (surface2);
636 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 746 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
637 SDL_UnlockSurface (surface2);
638 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 747 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 748 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 749 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
750 SDL_UnlockSurface (surface2);
641 751
642 SDL_FreeSurface (surface); 752 SDL_FreeSurface (surface);
643 SDL_FreeSurface (surface2); 753 SDL_FreeSurface (surface2);
644} 754}
645 755
669} 779}
670 780
671void 781void
672error (char *message) 782error (char *message)
673 CODE: 783 CODE:
784 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 785#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 786 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 787#endif
679 788
680void 789void
681fatal (char *message) 790fatal (char *message)
682 CODE: 791 CODE:
792 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 793#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 794 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 795#endif
688 exit (1); 796 _exit (1);
689 797
798void
799_exit (int retval = 0)
800 CODE:
801 _exit (retval);
802
690MODULE = CFClient PACKAGE = CFClient::Font 803MODULE = CFPlus PACKAGE = CFPlus::Font
691 804
692CFClient::Font 805CFPlus::Font
693new_from_file (SV *class, char *path, int id = 0) 806new_from_file (SV *class, char *path, int id = 0)
694 CODE: 807 CODE:
695{ 808{
696 int count; 809 int count;
697 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 810 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
700} 813}
701 OUTPUT: 814 OUTPUT:
702 RETVAL 815 RETVAL
703 816
704void 817void
705DESTROY (CFClient::Font self) 818DESTROY (CFPlus::Font self)
706 CODE: 819 CODE:
707 pango_font_description_free (self); 820 pango_font_description_free (self);
708 821
709void 822void
710make_default (CFClient::Font self) 823make_default (CFPlus::Font self)
711 CODE: 824 CODE:
712 default_font = self; 825 default_font = self;
713 826
714MODULE = CFClient PACKAGE = CFClient::Layout 827MODULE = CFPlus PACKAGE = CFPlus::Layout
715 828
716CFClient::Layout 829void
717new (SV *class, int rgba = 0) 830reset_glyph_cache ()
831 CODE:
832 tc_clear ();
833
834CFPlus::Layout
835new (SV *class)
718 CODE: 836 CODE:
719 New (0, RETVAL, 1, struct cf_layout); 837 New (0, RETVAL, 1, struct cf_layout);
720 838
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 839 RETVAL->pl = pango_layout_new (opengl_context);
722 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 840 RETVAL->r = 1.;
724 RETVAL->g = 1.; 841 RETVAL->g = 1.;
725 RETVAL->b = 1.; 842 RETVAL->b = 1.;
726 RETVAL->a = 1.; 843 RETVAL->a = 1.;
727 RETVAL->base_height = MIN_FONT_HEIGHT; 844 RETVAL->base_height = MIN_FONT_HEIGHT;
731 layout_update_font (RETVAL); 848 layout_update_font (RETVAL);
732 OUTPUT: 849 OUTPUT:
733 RETVAL 850 RETVAL
734 851
735void 852void
736DESTROY (CFClient::Layout self) 853DESTROY (CFPlus::Layout self)
737 CODE: 854 CODE:
738 g_object_unref (self->pl); 855 g_object_unref (self->pl);
739 Safefree (self); 856 Safefree (self);
740 857
741int
742is_rgba (CFClient::Layout self)
743 CODE:
744 RETVAL = self->rgba;
745 OUTPUT:
746 RETVAL
747
748void 858void
749set_text (CFClient::Layout self, SV *text_) 859set_text (CFPlus::Layout self, SV *text_)
750 CODE: 860 CODE:
751{ 861{
752 STRLEN textlen; 862 STRLEN textlen;
753 char *text = SvPVutf8 (text_, textlen); 863 char *text = SvPVutf8 (text_, textlen);
754 864
755 pango_layout_set_text (self->pl, text, textlen); 865 pango_layout_set_text (self->pl, text, textlen);
756} 866}
757 867
758void 868void
759set_markup (CFClient::Layout self, SV *text_) 869set_markup (CFPlus::Layout self, SV *text_)
760 CODE: 870 CODE:
761{ 871{
762 STRLEN textlen; 872 STRLEN textlen;
763 char *text = SvPVutf8 (text_, textlen); 873 char *text = SvPVutf8 (text_, textlen);
764 874
765 pango_layout_set_markup (self->pl, text, textlen); 875 pango_layout_set_markup (self->pl, text, textlen);
766} 876}
767 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
768SV * 963SV *
769get_text (CFClient::Layout self) 964get_text (CFPlus::Layout self)
770 CODE: 965 CODE:
771 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 966 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772 SvUTF8_on (RETVAL); 967 sv_utf8_decode (RETVAL);
773 OUTPUT: 968 OUTPUT:
774 RETVAL 969 RETVAL
775 970
776void 971void
777set_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.)
778 CODE: 973 CODE:
779 self->r = r; 974 self->r = r;
780 self->g = g; 975 self->g = g;
781 self->b = b; 976 self->b = b;
782 self->a = a; 977 self->a = a;
783 978
784void 979void
785set_font (CFClient::Layout self, CFClient::Font font = 0) 980set_font (CFPlus::Layout self, CFPlus::Font font = 0)
786 CODE: 981 CODE:
787 if (self->font != font) 982 if (self->font != font)
788 { 983 {
789 self->font = font; 984 self->font = font;
790 layout_update_font (self); 985 layout_update_font (self);
791 } 986 }
792 987
793void 988void
794set_height (CFClient::Layout self, int base_height) 989set_height (CFPlus::Layout self, int base_height)
795 CODE: 990 CODE:
796 if (self->base_height != base_height) 991 if (self->base_height != base_height)
797 { 992 {
798 self->base_height = base_height; 993 self->base_height = base_height;
799 layout_update_font (self); 994 layout_update_font (self);
800 } 995 }
801 996
802void 997void
803set_width (CFClient::Layout self, int max_width = -1) 998set_width (CFPlus::Layout self, int max_width = -1)
804 CODE: 999 CODE:
805 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);
806 1001
807void 1002void
808set_indent (CFClient::Layout self, int indent) 1003set_indent (CFPlus::Layout self, int indent)
809 CODE: 1004 CODE:
810 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1005 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
811 1006
812void 1007void
813set_spacing (CFClient::Layout self, int spacing) 1008set_spacing (CFPlus::Layout self, int spacing)
814 CODE: 1009 CODE:
815 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1010 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
816 1011
817void 1012void
818set_ellipsise (CFClient::Layout self, int ellipsise) 1013set_ellipsise (CFPlus::Layout self, int ellipsise)
819 CODE: 1014 CODE:
820 pango_layout_set_ellipsize (self->pl, 1015 pango_layout_set_ellipsize (self->pl,
821 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1016 ellipsise == 1 ? PANGO_ELLIPSIZE_START
822 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1017 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
823 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1018 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
824 : PANGO_ELLIPSIZE_NONE 1019 : PANGO_ELLIPSIZE_NONE
825 ); 1020 );
826 1021
827void 1022void
828set_single_paragraph_mode (CFClient::Layout self, int spm) 1023set_single_paragraph_mode (CFPlus::Layout self, int spm)
829 CODE: 1024 CODE:
830 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1025 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
831 1026
832void 1027void
833size (CFClient::Layout self) 1028size (CFPlus::Layout self)
834 PPCODE: 1029 PPCODE:
835{ 1030{
836 int w, h; 1031 int w, h;
837 1032
838 layout_get_pixel_size (self, &w, &h); 1033 layout_get_pixel_size (self, &w, &h);
841 PUSHs (sv_2mortal (newSViv (w))); 1036 PUSHs (sv_2mortal (newSViv (w)));
842 PUSHs (sv_2mortal (newSViv (h))); 1037 PUSHs (sv_2mortal (newSViv (h)));
843} 1038}
844 1039
845int 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
846xy_to_index (CFClient::Layout self, int x, int y) 1053xy_to_index (CFPlus::Layout self, int x, int y)
847 CODE: 1054 CODE:
848{ 1055{
849 int index, trailing; 1056 int index, trailing;
850 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);
851 RETVAL = index; 1058 RETVAL = index;
852} 1059}
853 OUTPUT: 1060 OUTPUT:
854 RETVAL 1061 RETVAL
855 1062
856void 1063void
857cursor_pos (CFClient::Layout self, int index) 1064cursor_pos (CFPlus::Layout self, int index)
858 PPCODE: 1065 PPCODE:
859{ 1066{
860 PangoRectangle strong_pos; 1067 PangoRectangle strong_pos;
861 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1068 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
862 1069
865 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1072 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
866 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1073 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
867} 1074}
868 1075
869void 1076void
870render (CFClient::Layout self) 1077render (CFPlus::Layout self, float x, float y, int flags = 0)
871 PPCODE: 1078 PPCODE:
872{ 1079 pango_opengl_render_layout_subpixel (
873 SV *retval; 1080 self->pl,
874 int w, h; 1081 x * PANGO_SCALE, y * PANGO_SCALE,
1082 self->r, self->g, self->b, self->a,
1083 flags
1084 );
875 1085
876 layout_get_pixel_size (self, &w, &h); 1086MODULE = CFPlus PACKAGE = CFPlus::Texture
877 1087
878 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)
879 { 1096 {
880 cairo_surface_t *surface; 1097 int nw = minpot (ow);
881 cairo_t *cairo; 1098 int nh = minpot (oh);
882 1099
883 retval = newSV (w * h * 4); 1100 if (nw != ow || nh != oh)
884 SvPOK_only (retval);
885 SvCUR_set (retval, w * h * 4);
886
887 memset (SvPVX (retval), 0, w * h * 4);
888
889 surface = cairo_image_surface_create_for_data (
890 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
891 cairo = cairo_create (surface);
892 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
893
894 pango_cairo_show_layout (cairo, self->pl);
895
896 cairo_destroy (cairo);
897 cairo_surface_destroy (surface);
898
899 // what a mess, and its premultiplied, too :(
900 { 1101 {
901 uint32_t *p = (uint32_t *)SvPVX (retval); 1102 if (SvOK (data_))
902 uint32_t *e = p + w * h;
903
904 while (p < e)
905 { 1103 {
906 uint32_t rgba = *p; 1104 STRLEN datalen;
907 rgba = (rgba >> 24) | (rgba << 8); 1105 char *data = SvPVbyte (data_, datalen);
908 rgba = SDL_SwapBE32 (rgba); 1106 int bpp = datalen / (ow * oh);
909 *p++ = rgba; 1107 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1108
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_);
910 } 1117 }
1118
1119 sv_setiv (w_, nw);
1120 sv_setiv (h_, nh);
911 } 1121 }
912
913 EXTEND (SP, 5);
914 PUSHs (sv_2mortal (newSViv (w)));
915 PUSHs (sv_2mortal (newSViv (h)));
916 PUSHs (sv_2mortal (retval));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919 } 1122 }
920 else
921 {
922 FT_Bitmap bitmap;
923
924 retval = newSV (w * h);
925 SvPOK_only (retval);
926 SvCUR_set (retval, w * h);
927
928 bitmap.rows = h;
929 bitmap.width = w;
930 bitmap.pitch = w;
931 bitmap.buffer = (unsigned char*)SvPVX (retval);
932 bitmap.num_grays = 256;
933 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
934
935 memset (bitmap.buffer, 0, w * h);
936
937 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
938
939 EXTEND (SP, 5);
940 PUSHs (sv_2mortal (newSViv (w)));
941 PUSHs (sv_2mortal (newSViv (h)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 }
946} 1123}
947 1124
948MODULE = CFClient PACKAGE = CFClient::Texture
949
950void 1125void
951draw_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.)
952 PROTOTYPE: $$$;$$ 1127 PROTOTYPE: $$$;$$
953 ALIAS: 1128 ALIAS:
954 draw_quad_alpha = 1 1129 draw_quad_alpha = 1
955 draw_quad_alpha_premultiplied = 2 1130 draw_quad_alpha_premultiplied = 2
956 CODE: 1131 CODE:
957{ 1132{
958 HV *hv = (HV *)SvRV (self); 1133 HV *hv = (HV *)SvRV (self);
959 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1134 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1135 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1136 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963 1137
964 if (items < 5) 1138 if (items < 5)
965 { 1139 {
966 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1140 w = SvNV (*hv_fetch (hv, "w", 1, 1));
967 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1141 h = SvNV (*hv_fetch (hv, "h", 1, 1));
968 } 1142 }
969 1143
970 if (ix) 1144 if (ix)
971 { 1145 {
972 glEnable (GL_BLEND); 1146 glEnable (GL_BLEND);
1147
1148 if (ix == 2)
973 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
1154 glEnable (GL_ALPHA_TEST);
1155 glAlphaFunc (GL_GREATER, 0.01f);
974 } 1156 }
975 1157
976 glBindTexture (GL_TEXTURE_2D, name); 1158 glBindTexture (GL_TEXTURE_2D, name);
977
978 if (wrap_mode)
979 {
980 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982 }
983 1159
984 glBegin (GL_QUADS); 1160 glBegin (GL_QUADS);
985 glTexCoord2f (0, 0); glVertex2f (x , y ); 1161 glTexCoord2f (0, 0); glVertex2f (x , y );
986 glTexCoord2f (0, t); glVertex2f (x , y + h); 1162 glTexCoord2f (0, t); glVertex2f (x , y + h);
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1163 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1164 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1165 glEnd ();
990 1166
991 if (ix) 1167 if (ix)
1168 {
1169 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1170 glDisable (GL_BLEND);
1171 }
993} 1172}
994 1173
995MODULE = CFClient PACKAGE = CFClient::Map 1174MODULE = CFPlus PACKAGE = CFPlus::Map
996 1175
997CFClient::Map 1176CFPlus::Map
998new (SV *class, int map_width, int map_height) 1177new (SV *class, int map_width, int map_height)
999 CODE: 1178 CODE:
1000 New (0, RETVAL, 1, struct map); 1179 New (0, RETVAL, 1, struct map);
1001 RETVAL->x = 0; 1180 RETVAL->x = 0;
1002 RETVAL->y = 0; 1181 RETVAL->y = 0;
1012 RETVAL->row = 0; 1191 RETVAL->row = 0;
1013 OUTPUT: 1192 OUTPUT:
1014 RETVAL 1193 RETVAL
1015 1194
1016void 1195void
1017DESTROY (CFClient::Map self) 1196DESTROY (CFPlus::Map self)
1018 CODE: 1197 CODE:
1019{ 1198{
1020 map_clear (self); 1199 map_clear (self);
1021 Safefree (self->face); 1200 Safefree (self->face);
1201 Safefree (self->tex);
1022 Safefree (self); 1202 Safefree (self);
1023} 1203}
1024 1204
1025void 1205void
1026clear (CFClient::Map self) 1206clear (CFPlus::Map self)
1027 CODE: 1207 CODE:
1028 map_clear (self); 1208 map_clear (self);
1029 1209
1030void 1210void
1031set_face (CFClient::Map self, int face, int texid) 1211set_face (CFPlus::Map self, int face, int texid)
1032 CODE: 1212 CODE:
1033{ 1213{
1034 while (self->faces <= face) 1214 while (self->faces <= face)
1035 { 1215 {
1036 Append (mapface, self->face, self->faces, self->faces); 1216 Append (mapface, self->face, self->faces, self->faces);
1039 1219
1040 self->face [face] = texid; 1220 self->face [face] = texid;
1041} 1221}
1042 1222
1043void 1223void
1044set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
1045 CODE: 1225 CODE:
1046{ 1226{
1047 while (self->texs <= texid) 1227 while (self->texs <= texid)
1048 { 1228 {
1049 Append (maptex, self->tex, self->texs, self->texs); 1229 Append (maptex, self->tex, self->texs, self->texs);
1061 tex->r = r; 1241 tex->r = r;
1062 tex->g = g; 1242 tex->g = g;
1063 tex->b = b; 1243 tex->b = b;
1064 tex->a = a; 1244 tex->a = a;
1065 } 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);
1066} 1255}
1067 1256
1068int 1257int
1069ox (CFClient::Map self) 1258ox (CFPlus::Map self)
1070 ALIAS: 1259 ALIAS:
1071 oy = 1 1260 oy = 1
1261 x = 2
1262 y = 3
1263 w = 4
1264 h = 5
1072 CODE: 1265 CODE:
1073 switch (ix) 1266 switch (ix)
1074 { 1267 {
1075 case 0: RETVAL = self->ox; break; 1268 case 0: RETVAL = self->ox; break;
1076 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;
1077 } 1274 }
1078 OUTPUT: 1275 OUTPUT:
1079 RETVAL 1276 RETVAL
1080 1277
1081void 1278void
1082scroll (CFClient::Map self, int dx, int dy) 1279scroll (CFPlus::Map self, int dx, int dy)
1083 CODE: 1280 CODE:
1084{ 1281{
1085 if (dx > 0) 1282 if (dx > 0)
1086 map_blank (self, self->x, self->y, dx - 1, self->h); 1283 map_blank (self, self->x, self->y, dx, self->h);
1087 else if (dx < 0) 1284 else if (dx < 0)
1088 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);
1089 1286
1090 if (dy > 0) 1287 if (dy > 0)
1091 map_blank (self, self->x, self->y, self->w, dy - 1); 1288 map_blank (self, self->x, self->y, self->w, dy);
1092 else if (dy < 0) 1289 else if (dy < 0)
1093 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);
1094 1291
1095 self->ox += dx; self->x += dx; 1292 self->ox += dx; self->x += dx;
1096 self->oy += dy; self->y += dy; 1293 self->oy += dy; self->y += dy;
1097 1294
1098 while (self->y < 0) 1295 while (self->y < 0)
1103 self->y += MAP_EXTEND_Y; 1300 self->y += MAP_EXTEND_Y;
1104 } 1301 }
1105} 1302}
1106 1303
1107void 1304void
1108map1a_update (CFClient::Map self, SV *data_) 1305map1a_update (CFPlus::Map self, SV *data_, int extmap)
1109 CODE: 1306 CODE:
1110{ 1307{
1111 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1308 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1112 uint8_t *data_end = (uint8_t *)SvEND (data_); 1309 uint8_t *data_end = (uint8_t *)SvEND (data_);
1113 mapcell *cell; 1310 mapcell *cell;
1114 int x, y, flags; 1311 int x, y, flags;
1115 1312
1116 while (data < data_end) 1313 while (data < data_end - 1)
1117 { 1314 {
1118 flags = (data [0] << 8) + data [1]; data += 2; 1315 flags = (data [0] << 8) + data [1]; data += 2;
1119 1316
1120 x = ((flags >> 10) & 63) + self->x; 1317 x = self->x + ((flags >> 10) & 63);
1121 y = ((flags >> 4) & 63) + self->y; 1318 y = self->y + ((flags >> 4) & 63);
1122 1319
1123 cell = map_get_cell (self, x, y); 1320 cell = map_get_cell (self, x, y);
1124 1321
1125 if (flags & 15) 1322 if (flags & 15)
1126 { 1323 {
1127 if (cell->darkness < 0) 1324 if (!cell->darkness)
1128 { 1325 {
1326 memset (cell, 0, sizeof (*cell));
1129 cell->darkness = 0; 1327 cell->darkness = 256;
1130 cell->face [0] = 0;
1131 cell->face [1] = 0;
1132 cell->face [2] = 0;
1133 } 1328 }
1134 1329
1135 cell->darkness = flags & 8 ? *data++ : 255;
1136
1137 //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 }
1138 1371
1139 if (flags & 4) 1372 if (flags & 4)
1140 { 1373 {
1141 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;
1142 } 1375 }
1150 { 1383 {
1151 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;
1152 } 1385 }
1153 } 1386 }
1154 else 1387 else
1155 cell->darkness = -1; 1388 cell->darkness = 0;
1156 } 1389 }
1157} 1390}
1158 1391
1159SV * 1392SV *
1160mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1393mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1161 CODE: 1394 CODE:
1162{ 1395{
1163 int x1, x; 1396 int x1, x;
1164 int y1, y; 1397 int y1, y;
1165 int z; 1398 int z;
1215} 1448}
1216 OUTPUT: 1449 OUTPUT:
1217 RETVAL 1450 RETVAL
1218 1451
1219void 1452void
1220draw (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)
1221 PPCODE: 1454 CODE:
1222{ 1455{
1223 int vx, vy; 1456 int vx, vy;
1224 int x, y, z; 1457 int x, y, z;
1225 int last_name; 1458 int last_name;
1226 mapface face; 1459 mapface face;
1227 int sw4 = (sw + 3) & ~3;
1228 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1229 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1230 1460
1231 memset (darkness, 255, sw4 * sh);
1232 SvPOK_only (darkness_sv);
1233 SvCUR_set (darkness_sv, sw4 * sh);
1234
1235 vx = self->x + (self->w - sw) / 2 - shift_x; 1461 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1236 vy = self->y + (self->h - sh) / 2 - shift_y; 1462 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1237 1463
1238 /* 1464 /*
1239 int vx = self->vx = self->w >= sw 1465 int vx = self->vx = self->w >= sw
1240 ? self->x + (self->w - sw) / 2 1466 ? self->x + (self->w - sw) / 2
1241 : 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));
1245 : 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));
1246 */ 1472 */
1247 1473
1248 glColor4ub (255, 255, 255, 255); 1474 glColor4ub (255, 255, 255, 255);
1249 1475
1476 glEnable (GL_BLEND);
1250 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1477 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1251 glEnable (GL_BLEND);
1252 glEnable (GL_TEXTURE_2D); 1478 glEnable (GL_TEXTURE_2D);
1253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1479 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1254 1480
1255 glBegin (GL_QUADS); 1481 glBegin (GL_QUADS);
1256 1482
1265 for (x = 0; x < sw; x++) 1491 for (x = 0; x < sw; x++)
1266 if (row->c0 <= x + vx && x + vx < row->c1) 1492 if (row->c0 <= x + vx && x + vx < row->c1)
1267 { 1493 {
1268 mapcell *cell = row->col + (x + vx - row->c0); 1494 mapcell *cell = row->col + (x + vx - row->c0);
1269 1495
1270 darkness[y * sw4 + x] = cell->darkness < 0
1271 ? 255 - FOW_DARKNESS
1272 : 255 - cell->darkness;
1273
1274 face = cell->face [z]; 1496 face = cell->face [z];
1275 1497
1276 if (face) 1498 if (face && face < self->texs)
1277 { 1499 {
1278 maptex tex = self->tex [face]; 1500 maptex tex = self->tex [face];
1279
1280 int px = (x + 1) * 32 - tex.w; 1501 int px = (x + 1) * 32 - tex.w;
1281 int py = (y + 1) * 32 - tex.h; 1502 int py = (y + 1) * 32 - tex.h;
1282 1503
1283 if (last_name != tex.name) 1504 if (last_name != tex.name)
1284 { 1505 {
1285 glEnd (); 1506 glEnd ();
1286 last_name = tex.name;
1287 glBindTexture (GL_TEXTURE_2D, last_name); 1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1288 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1289 } 1509 }
1290 1510
1291 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1292 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1293 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);
1294 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1295 } 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 }
1296 } 1535 }
1297 } 1536 }
1298 1537
1299 glEnd (); 1538 glEnd ();
1300 1539
1301 glDisable (GL_TEXTURE_2D); 1540 glDisable (GL_TEXTURE_2D);
1302 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 }
1303 1667
1304 EXTEND (SP, 3); 1668 EXTEND (SP, 3);
1305 PUSHs (sv_2mortal (newSViv (sw4))); 1669 PUSHs (sv_2mortal (newSViv (sw4)));
1306 PUSHs (sv_2mortal (newSViv (sh))); 1670 PUSHs (sv_2mortal (newSViv (sh)));
1307 PUSHs (darkness_sv); 1671 PUSHs (darkness_sv);
1308} 1672}
1309 1673
1310SV * 1674SV *
1311get_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)
1312 CODE: 1676 CODE:
1313{ 1677{
1314 int x, y, x1, y1; 1678 int x, y, x1, y1;
1315 SV *data_sv = newSV (w * h * 7 + 5); 1679 SV *data_sv = newSV (w * h * 7 + 5);
1316 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1680 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1378} 1742}
1379 OUTPUT: 1743 OUTPUT:
1380 RETVAL 1744 RETVAL
1381 1745
1382void 1746void
1383set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1747set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1384 PPCODE: 1748 PPCODE:
1385{ 1749{
1386 int x, y, z; 1750 int x, y, z;
1387 int w, h; 1751 int w, h;
1388 int x1, y1; 1752 int x1, y1;
1420 1784
1421 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1785 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1422 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1786 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1423 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1787 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1424 1788
1425 if (cell->darkness <= 0) 1789 if (cell->darkness == 0)
1426 { 1790 {
1427 cell->darkness = -1; 1791 cell->darkness = 0;
1428 1792
1429 for (z = 0; z <= 2; z++) 1793 for (z = 0; z <= 2; z++)
1430 { 1794 {
1431 cell->face[z] = face[z]; 1795 cell->face[z] = face[z];
1432 1796
1437 } 1801 }
1438 } 1802 }
1439 } 1803 }
1440} 1804}
1441 1805
1442MODULE = CFClient PACKAGE = CFClient::MixChunk 1806MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1443 1807
1444CFClient::MixChunk 1808CFPlus::MixChunk
1445new_from_file (SV *class, char *path) 1809new_from_file (SV *class, char *path)
1446 CODE: 1810 CODE:
1447 RETVAL = Mix_LoadWAV (path); 1811 RETVAL = Mix_LoadWAV (path);
1448 OUTPUT: 1812 OUTPUT:
1449 RETVAL 1813 RETVAL
1450 1814
1451void 1815void
1452DESTROY (CFClient::MixChunk self) 1816DESTROY (CFPlus::MixChunk self)
1453 CODE: 1817 CODE:
1454 Mix_FreeChunk (self); 1818 Mix_FreeChunk (self);
1455 1819
1456int 1820int
1457volume (CFClient::MixChunk self, int volume = -1) 1821volume (CFPlus::MixChunk self, int volume = -1)
1458 CODE: 1822 CODE:
1459 RETVAL = Mix_VolumeChunk (self, volume); 1823 RETVAL = Mix_VolumeChunk (self, volume);
1460 OUTPUT: 1824 OUTPUT:
1461 RETVAL 1825 RETVAL
1462 1826
1463int 1827int
1464play (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)
1465 CODE: 1829 CODE:
1466 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1830 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1467 OUTPUT: 1831 OUTPUT:
1468 RETVAL 1832 RETVAL
1469 1833
1470MODULE = CFClient PACKAGE = CFClient::MixMusic 1834MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1471 1835
1472int 1836int
1473volume (int volume = -1) 1837volume (int volume = -1)
1474 CODE: 1838 CODE:
1475 RETVAL = Mix_VolumeMusic (volume); 1839 RETVAL = Mix_VolumeMusic (volume);
1476 OUTPUT: 1840 OUTPUT:
1477 RETVAL 1841 RETVAL
1478 1842
1479CFClient::MixMusic 1843CFPlus::MixMusic
1480new_from_file (SV *class, char *path) 1844new_from_file (SV *class, char *path)
1481 CODE: 1845 CODE:
1482 RETVAL = Mix_LoadMUS (path); 1846 RETVAL = Mix_LoadMUS (path);
1483 OUTPUT: 1847 OUTPUT:
1484 RETVAL 1848 RETVAL
1485 1849
1486void 1850void
1487DESTROY (CFClient::MixMusic self) 1851DESTROY (CFPlus::MixMusic self)
1488 CODE: 1852 CODE:
1489 Mix_FreeMusic (self); 1853 Mix_FreeMusic (self);
1490 1854
1491int 1855int
1492play (CFClient::MixMusic self, int loops = -1) 1856play (CFPlus::MixMusic self, int loops = -1)
1493 CODE: 1857 CODE:
1494 RETVAL = Mix_PlayMusic (self, loops); 1858 RETVAL = Mix_PlayMusic (self, loops);
1495 OUTPUT: 1859 OUTPUT:
1496 RETVAL 1860 RETVAL
1497 1861
1498MODULE = CFClient PACKAGE = CFClient::OpenGL 1862MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1499 1863
1500BOOT: 1864BOOT:
1501{ 1865{
1502 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1866 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1503 static const struct { 1867 static const struct {
1504 const char *name; 1868 const char *name;
1505 IV iv; 1869 IV iv;
1506 } *civ, const_iv[] = { 1870 } *civ, const_iv[] = {
1507# define const_iv(name) { # name, (IV)name } 1871# define const_iv(name) { # name, (IV)name }
1508 const_iv (GL_COLOR_MATERIAL), 1872 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1873 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1874 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1875 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1876 const_iv (GL_BLEND),
1877 const_iv (GL_CULL_FACE),
1513 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),
1514 const_iv (GL_AND), 1885 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1886 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1887 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1888 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1889 const_iv (GL_DST_ALPHA),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1890 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1891 const_iv (GL_ONE_MINUS_DST_ALPHA),
1892 const_iv (GL_SRC_ALPHA_SATURATE),
1521 const_iv (GL_RGB), 1893 const_iv (GL_RGB),
1522 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),
1523 const_iv (GL_UNSIGNED_BYTE), 1898 const_iv (GL_UNSIGNED_BYTE),
1899 const_iv (GL_UNSIGNED_SHORT),
1900 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1901 const_iv (GL_ALPHA),
1902 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1903 const_iv (GL_LUMINANCE),
1904 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1905 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1906 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1907 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1908 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1909 const_iv (GL_TEXTURE_2D),
1532 const_iv (GL_TEXTURE_MAG_FILTER), 1911 const_iv (GL_TEXTURE_MAG_FILTER),
1533 const_iv (GL_TEXTURE_MIN_FILTER), 1912 const_iv (GL_TEXTURE_MIN_FILTER),
1534 const_iv (GL_TEXTURE_ENV_MODE), 1913 const_iv (GL_TEXTURE_ENV_MODE),
1535 const_iv (GL_TEXTURE_WRAP_S), 1914 const_iv (GL_TEXTURE_WRAP_S),
1536 const_iv (GL_TEXTURE_WRAP_T), 1915 const_iv (GL_TEXTURE_WRAP_T),
1916 const_iv (GL_REPEAT),
1537 const_iv (GL_CLAMP), 1917 const_iv (GL_CLAMP),
1538 const_iv (GL_REPEAT), 1918 const_iv (GL_CLAMP_TO_EDGE),
1539 const_iv (GL_NEAREST), 1919 const_iv (GL_NEAREST),
1540 const_iv (GL_LINEAR), 1920 const_iv (GL_LINEAR),
1541 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1921 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1922 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1923 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1924 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1925 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1926 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1927 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1928 const_iv (GL_REPLACE),
1929 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1930 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1931 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1932 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1933 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1934 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1935 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1936 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1937 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1938 const_iv (GL_LINES),
1939 const_iv (GL_LINE_STRIP),
1940 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1941 const_iv (GL_QUADS),
1559 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),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1946 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 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),
1562# undef const_iv 1952# undef const_iv
1563 }; 1953 };
1564 1954
1565 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; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1956 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567} 1957}
1568 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
1569int glGetError () 1980int glGetError ()
1981
1982void glFinish ()
1570 1983
1571void glClear (int mask) 1984void glClear (int mask)
1572 1985
1573void glClearColor (float r, float g, float b, float a = 1.0) 1986void glClearColor (float r, float g, float b, float a = 1.0)
1574 PROTOTYPE: @ 1987 PROTOTYPE: @
1581 1994
1582void glHint (int target, int mode) 1995void glHint (int target, int mode)
1583 1996
1584void glBlendFunc (int sfactor, int dfactor) 1997void glBlendFunc (int sfactor, int dfactor)
1585 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
1586void glLogicOp (int opcode) 2005void glLogicOp (int opcode)
1587 2006
1588void glColorMask (int red, int green, int blue, int alpha) 2007void glColorMask (int red, int green, int blue, int alpha)
1589 2008
1590void glMatrixMode (int mode) 2009void glMatrixMode (int mode)
1593 2012
1594void glPopMatrix () 2013void glPopMatrix ()
1595 2014
1596void glLoadIdentity () 2015void glLoadIdentity ()
1597 2016
2017void glDrawBuffer (int buffer)
2018
2019void glReadBuffer (int buffer)
2020
1598# 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
1599void 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_)
1600 2026
1601void glViewport (int x, int y, int width, int height) 2027void glViewport (int x, int y, int width, int height)
1602 2028
1603void glScissor (int x, int y, int width, int height) 2029void glScissor (int x, int y, int width, int height)
1618 2044
1619void glEnd () 2045void glEnd ()
1620 2046
1621void glColor (float r, float g, float b, float a = 1.0) 2047void glColor (float r, float g, float b, float a = 1.0)
1622 PROTOTYPE: @ 2048 PROTOTYPE: @
2049 ALIAS:
2050 glColor_premultiply = 1
1623 CODE: 2051 CODE:
1624 glColor4ub (MIN ((int)(r * 255.f), 255), 2052 if (ix)
1625 MIN ((int)(g * 255.f), 255), 2053 {
1626 MIN ((int)(b * 255.f), 255), 2054 r *= a;
1627 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);
1628 2071
1629void glVertex (float x, float y, float z = 0.) 2072void glVertex (float x, float y, float z = 0.)
1630 CODE: 2073 CODE:
1631 glVertex3f (x, y, z); 2074 glVertex3f (x, y, z);
1632 2075
1644 2087
1645void glBindTexture (int target, int name) 2088void glBindTexture (int target, int name)
1646 2089
1647void glConvolutionParameter (int target, int pname, float params) 2090void glConvolutionParameter (int target, int pname, float params)
1648 CODE: 2091 CODE:
1649 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2092 if (gl.ConvolutionParameterf)
2093 gl.ConvolutionParameterf (target, pname, params);
1650 2094
1651void 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)
1652 CODE: 2096 CODE:
1653 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2097 if (gl.ConvolutionFilter2D)
1654 (target, internalformat, width, height, format, type, data)); 2098 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655 2099
1656void 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)
1657 CODE: 2101 CODE:
1658 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2102 if (gl.SeparableFilter2D)
1659 (target, internalformat, width, height, format, type, row, column)); 2103 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660 2104
1661void 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)
1662 2106
1663void 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)
1664 2108
1665void glRasterPos (int x, int y) 2109void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666 CODE:
1667 glRasterPos2i (x, y);
1668 2110
1669void 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)
1670 2112
1671int glGenTexture () 2113int glGenTexture ()
1672 CODE: 2114 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines