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.159 by root, Sun Oct 8 21:22:29 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 char buffer[2048];
662 DWORD buflen;
565 663
566char * 664 EXTEND (SP, 3);
567gl_extensions () 665
568 CODE: 666 buflen = sizeof (buffer);
569 RETVAL = (char *)glGetString (GL_EXTENSIONS); 667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
570 OUTPUT: 668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
571 RETVAL 669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
671
672 buflen = sizeof (buffer);
673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
674 {
675 PUSHs (newSVpv (buffer, 0));
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
679 PUSHs (newSVpv (buffer, 0));
680 }
681 }
682#endif
683}
572 684
573void 685void
574add_font (char *file) 686add_font (char *file)
575 CODE: 687 CODE:
576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577#ifdef _WIN32
578 // cairo... sigh... requires win2000
579 AddFontResourceEx (file, FR_PRIVATE, 0);
580#endif
581 689
582void 690void
583load_image_inline (SV *image_) 691load_image_inline (SV *image_)
584 ALIAS: 692 ALIAS:
585 load_image_file = 1 693 load_image_file = 1
627 735
628 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629 737
630 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
631 739
740 SDL_LockSurface (surface2);
632 EXTEND (SP, 5); 741 EXTEND (SP, 6);
633 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
634 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
635 SDL_LockSurface (surface2);
636 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 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))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
641 749
642 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
643 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
644} 752}
645 753
669} 777}
670 778
671void 779void
672error (char *message) 780error (char *message)
673 CODE: 781 CODE:
782 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 783#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 784 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 785#endif
679 786
680void 787void
681fatal (char *message) 788fatal (char *message)
682 CODE: 789 CODE:
790 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 791#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 793#endif
688 exit (1); 794 _exit (1);
689 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
690MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
691 802
692CFClient::Font 803CFPlus::Font
693new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
694 CODE: 805 CODE:
695{ 806{
696 int count; 807 int count;
697 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
700} 811}
701 OUTPUT: 812 OUTPUT:
702 RETVAL 813 RETVAL
703 814
704void 815void
705DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
706 CODE: 817 CODE:
707 pango_font_description_free (self); 818 pango_font_description_free (self);
708 819
709void 820void
710make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
711 CODE: 822 CODE:
712 default_font = self; 823 default_font = self;
713 824
714MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
715 826
716CFClient::Layout 827void
717new (SV *class, int rgba = 0) 828reset_glyph_cache ()
829 CODE:
830 tc_clear ();
831
832CFPlus::Layout
833new (SV *class)
718 CODE: 834 CODE:
719 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
720 836
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
722 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 838 RETVAL->r = 1.;
724 RETVAL->g = 1.; 839 RETVAL->g = 1.;
725 RETVAL->b = 1.; 840 RETVAL->b = 1.;
726 RETVAL->a = 1.; 841 RETVAL->a = 1.;
727 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
731 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
732 OUTPUT: 847 OUTPUT:
733 RETVAL 848 RETVAL
734 849
735void 850void
736DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
737 CODE: 852 CODE:
738 g_object_unref (self->pl); 853 g_object_unref (self->pl);
739 Safefree (self); 854 Safefree (self);
740 855
741int
742is_rgba (CFClient::Layout self)
743 CODE:
744 RETVAL = self->rgba;
745 OUTPUT:
746 RETVAL
747
748void 856void
749set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
750 CODE: 858 CODE:
751{ 859{
752 STRLEN textlen; 860 STRLEN textlen;
753 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
754 862
755 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
756} 864}
757 865
758void 866void
759set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
760 CODE: 868 CODE:
761{ 869{
762 STRLEN textlen; 870 STRLEN textlen;
763 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
764 872
765 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
766} 874}
767 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
768SV * 961SV *
769get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
770 CODE: 963 CODE:
771 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772 SvUTF8_on (RETVAL); 965 sv_utf8_decode (RETVAL);
773 OUTPUT: 966 OUTPUT:
774 RETVAL 967 RETVAL
775 968
776void 969void
777set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
778 CODE: 971 CODE:
779 self->r = r; 972 self->r = r;
780 self->g = g; 973 self->g = g;
781 self->b = b; 974 self->b = b;
782 self->a = a; 975 self->a = a;
783 976
784void 977void
785set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
786 CODE: 979 CODE:
787 if (self->font != font) 980 if (self->font != font)
788 { 981 {
789 self->font = font; 982 self->font = font;
790 layout_update_font (self); 983 layout_update_font (self);
791 } 984 }
792 985
793void 986void
794set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
795 CODE: 988 CODE:
796 if (self->base_height != base_height) 989 if (self->base_height != base_height)
797 { 990 {
798 self->base_height = base_height; 991 self->base_height = base_height;
799 layout_update_font (self); 992 layout_update_font (self);
800 } 993 }
801 994
802void 995void
803set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
804 CODE: 997 CODE:
805 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806 999
807void 1000void
1001set_indent (CFPlus::Layout self, int indent)
1002 CODE:
1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1004
1005void
1006set_spacing (CFPlus::Layout self, int spacing)
1007 CODE:
1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1009
1010void
1011set_ellipsise (CFPlus::Layout self, int ellipsise)
1012 CODE:
1013 pango_layout_set_ellipsize (self->pl,
1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1017 : PANGO_ELLIPSIZE_NONE
1018 );
1019
1020void
1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
1022 CODE:
1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1024
1025void
808size (CFClient::Layout self) 1026size (CFPlus::Layout self)
809 PPCODE: 1027 PPCODE:
810{ 1028{
811 int w, h; 1029 int w, h;
812 1030
813 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
816 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
817 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
818} 1036}
819 1037
820int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
821xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
822 CODE: 1052 CODE:
823{ 1053{
824 int index, trailing; 1054 int index, trailing;
825 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
826 RETVAL = index; 1056 RETVAL = index;
827} 1057}
828 OUTPUT: 1058 OUTPUT:
829 RETVAL 1059 RETVAL
830 1060
831void 1061void
832cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
833 PPCODE: 1063 PPCODE:
834{ 1064{
835 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
836 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
837 1067
840 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
841 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
842} 1072}
843 1073
844void 1074void
845render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
846 PPCODE: 1076 PPCODE:
847{ 1077 pango_opengl_render_layout_subpixel (
848 SV *retval; 1078 self->pl,
849 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
850 1083
851 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
852 1085
853 if (self->rgba) 1086void
1087pad2pot (SV *data_, SV *w_, SV *h_)
1088 CODE:
1089{
1090 int ow = SvIV (w_);
1091 int oh = SvIV (h_);
1092
1093 if (ow && oh)
854 { 1094 {
855 cairo_surface_t *surface; 1095 int nw = minpot (ow);
856 cairo_t *cairo; 1096 int nh = minpot (oh);
857 1097
858 retval = newSV (w * h * 4); 1098 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 { 1099 {
876 uint32_t *p = (uint32_t *)SvPVX (retval); 1100 if (SvOK (data_))
877 uint32_t *e = p + w * h;
878
879 while (p < e)
880 { 1101 {
881 uint32_t rgba = *p; 1102 STRLEN datalen;
882 rgba = (rgba >> 24) | (rgba << 8); 1103 char *data = SvPVbyte (data_, datalen);
883 rgba = SDL_SwapBE32 (rgba); 1104 int bpp = datalen / (ow * oh);
884 *p++ = rgba; 1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1106
1107 SvPOK_only (result_);
1108 SvCUR_set (result_, nw * nh * bpp);
1109
1110 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--)
1112 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1113
1114 sv_setsv (data_, result_);
885 } 1115 }
1116
1117 sv_setiv (w_, nw);
1118 sv_setiv (h_, nh);
886 } 1119 }
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 } 1120 }
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} 1121}
922 1122
923MODULE = CFClient PACKAGE = CFClient::Texture
924
925void 1123void
926draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
927 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
928 ALIAS: 1126 ALIAS:
929 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
930 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
931 CODE: 1129 CODE:
932{ 1130{
933 HV *hv = (HV *)SvRV (self); 1131 HV *hv = (HV *)SvRV (self);
934 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1132 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
935 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1133 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
936 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1134 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
937 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
938 1135
939 if (items < 5) 1136 if (items < 5)
940 { 1137 {
941 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1138 w = SvNV (*hv_fetch (hv, "w", 1, 1));
942 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1139 h = SvNV (*hv_fetch (hv, "h", 1, 1));
943 } 1140 }
944 1141
945 if (ix) 1142 if (ix)
946 { 1143 {
947 glEnable (GL_BLEND); 1144 glEnable (GL_BLEND);
1145
1146 if (ix == 2)
948 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1147 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1148 else
1149 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1150 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1151
1152 glEnable (GL_ALPHA_TEST);
1153 glAlphaFunc (GL_GREATER, 0.01f);
949 } 1154 }
950 1155
951 glBindTexture (GL_TEXTURE_2D, name); 1156 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 1157
959 glBegin (GL_QUADS); 1158 glBegin (GL_QUADS);
960 glTexCoord2f (0, 0); glVertex2f (x , y ); 1159 glTexCoord2f (0, 0); glVertex2f (x , y );
961 glTexCoord2f (0, t); glVertex2f (x , y + h); 1160 glTexCoord2f (0, t); glVertex2f (x , y + h);
962 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1161 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1162 glTexCoord2f (s, 0); glVertex2f (x + w, y );
964 glEnd (); 1163 glEnd ();
965 1164
966 if (ix) 1165 if (ix)
1166 {
1167 glDisable (GL_ALPHA_TEST);
967 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1169 }
968} 1170}
969 1171
970MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
971 1173
972CFClient::Map 1174CFPlus::Map
973new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
974 CODE: 1176 CODE:
975 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
976 RETVAL->x = 0; 1178 RETVAL->x = 0;
977 RETVAL->y = 0; 1179 RETVAL->y = 0;
987 RETVAL->row = 0; 1189 RETVAL->row = 0;
988 OUTPUT: 1190 OUTPUT:
989 RETVAL 1191 RETVAL
990 1192
991void 1193void
992DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
993 CODE: 1195 CODE:
994{ 1196{
995 map_clear (self); 1197 map_clear (self);
996 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
997 Safefree (self); 1200 Safefree (self);
998} 1201}
999 1202
1000void 1203void
1001clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1002 CODE: 1205 CODE:
1003 map_clear (self); 1206 map_clear (self);
1004 1207
1005void 1208void
1006set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1007 CODE: 1210 CODE:
1008{ 1211{
1009 while (self->faces <= face) 1212 while (self->faces <= face)
1010 { 1213 {
1011 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1014 1217
1015 self->face [face] = texid; 1218 self->face [face] = texid;
1016} 1219}
1017 1220
1018void 1221void
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) 1222set_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: 1223 CODE:
1021{ 1224{
1022 while (self->texs <= texid) 1225 while (self->texs <= texid)
1023 { 1226 {
1024 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1036 tex->r = r; 1239 tex->r = r;
1037 tex->g = g; 1240 tex->g = g;
1038 tex->b = b; 1241 tex->b = b;
1039 tex->a = a; 1242 tex->a = a;
1040 } 1243 }
1244
1245 // somewhat hackish, but for textures that require it, it really
1246 // improves the look, and most others don't suffer.
1247 glBindTexture (GL_TEXTURE_2D, name);
1248 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1249 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1250 // use uglier nearest interpolation because linear suffers
1251 // from transparent color bleeding and ugly wrapping effects.
1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1041} 1253}
1042 1254
1043int 1255int
1044ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1045 ALIAS: 1257 ALIAS:
1046 oy = 1 1258 oy = 1
1259 x = 2
1260 y = 3
1261 w = 4
1262 h = 5
1047 CODE: 1263 CODE:
1048 switch (ix) 1264 switch (ix)
1049 { 1265 {
1050 case 0: RETVAL = self->ox; break; 1266 case 0: RETVAL = self->ox; break;
1051 case 1: RETVAL = self->oy; break; 1267 case 1: RETVAL = self->oy; break;
1268 case 2: RETVAL = self->x; break;
1269 case 3: RETVAL = self->y; break;
1270 case 4: RETVAL = self->w; break;
1271 case 5: RETVAL = self->h; break;
1052 } 1272 }
1053 OUTPUT: 1273 OUTPUT:
1054 RETVAL 1274 RETVAL
1055 1275
1056void 1276void
1057scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1058 CODE: 1278 CODE:
1059{ 1279{
1060 if (dx > 0) 1280 if (dx > 0)
1061 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1062 else if (dx < 0) 1282 else if (dx < 0)
1063 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1064 1284
1065 if (dy > 0) 1285 if (dy > 0)
1066 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1067 else if (dy < 0) 1287 else if (dy < 0)
1068 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1069 1289
1070 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1071 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1072 1292
1073 while (self->y < 0) 1293 while (self->y < 0)
1078 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1079 } 1299 }
1080} 1300}
1081 1301
1082void 1302void
1083map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1084 CODE: 1304 CODE:
1085{ 1305{
1086 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1087 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1088 mapcell *cell; 1308 mapcell *cell;
1089 int x, y, flags; 1309 int x, y, flags;
1090 1310
1091 while (data < data_end) 1311 while (data < data_end - 1)
1092 { 1312 {
1093 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1094 1314
1095 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1096 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1097 1317
1098 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1099 1319
1100 if (flags & 15) 1320 if (flags & 15)
1101 { 1321 {
1102 if (cell->darkness < 0) 1322 if (!cell->darkness)
1103 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1104 cell->darkness = 0; 1325 cell->darkness = 256;
1105 cell->face [0] = 0;
1106 cell->face [1] = 0;
1107 cell->face [2] = 0;
1108 } 1326 }
1109 1327
1110 cell->darkness = flags & 8 ? *data++ : 255;
1111
1112 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
1113 1369
1114 if (flags & 4) 1370 if (flags & 4)
1115 { 1371 {
1116 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1117 } 1373 }
1125 { 1381 {
1126 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1127 } 1383 }
1128 } 1384 }
1129 else 1385 else
1130 cell->darkness = -1; 1386 cell->darkness = 0;
1131 } 1387 }
1132} 1388}
1133 1389
1134SV * 1390SV *
1135mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1136 CODE: 1392 CODE:
1137{ 1393{
1138 int x1, x; 1394 int x1, x;
1139 int y1, y; 1395 int y1, y;
1140 int z; 1396 int z;
1190} 1446}
1191 OUTPUT: 1447 OUTPUT:
1192 RETVAL 1448 RETVAL
1193 1449
1194void 1450void
1195draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1196 PPCODE: 1452 CODE:
1197{ 1453{
1198 int vx, vy; 1454 int vx, vy;
1199 int x, y, z; 1455 int x, y, z;
1200 int last_name; 1456 int last_name;
1201 mapface face; 1457 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 1458
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; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1211 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1212 1461
1213 /* 1462 /*
1214 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1215 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1216 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : 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)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1221 */ 1470 */
1222 1471
1223 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1224 1473
1474 glEnable (GL_BLEND);
1225 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1226 glEnable (GL_BLEND);
1227 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1228 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1229 1478
1230 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1231 1480
1240 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1241 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1242 { 1491 {
1243 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1244 1493
1245 darkness[y * sw4 + x] = cell->darkness < 0
1246 ? 255 - FOW_DARKNESS
1247 : 255 - cell->darkness;
1248
1249 face = cell->face [z]; 1494 face = cell->face [z];
1250 1495
1251 if (face) 1496 if (face && face < self->texs)
1252 { 1497 {
1253 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1254
1255 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1256 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1257 1501
1258 if (last_name != tex.name) 1502 if (last_name != tex.name)
1259 { 1503 {
1260 glEnd (); 1504 glEnd ();
1261 last_name = tex.name;
1262 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1263 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1264 } 1507 }
1265 1508
1266 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1267 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1268 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1269 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1270 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1271 } 1533 }
1272 } 1534 }
1273 1535
1274 glEnd (); 1536 glEnd ();
1275 1537
1276 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1277 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1278 1665
1279 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1280 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1281 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1282 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1283} 1670}
1284 1671
1285SV * 1672SV *
1286get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1287 CODE: 1674 CODE:
1288{ 1675{
1289 int x, y, x1, y1; 1676 int x, y, x1, y1;
1290 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1291 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1353} 1740}
1354 OUTPUT: 1741 OUTPUT:
1355 RETVAL 1742 RETVAL
1356 1743
1357void 1744void
1358set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1359 PPCODE: 1746 PPCODE:
1360{ 1747{
1361 int x, y, z; 1748 int x, y, z;
1362 int w, h; 1749 int w, h;
1363 int x1, y1; 1750 int x1, y1;
1395 1782
1396 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1397 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1398 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1399 1786
1400 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1401 { 1788 {
1402 cell->darkness = -1; 1789 cell->darkness = 0;
1403 1790
1404 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1405 { 1792 {
1406 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1407 1794
1412 } 1799 }
1413 } 1800 }
1414 } 1801 }
1415} 1802}
1416 1803
1417MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1418 1805
1419CFClient::MixChunk 1806CFPlus::MixChunk
1420new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1421 CODE: 1808 CODE:
1422 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1423 OUTPUT: 1810 OUTPUT:
1424 RETVAL 1811 RETVAL
1425 1812
1426void 1813void
1427DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1428 CODE: 1815 CODE:
1429 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1430 1817
1431int 1818int
1432volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1433 CODE: 1820 CODE:
1434 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1435 OUTPUT: 1822 OUTPUT:
1436 RETVAL 1823 RETVAL
1437 1824
1438int 1825int
1439play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1440 CODE: 1827 CODE:
1441 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1442 OUTPUT: 1829 OUTPUT:
1443 RETVAL 1830 RETVAL
1444 1831
1445MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1446 1833
1447int 1834int
1448volume (int volume = -1) 1835volume (int volume = -1)
1449 CODE: 1836 CODE:
1450 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1451 OUTPUT: 1838 OUTPUT:
1452 RETVAL 1839 RETVAL
1453 1840
1454CFClient::MixMusic 1841CFPlus::MixMusic
1455new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1456 CODE: 1843 CODE:
1457 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1458 OUTPUT: 1845 OUTPUT:
1459 RETVAL 1846 RETVAL
1460 1847
1461void 1848void
1462DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1463 CODE: 1850 CODE:
1464 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1465 1852
1466int 1853int
1467play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1468 CODE: 1855 CODE:
1469 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1470 OUTPUT: 1857 OUTPUT:
1471 RETVAL 1858 RETVAL
1472 1859
1473MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1474 1861
1475BOOT: 1862BOOT:
1476{ 1863{
1477 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1478 static const struct { 1865 static const struct {
1479 const char *name; 1866 const char *name;
1480 IV iv; 1867 IV iv;
1481 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1482# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1483 const_iv (GL_COLOR_MATERIAL), 1870 const_iv (GL_COLOR_MATERIAL),
1484 const_iv (GL_SMOOTH), 1871 const_iv (GL_SMOOTH),
1485 const_iv (GL_FLAT), 1872 const_iv (GL_FLAT),
1486 const_iv (GL_DITHER), 1873 const_iv (GL_DITHER),
1487 const_iv (GL_BLEND), 1874 const_iv (GL_BLEND),
1875 const_iv (GL_CULL_FACE),
1488 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1877 const_iv (GL_DEPTH_TEST),
1878 const_iv (GL_ALPHA_TEST),
1879 const_iv (GL_NORMALIZE),
1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1489 const_iv (GL_AND), 1883 const_iv (GL_AND),
1490 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1491 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1492 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1493 const_iv (GL_SRC_ALPHA_SATURATE), 1887 const_iv (GL_DST_ALPHA),
1494 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1890 const_iv (GL_SRC_ALPHA_SATURATE),
1496 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1497 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1498 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1897 const_iv (GL_UNSIGNED_SHORT),
1898 const_iv (GL_UNSIGNED_INT),
1499 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1900 const_iv (GL_INTENSITY),
1500 const_iv (GL_LUMINANCE), 1901 const_iv (GL_LUMINANCE),
1902 const_iv (GL_LUMINANCE_ALPHA),
1501 const_iv (GL_FLOAT), 1903 const_iv (GL_FLOAT),
1502 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1904 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503 const_iv (GL_COMPILE), 1905 const_iv (GL_COMPILE),
1504 const_iv (GL_TEXTURE_1D), 1906 const_iv (GL_TEXTURE_1D),
1505 const_iv (GL_TEXTURE_2D), 1907 const_iv (GL_TEXTURE_2D),
1507 const_iv (GL_TEXTURE_MAG_FILTER), 1909 const_iv (GL_TEXTURE_MAG_FILTER),
1508 const_iv (GL_TEXTURE_MIN_FILTER), 1910 const_iv (GL_TEXTURE_MIN_FILTER),
1509 const_iv (GL_TEXTURE_ENV_MODE), 1911 const_iv (GL_TEXTURE_ENV_MODE),
1510 const_iv (GL_TEXTURE_WRAP_S), 1912 const_iv (GL_TEXTURE_WRAP_S),
1511 const_iv (GL_TEXTURE_WRAP_T), 1913 const_iv (GL_TEXTURE_WRAP_T),
1914 const_iv (GL_REPEAT),
1512 const_iv (GL_CLAMP), 1915 const_iv (GL_CLAMP),
1513 const_iv (GL_REPEAT), 1916 const_iv (GL_CLAMP_TO_EDGE),
1514 const_iv (GL_NEAREST), 1917 const_iv (GL_NEAREST),
1515 const_iv (GL_LINEAR), 1918 const_iv (GL_LINEAR),
1516 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1919 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1920 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1921 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1922 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520 const_iv (GL_GENERATE_MIPMAP), 1923 const_iv (GL_GENERATE_MIPMAP),
1521 const_iv (GL_MODULATE), 1924 const_iv (GL_MODULATE),
1522 const_iv (GL_DECAL), 1925 const_iv (GL_DECAL),
1523 const_iv (GL_REPLACE), 1926 const_iv (GL_REPLACE),
1927 const_iv (GL_DEPTH_BUFFER_BIT),
1524 const_iv (GL_COLOR_BUFFER_BIT), 1928 const_iv (GL_COLOR_BUFFER_BIT),
1525 const_iv (GL_PROJECTION), 1929 const_iv (GL_PROJECTION),
1526 const_iv (GL_MODELVIEW), 1930 const_iv (GL_MODELVIEW),
1527 const_iv (GL_COLOR_LOGIC_OP), 1931 const_iv (GL_COLOR_LOGIC_OP),
1528 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1529 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1530 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1531 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1532 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1938 const_iv (GL_LINE_LOOP),
1533 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1534 const_iv (GL_LINE_LOOP), 1940 const_iv (GL_QUAD_STRIP),
1941 const_iv (GL_TRIANGLES),
1942 const_iv (GL_TRIANGLE_STRIP),
1943 const_iv (GL_TRIANGLE_FAN),
1535 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1944 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536 const_iv (GL_FASTEST), 1945 const_iv (GL_FASTEST),
1946 const_iv (GL_V2F),
1947 const_iv (GL_V3F),
1948 const_iv (GL_T2F_V3F),
1949 const_iv (GL_T2F_N3F_V3F),
1537# undef const_iv 1950# undef const_iv
1538 }; 1951 };
1539 1952
1540 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1953 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1541 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1954 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1542} 1955}
1543 1956
1957char *
1958gl_vendor ()
1959 CODE:
1960 RETVAL = (char *)glGetString (GL_VENDOR);
1961 OUTPUT:
1962 RETVAL
1963
1964char *
1965gl_version ()
1966 CODE:
1967 RETVAL = (char *)glGetString (GL_VERSION);
1968 OUTPUT:
1969 RETVAL
1970
1971char *
1972gl_extensions ()
1973 CODE:
1974 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1975 OUTPUT:
1976 RETVAL
1977
1544int glGetError () 1978int glGetError ()
1979
1980void glFinish ()
1545 1981
1546void glClear (int mask) 1982void glClear (int mask)
1547 1983
1548void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1549 PROTOTYPE: @ 1985 PROTOTYPE: @
1556 1992
1557void glHint (int target, int mode) 1993void glHint (int target, int mode)
1558 1994
1559void glBlendFunc (int sfactor, int dfactor) 1995void glBlendFunc (int sfactor, int dfactor)
1560 1996
1997void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1998 CODE:
1999 gl_BlendFuncSeparate (sa, da, saa, daa);
2000
2001void glDepthMask (int flag)
2002
1561void glLogicOp (int opcode) 2003void glLogicOp (int opcode)
1562 2004
1563void glColorMask (int red, int green, int blue, int alpha) 2005void glColorMask (int red, int green, int blue, int alpha)
1564 2006
1565void glMatrixMode (int mode) 2007void glMatrixMode (int mode)
1568 2010
1569void glPopMatrix () 2011void glPopMatrix ()
1570 2012
1571void glLoadIdentity () 2013void glLoadIdentity ()
1572 2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
2018
1573# near and far are due to microsofts buggy c compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2021
2022# near_ and far_ are due to microsofts buggy "c" compiler
1574void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2023void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575 2024
1576void glViewport (int x, int y, int width, int height) 2025void glViewport (int x, int y, int width, int height)
1577 2026
1578void glScissor (int x, int y, int width, int height) 2027void glScissor (int x, int y, int width, int height)
1593 2042
1594void glEnd () 2043void glEnd ()
1595 2044
1596void glColor (float r, float g, float b, float a = 1.0) 2045void glColor (float r, float g, float b, float a = 1.0)
1597 PROTOTYPE: @ 2046 PROTOTYPE: @
2047 ALIAS:
2048 glColor_premultiply = 1
1598 CODE: 2049 CODE:
1599 glColor4ub (MIN ((int)(r * 255.f), 255), 2050 if (ix)
1600 MIN ((int)(g * 255.f), 255), 2051 {
1601 MIN ((int)(b * 255.f), 255), 2052 r *= a;
1602 MIN ((int)(a * 255.f), 255)); 2053 g *= a;
2054 b *= a;
2055 }
2056 // microsoft visual "c" rounds instead of truncating...
2057 glColor4f (r, g, b, a);
2058
2059void glInterleavedArrays (int format, int stride, char *data)
2060
2061void glDrawElements (int mode, int count, int type, char *indices)
2062
2063# 1.2 void glDrawRangeElements (int mode, int start, int end
2064
2065void glRasterPos (float x, float y, float z = 0.)
2066 CODE:
2067 glRasterPos3f (0, 0, z);
2068 glBitmap (0, 0, 0, 0, x, y, 0);
1603 2069
1604void glVertex (float x, float y, float z = 0.) 2070void glVertex (float x, float y, float z = 0.)
1605 CODE: 2071 CODE:
1606 glVertex3f (x, y, z); 2072 glVertex3f (x, y, z);
1607 2073
1619 2085
1620void glBindTexture (int target, int name) 2086void glBindTexture (int target, int name)
1621 2087
1622void glConvolutionParameter (int target, int pname, float params) 2088void glConvolutionParameter (int target, int pname, float params)
1623 CODE: 2089 CODE:
1624 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2090 if (gl.ConvolutionParameterf)
2091 gl.ConvolutionParameterf (target, pname, params);
1625 2092
1626void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2093void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627 CODE: 2094 CODE:
1628 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2095 if (gl.ConvolutionFilter2D)
1629 (target, internalformat, width, height, format, type, data)); 2096 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1630 2097
1631void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2098void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1632 CODE: 2099 CODE:
1633 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2100 if (gl.SeparableFilter2D)
1634 (target, internalformat, width, height, format, type, row, column)); 2101 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1635 2102
1636void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2103void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637 2104
1638void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2105void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639 2106
1640void glRasterPos (int x, int y) 2107void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641 CODE:
1642 glRasterPos2i (x, y);
1643 2108
1644void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2109void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645 2110
1646int glGenTexture () 2111int glGenTexture ()
1647 CODE: 2112 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines