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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.162 by root, Fri Oct 13 19:23:08 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines