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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines