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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines