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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines