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.90 by root, Sun May 21 00:34:58 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
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, 1); 516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 517
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 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);
479SDL_SetVideoMode (int w, int h, int fullscreen) 553SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 554 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 555 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 557 );
558 if (RETVAL)
559 {
484 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 }
485 OUTPUT: 565 OUTPUT:
486 RETVAL 566 RETVAL
487 567
488void 568void
489SDL_GL_SwapBuffers () 569SDL_GL_SwapBuffers ()
570
571char *
572SDL_GetKeyName (int sym)
490 573
491void 574void
492SDL_PollEvent () 575SDL_PollEvent ()
493 PPCODE: 576 PPCODE:
494{ 577{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 598 break;
516 599
517 case SDL_MOUSEMOTION: 600 case SDL_MOUSEMOTION:
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 608 break;
524 609
525 case SDL_MOUSEBUTTONDOWN: 610 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 611 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
613
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 618 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 624 break;
538 } 625 }
539 626
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 628 }
542} 629}
543 630
544int 631int
545Mix_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)
558 CODE: 645 CODE:
559#ifndef _WIN32 646#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 648#endif
562 649
563char * 650void
564gl_version () 651win32_proxy_info ()
565 CODE: 652 PPCODE:
566 RETVAL = (char *)glGetString (GL_VERSION); 653{
567 OUTPUT: 654#ifdef _WIN32
568 RETVAL 655 char buffer[2048];
656 DWORD buflen;
569 657
570char * 658 EXTEND (SP, 3);
571gl_extensions () 659
572 CODE: 660 buflen = sizeof (buffer);
573 RETVAL = (char *)glGetString (GL_EXTENSIONS); 661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
574 OUTPUT: 662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
575 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}
576 678
577void 679void
578add_font (char *file) 680add_font (char *file)
579 CODE: 681 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581#ifdef _WIN32
582 // cairo... sigh... requires win2000
583 AddFontResourceEx (file, FR_PRIVATE, 0);
584#endif
585 683
586void 684void
587load_image_inline (SV *image_) 685load_image_inline (SV *image_)
588 ALIAS: 686 ALIAS:
589 load_image_file = 1 687 load_image_file = 1
631 729
632 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633 731
634 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
635 733
734 SDL_LockSurface (surface2);
636 EXTEND (SP, 5); 735 EXTEND (SP, 6);
637 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
638 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
639 SDL_LockSurface (surface2);
640 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641 SDL_UnlockSurface (surface2);
642 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)));
643 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
645 743
646 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
647 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
648} 746}
649 747
685 CODE: 783 CODE:
686 fprintf (stderr, "FATAL: %s\n", message); 784 fprintf (stderr, "FATAL: %s\n", message);
687#ifdef _WIN32 785#ifdef _WIN32
688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
689#endif 787#endif
690 exit (1); 788 _exit (1);
691 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
692MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
693 800
694CFClient::Font 801CFPlus::Font
695new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
696 CODE: 803 CODE:
697{ 804{
698 int count; 805 int count;
699 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
702} 809}
703 OUTPUT: 810 OUTPUT:
704 RETVAL 811 RETVAL
705 812
706void 813void
707DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
708 CODE: 815 CODE:
709 pango_font_description_free (self); 816 pango_font_description_free (self);
710 817
711void 818void
712make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
713 CODE: 820 CODE:
714 default_font = self; 821 default_font = self;
715 822
716MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
717 824
718CFClient::Layout 825void
719new (SV *class, int rgba = 0) 826reset_glyph_cache ()
720 CODE: 827 CODE:
721#if _WIN32 828 tc_clear ();
722 rgba = 0;//D 829
723#endif 830CFPlus::Layout
831new (SV *class)
832 CODE:
724 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
725 834
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
727 RETVAL->rgba = rgba;
728 RETVAL->r = 1.; 836 RETVAL->r = 1.;
729 RETVAL->g = 1.; 837 RETVAL->g = 1.;
730 RETVAL->b = 1.; 838 RETVAL->b = 1.;
731 RETVAL->a = 1.; 839 RETVAL->a = 1.;
732 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
736 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
737 OUTPUT: 845 OUTPUT:
738 RETVAL 846 RETVAL
739 847
740void 848void
741DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
742 CODE: 850 CODE:
743 g_object_unref (self->pl); 851 g_object_unref (self->pl);
744 Safefree (self); 852 Safefree (self);
745 853
746int
747is_rgba (CFClient::Layout self)
748 CODE:
749 RETVAL = self->rgba;
750 OUTPUT:
751 RETVAL
752
753void 854void
754set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
755 CODE: 856 CODE:
756{ 857{
757 STRLEN textlen; 858 STRLEN textlen;
758 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
759 860
760 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
761} 862}
762 863
763void 864void
764set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
765 CODE: 866 CODE:
766{ 867{
767 STRLEN textlen; 868 STRLEN textlen;
768 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
769 870
770 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
771} 872}
772 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
773SV * 959SV *
774get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
775 CODE: 961 CODE:
776 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777 SvUTF8_on (RETVAL); 963 sv_utf8_decode (RETVAL);
778 OUTPUT: 964 OUTPUT:
779 RETVAL 965 RETVAL
780 966
781void 967void
782set_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.)
783 CODE: 969 CODE:
784 self->r = r; 970 self->r = r;
785 self->g = g; 971 self->g = g;
786 self->b = b; 972 self->b = b;
787 self->a = a; 973 self->a = a;
788 974
789void 975void
790set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791 CODE: 977 CODE:
792 if (self->font != font) 978 if (self->font != font)
793 { 979 {
794 self->font = font; 980 self->font = font;
795 layout_update_font (self); 981 layout_update_font (self);
796 } 982 }
797 983
798void 984void
799set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
800 CODE: 986 CODE:
801 if (self->base_height != base_height) 987 if (self->base_height != base_height)
802 { 988 {
803 self->base_height = base_height; 989 self->base_height = base_height;
804 layout_update_font (self); 990 layout_update_font (self);
805 } 991 }
806 992
807void 993void
808set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
809 CODE: 995 CODE:
810 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);
811 997
812void 998void
813set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
814 CODE: 1000 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816 1002
817void 1003void
818set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
819 CODE: 1005 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821 1007
822void 1008void
823set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
824 CODE: 1010 CODE:
825 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
830 ); 1016 );
831 1017
832void 1018void
833set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
834 CODE: 1020 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836 1022
837void 1023void
838size (CFClient::Layout self) 1024size (CFPlus::Layout self)
839 PPCODE: 1025 PPCODE:
840{ 1026{
841 int w, h; 1027 int w, h;
842 1028
843 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
846 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
847 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
848} 1034}
849 1035
850int 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
851xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
852 CODE: 1050 CODE:
853{ 1051{
854 int index, trailing; 1052 int index, trailing;
855 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);
856 RETVAL = index; 1054 RETVAL = index + trailing;
857} 1055}
858 OUTPUT: 1056 OUTPUT:
859 RETVAL 1057 RETVAL
860 1058
861void 1059void
862cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
863 PPCODE: 1061 PPCODE:
864{ 1062{
865 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
866 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867 1065
870 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872} 1070}
873 1071
874void 1072void
875render (CFClient::Layout self) 1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
876 PPCODE: 1074 PPCODE:
877{ 1075{
878 SV *retval; 1076 int line, x;
879 int w, h;
880 1077
881 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 */
882 1080
883 if (self->rgba)
884 {
885 cairo_surface_t *surface;
886 cairo_t *cairo;
887
888 retval = newSV (w * h * 4);
889 SvPOK_only (retval);
890 SvCUR_set (retval, w * h * 4);
891
892 memset (SvPVX (retval), 0, w * h * 4);
893
894 surface = cairo_image_surface_create_for_data (
895 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
896 cairo = cairo_create (surface);
897 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899 pango_cairo_show_layout (cairo, self->pl);
900
901 cairo_destroy (cairo);
902 cairo_surface_destroy (surface);
903
904 // what a mess, and its premultiplied, too :(
905 {
906 uint32_t *p = (uint32_t *)SvPVX (retval);
907 uint32_t *e = p + w * h;
908
909 while (p < e)
910 {
911 uint32_t rgba = *p;
912 rgba = (rgba >> 24) | (rgba << 8);
913#if 0
914#ifdef _WIN32
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920
921 rgba = (rgba & 0xffffff00) | a;
922 }
923#endif
924#endif
925 rgba = SDL_SwapBE32 (rgba);
926 *p++ = rgba;
927 }
928 }
929
930 EXTEND (SP, 5); 1081 EXTEND (SP, 2);
931 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)
932 PUSHs (sv_2mortal (newSViv (h))); 1104 PUSHs (sv_2mortal (newSViv (index + trailing)));
933 PUSHs (sv_2mortal (retval));
934 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 }
937 else 1105 else
938 { 1106 {
939 FT_Bitmap bitmap;
940
941 retval = newSV (w * h);
942 SvPOK_only (retval);
943 SvCUR_set (retval, w * h);
944
945 bitmap.rows = h;
946 bitmap.width = w;
947 bitmap.pitch = w;
948 bitmap.buffer = (unsigned char*)SvPVX (retval);
949 bitmap.num_grays = 256;
950 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952 memset (bitmap.buffer, 0, w * h);
953
954 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956 EXTEND (SP, 5);
957 PUSHs (sv_2mortal (newSViv (w))); 1107 PUSHs (sv_2mortal (newSViv (index)));
958 PUSHs (sv_2mortal (newSViv (h))); 1108 PUSHs (sv_2mortal (newSViv (trailing)));
959 PUSHs (sv_2mortal (retval));
960 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 } 1109 }
963} 1110}
964 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
965MODULE = CFClient PACKAGE = CFClient::Texture 1122MODULE = CFPlus PACKAGE = CFPlus::Texture
966 1123
967void 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
968draw_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.)
969 PROTOTYPE: $$$;$$ 1163 PROTOTYPE: $$$;$$
970 ALIAS: 1164 ALIAS:
971 draw_quad_alpha = 1 1165 draw_quad_alpha = 1
972 draw_quad_alpha_premultiplied = 2 1166 draw_quad_alpha_premultiplied = 2
973 CODE: 1167 CODE:
974{ 1168{
975 HV *hv = (HV *)SvRV (self); 1169 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1170 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1171 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1172 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 1173
981 if (items < 5) 1174 if (items < 5)
982 { 1175 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1176 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1177 h = SvNV (*hv_fetch (hv, "h", 1, 1));
985 } 1178 }
986 1179
987 if (ix) 1180 if (ix)
988 { 1181 {
989 glEnable (GL_BLEND); 1182 glEnable (GL_BLEND);
1183
1184 if (ix == 2)
990 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
991 glEnable (GL_ALPHA_TEST); 1190 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 1191 glAlphaFunc (GL_GREATER, 0.01f);
993 } 1192 }
994 1193
995 glBindTexture (GL_TEXTURE_2D, name); 1194 glBindTexture (GL_TEXTURE_2D, name);
996
997 if (wrap_mode)
998 {
999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001 }
1002 1195
1003 glBegin (GL_QUADS); 1196 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 1197 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 1198 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1199 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1012 glDisable (GL_ALPHA_TEST); 1205 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1206 glDisable (GL_BLEND);
1014 } 1207 }
1015} 1208}
1016 1209
1017MODULE = CFClient PACKAGE = CFClient::Map 1210MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1211
1019CFClient::Map 1212CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1213new (SV *class)
1021 CODE: 1214 CODE:
1022 New (0, RETVAL, 1, struct map); 1215 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1216 RETVAL->x = 0;
1024 RETVAL->y = 0; 1217 RETVAL->y = 0;
1025 RETVAL->w = map_width; 1218 RETVAL->w = 0;
1026 RETVAL->h = map_height; 1219 RETVAL->h = 0;
1027 RETVAL->ox = 0; 1220 RETVAL->ox = 0;
1028 RETVAL->oy = 0; 1221 RETVAL->oy = 0;
1029 RETVAL->faces = 8192; 1222 RETVAL->faces = 8192;
1030 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1223 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1031 RETVAL->texs = 8192; 1224 RETVAL->texs = 8192;
1034 RETVAL->row = 0; 1227 RETVAL->row = 0;
1035 OUTPUT: 1228 OUTPUT:
1036 RETVAL 1229 RETVAL
1037 1230
1038void 1231void
1039DESTROY (CFClient::Map self) 1232DESTROY (CFPlus::Map self)
1040 CODE: 1233 CODE:
1041{ 1234{
1042 map_clear (self); 1235 map_clear (self);
1043 Safefree (self->face); 1236 Safefree (self->face);
1237 Safefree (self->tex);
1044 Safefree (self); 1238 Safefree (self);
1045} 1239}
1046 1240
1047void 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
1048clear (CFClient::Map self) 1248clear (CFPlus::Map self)
1049 CODE: 1249 CODE:
1050 map_clear (self); 1250 map_clear (self);
1051 1251
1052void 1252void
1053set_face (CFClient::Map self, int face, int texid) 1253set_face (CFPlus::Map self, int face, int texid)
1054 CODE: 1254 CODE:
1055{ 1255{
1056 while (self->faces <= face) 1256 while (self->faces <= face)
1057 { 1257 {
1058 Append (mapface, self->face, self->faces, self->faces); 1258 Append (mapface, self->face, self->faces, self->faces);
1061 1261
1062 self->face [face] = texid; 1262 self->face [face] = texid;
1063} 1263}
1064 1264
1065void 1265void
1066set_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)
1067 CODE: 1267 CODE:
1068{ 1268{
1069 while (self->texs <= texid) 1269 while (self->texs <= texid)
1070 { 1270 {
1071 Append (maptex, self->tex, self->texs, self->texs); 1271 Append (maptex, self->tex, self->texs, self->texs);
1083 tex->r = r; 1283 tex->r = r;
1084 tex->g = g; 1284 tex->g = g;
1085 tex->b = b; 1285 tex->b = b;
1086 tex->a = a; 1286 tex->a = a;
1087 } 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);
1088} 1297}
1089 1298
1090int 1299int
1091ox (CFClient::Map self) 1300ox (CFPlus::Map self)
1092 ALIAS: 1301 ALIAS:
1093 oy = 1 1302 oy = 1
1303 x = 2
1304 y = 3
1305 w = 4
1306 h = 5
1094 CODE: 1307 CODE:
1095 switch (ix) 1308 switch (ix)
1096 { 1309 {
1097 case 0: RETVAL = self->ox; break; 1310 case 0: RETVAL = self->ox; break;
1098 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;
1099 } 1316 }
1100 OUTPUT: 1317 OUTPUT:
1101 RETVAL 1318 RETVAL
1102 1319
1103void 1320void
1104scroll (CFClient::Map self, int dx, int dy) 1321scroll (CFPlus::Map self, int dx, int dy)
1105 CODE: 1322 CODE:
1106{ 1323{
1107 if (dx > 0) 1324 if (dx > 0)
1108 map_blank (self, self->x, self->y, dx - 1, self->h); 1325 map_blank (self, self->x, self->y, dx, self->h);
1109 else if (dx < 0) 1326 else if (dx < 0)
1110 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);
1111 1328
1112 if (dy > 0) 1329 if (dy > 0)
1113 map_blank (self, self->x, self->y, self->w, dy - 1); 1330 map_blank (self, self->x, self->y, self->w, dy);
1114 else if (dy < 0) 1331 else if (dy < 0)
1115 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);
1116 1333
1117 self->ox += dx; self->x += dx; 1334 self->ox += dx; self->x += dx;
1118 self->oy += dy; self->y += dy; 1335 self->oy += dy; self->y += dy;
1119 1336
1120 while (self->y < 0) 1337 while (self->y < 0)
1125 self->y += MAP_EXTEND_Y; 1342 self->y += MAP_EXTEND_Y;
1126 } 1343 }
1127} 1344}
1128 1345
1129void 1346void
1130map1a_update (CFClient::Map self, SV *data_) 1347map1a_update (CFPlus::Map self, SV *data_, int extmap)
1131 CODE: 1348 CODE:
1132{ 1349{
1133 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1350 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1134 uint8_t *data_end = (uint8_t *)SvEND (data_); 1351 uint8_t *data_end = (uint8_t *)SvEND (data_);
1135 mapcell *cell; 1352 mapcell *cell;
1136 int x, y, flags; 1353 int x, y, flags;
1137 1354
1138 while (data < data_end) 1355 while (data < data_end - 1)
1139 { 1356 {
1140 flags = (data [0] << 8) + data [1]; data += 2; 1357 flags = (data [0] << 8) + data [1]; data += 2;
1141 1358
1142 x = ((flags >> 10) & 63) + self->x; 1359 x = self->x + ((flags >> 10) & 63);
1143 y = ((flags >> 4) & 63) + self->y; 1360 y = self->y + ((flags >> 4) & 63);
1144 1361
1145 cell = map_get_cell (self, x, y); 1362 cell = map_get_cell (self, x, y);
1146 1363
1147 if (flags & 15) 1364 if (flags & 15)
1148 { 1365 {
1149 if (cell->darkness < 0) 1366 if (!cell->darkness)
1150 { 1367 {
1368 memset (cell, 0, sizeof (*cell));
1151 cell->darkness = 0; 1369 cell->darkness = 256;
1152 cell->face [0] = 0;
1153 cell->face [1] = 0;
1154 cell->face [2] = 0;
1155 } 1370 }
1156 1371
1157 cell->darkness = flags & 8 ? *data++ : 255;
1158
1159 //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 }
1160 1413
1161 if (flags & 4) 1414 if (flags & 4)
1162 { 1415 {
1163 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;
1164 } 1417 }
1172 { 1425 {
1173 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;
1174 } 1427 }
1175 } 1428 }
1176 else 1429 else
1177 cell->darkness = -1; 1430 cell->darkness = 0;
1178 } 1431 }
1179} 1432}
1180 1433
1181SV * 1434SV *
1182mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1435mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183 CODE: 1436 CODE:
1184{ 1437{
1185 int x1, x; 1438 int x1, x;
1186 int y1, y; 1439 int y1, y;
1187 int z; 1440 int z;
1237} 1490}
1238 OUTPUT: 1491 OUTPUT:
1239 RETVAL 1492 RETVAL
1240 1493
1241void 1494void
1242draw (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)
1243 PPCODE: 1496 CODE:
1244{ 1497{
1245 int vx, vy;
1246 int x, y, z; 1498 int x, y, z;
1247 int last_name; 1499 int last_name;
1248 mapface face; 1500 mapface face;
1249 int sw4 = (sw + 3) & ~3;
1250 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1251 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1252
1253 memset (darkness, 255, sw4 * sh);
1254 SvPOK_only (darkness_sv);
1255 SvCUR_set (darkness_sv, sw4 * sh);
1256
1257 vx = self->x + (self->w - sw) / 2 - shift_x;
1258 vy = self->y + (self->h - sh) / 2 - shift_y;
1259
1260 /*
1261 int vx = self->vx = self->w >= sw
1262 ? self->x + (self->w - sw) / 2
1263 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1264
1265 int vy = self->vy = self->h >= sh
1266 ? self->y + (self->h - sh) / 2
1267 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268 */
1269 1501
1270 glColor4ub (255, 255, 255, 255); 1502 glColor4ub (255, 255, 255, 255);
1271 1503
1504 glEnable (GL_BLEND);
1272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273 glEnable (GL_BLEND);
1274 glEnable (GL_TEXTURE_2D); 1506 glEnable (GL_TEXTURE_2D);
1275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276 1508
1277 glBegin (GL_QUADS); 1509 glBegin (GL_QUADS);
1278 1510
1279 last_name = 0; 1511 last_name = 0;
1280 1512
1513 mx += self->x;
1514 my += self->y;
1515
1281 for (z = 0; z < 3; z++) 1516 for (z = 0; z < 3; z++)
1282 for (y = 0; y < sh; y++) 1517 for (y = 0; y < sh; y++)
1283 if (0 <= y + vy && y + vy < self->rows) 1518 if (0 <= y + my && y + my < self->rows)
1284 { 1519 {
1285 maprow *row = self->row + (y + vy); 1520 maprow *row = self->row + (y + my);
1286 1521
1287 for (x = 0; x < sw; x++) 1522 for (x = 0; x < sw; x++)
1288 if (row->c0 <= x + vx && x + vx < row->c1) 1523 if (row->c0 <= x + mx && x + mx < row->c1)
1289 { 1524 {
1290 mapcell *cell = row->col + (x + vx - row->c0); 1525 mapcell *cell = row->col + (x + mx - row->c0);
1291
1292 darkness[y * sw4 + x] = cell->darkness < 0
1293 ? 255 - FOW_DARKNESS
1294 : 255 - cell->darkness;
1295 1526
1296 face = cell->face [z]; 1527 face = cell->face [z];
1297 1528
1298 if (face) 1529 if (face && face < self->texs)
1299 { 1530 {
1300 maptex tex = self->tex [face]; 1531 maptex tex = self->tex [face];
1301
1302 int px = (x + 1) * 32 - tex.w; 1532 int px = (x + 1) * 32 - tex.w;
1303 int py = (y + 1) * 32 - tex.h; 1533 int py = (y + 1) * 32 - tex.h;
1304 1534
1305 if (last_name != tex.name) 1535 if (last_name != tex.name)
1306 { 1536 {
1307 glEnd (); 1537 glEnd ();
1308 last_name = tex.name;
1309 glBindTexture (GL_TEXTURE_2D, last_name); 1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1310 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1311 } 1540 }
1312 1541
1313 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1542 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1314 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1543 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1315 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);
1316 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1545 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1317 } 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 }
1318 } 1566 }
1319 } 1567 }
1320 1568
1321 glEnd (); 1569 glEnd ();
1322 1570
1323 glDisable (GL_TEXTURE_2D); 1571 glDisable (GL_TEXTURE_2D);
1324 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 }
1325 1697
1326 EXTEND (SP, 3); 1698 EXTEND (SP, 3);
1327 PUSHs (sv_2mortal (newSViv (sw4))); 1699 PUSHs (sv_2mortal (newSViv (sw4)));
1328 PUSHs (sv_2mortal (newSViv (sh))); 1700 PUSHs (sv_2mortal (newSViv (sh)));
1329 PUSHs (darkness_sv); 1701 PUSHs (darkness_sv);
1330} 1702}
1331 1703
1332SV * 1704SV *
1333get_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)
1334 CODE: 1706 CODE:
1335{ 1707{
1336 int x, y, x1, y1; 1708 int x, y, x1, y1;
1337 SV *data_sv = newSV (w * h * 7 + 5); 1709 SV *data_sv = newSV (w * h * 7 + 5);
1338 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1710 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1400} 1772}
1401 OUTPUT: 1773 OUTPUT:
1402 RETVAL 1774 RETVAL
1403 1775
1404void 1776void
1405set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1777set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406 PPCODE: 1778 PPCODE:
1407{ 1779{
1408 int x, y, z; 1780 int x, y, z;
1409 int w, h; 1781 int w, h;
1410 int x1, y1; 1782 int x1, y1;
1442 1814
1443 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1444 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1445 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1446 1818
1447 if (cell->darkness <= 0) 1819 if (cell->darkness == 0)
1448 { 1820 {
1449 cell->darkness = -1; 1821 cell->darkness = 0;
1450 1822
1451 for (z = 0; z <= 2; z++) 1823 for (z = 0; z <= 2; z++)
1452 { 1824 {
1453 cell->face[z] = face[z]; 1825 cell->face[z] = face[z];
1454 1826
1459 } 1831 }
1460 } 1832 }
1461 } 1833 }
1462} 1834}
1463 1835
1464MODULE = CFClient PACKAGE = CFClient::MixChunk 1836MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465 1837
1466CFClient::MixChunk 1838CFPlus::MixChunk
1467new_from_file (SV *class, char *path) 1839new_from_file (SV *class, char *path)
1468 CODE: 1840 CODE:
1469 RETVAL = Mix_LoadWAV (path); 1841 RETVAL = Mix_LoadWAV (path);
1470 OUTPUT: 1842 OUTPUT:
1471 RETVAL 1843 RETVAL
1472 1844
1473void 1845void
1474DESTROY (CFClient::MixChunk self) 1846DESTROY (CFPlus::MixChunk self)
1475 CODE: 1847 CODE:
1476 Mix_FreeChunk (self); 1848 Mix_FreeChunk (self);
1477 1849
1478int 1850int
1479volume (CFClient::MixChunk self, int volume = -1) 1851volume (CFPlus::MixChunk self, int volume = -1)
1480 CODE: 1852 CODE:
1481 RETVAL = Mix_VolumeChunk (self, volume); 1853 RETVAL = Mix_VolumeChunk (self, volume);
1482 OUTPUT: 1854 OUTPUT:
1483 RETVAL 1855 RETVAL
1484 1856
1485int 1857int
1486play (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)
1487 CODE: 1859 CODE:
1488 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1860 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489 OUTPUT: 1861 OUTPUT:
1490 RETVAL 1862 RETVAL
1491 1863
1492MODULE = CFClient PACKAGE = CFClient::MixMusic 1864MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493 1865
1494int 1866int
1495volume (int volume = -1) 1867volume (int volume = -1)
1496 CODE: 1868 CODE:
1497 RETVAL = Mix_VolumeMusic (volume); 1869 RETVAL = Mix_VolumeMusic (volume);
1498 OUTPUT: 1870 OUTPUT:
1499 RETVAL 1871 RETVAL
1500 1872
1501CFClient::MixMusic 1873CFPlus::MixMusic
1502new_from_file (SV *class, char *path) 1874new_from_file (SV *class, char *path)
1503 CODE: 1875 CODE:
1504 RETVAL = Mix_LoadMUS (path); 1876 RETVAL = Mix_LoadMUS (path);
1505 OUTPUT: 1877 OUTPUT:
1506 RETVAL 1878 RETVAL
1507 1879
1508void 1880void
1509DESTROY (CFClient::MixMusic self) 1881DESTROY (CFPlus::MixMusic self)
1510 CODE: 1882 CODE:
1511 Mix_FreeMusic (self); 1883 Mix_FreeMusic (self);
1512 1884
1513int 1885int
1514play (CFClient::MixMusic self, int loops = -1) 1886play (CFPlus::MixMusic self, int loops = -1)
1515 CODE: 1887 CODE:
1516 RETVAL = Mix_PlayMusic (self, loops); 1888 RETVAL = Mix_PlayMusic (self, loops);
1517 OUTPUT: 1889 OUTPUT:
1518 RETVAL 1890 RETVAL
1519 1891
1520MODULE = CFClient PACKAGE = CFClient::OpenGL 1892MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521 1893
1522BOOT: 1894BOOT:
1523{ 1895{
1524 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1896 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525 static const struct { 1897 static const struct {
1526 const char *name; 1898 const char *name;
1527 IV iv; 1899 IV iv;
1528 } *civ, const_iv[] = { 1900 } *civ, const_iv[] = {
1529# define const_iv(name) { # name, (IV)name } 1901# define const_iv(name) { # name, (IV)name }
1536 const_iv (GL_SCISSOR_TEST), 1908 const_iv (GL_SCISSOR_TEST),
1537 const_iv (GL_DEPTH_TEST), 1909 const_iv (GL_DEPTH_TEST),
1538 const_iv (GL_ALPHA_TEST), 1910 const_iv (GL_ALPHA_TEST),
1539 const_iv (GL_NORMALIZE), 1911 const_iv (GL_NORMALIZE),
1540 const_iv (GL_RESCALE_NORMAL), 1912 const_iv (GL_RESCALE_NORMAL),
1913 const_iv (GL_FRONT),
1914 const_iv (GL_BACK),
1541 const_iv (GL_AND), 1915 const_iv (GL_AND),
1542 const_iv (GL_ONE), 1916 const_iv (GL_ONE),
1543 const_iv (GL_ZERO), 1917 const_iv (GL_ZERO),
1544 const_iv (GL_SRC_ALPHA), 1918 const_iv (GL_SRC_ALPHA),
1545 const_iv (GL_SRC_ALPHA_SATURATE), 1919 const_iv (GL_DST_ALPHA),
1546 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1920 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547 const_iv (GL_ONE_MINUS_DST_ALPHA), 1921 const_iv (GL_ONE_MINUS_DST_ALPHA),
1922 const_iv (GL_SRC_ALPHA_SATURATE),
1548 const_iv (GL_RGB), 1923 const_iv (GL_RGB),
1549 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),
1550 const_iv (GL_UNSIGNED_BYTE), 1928 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT), 1929 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT), 1930 const_iv (GL_UNSIGNED_INT),
1553 const_iv (GL_ALPHA), 1931 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY), 1932 const_iv (GL_INTENSITY),
1563 const_iv (GL_TEXTURE_MAG_FILTER), 1941 const_iv (GL_TEXTURE_MAG_FILTER),
1564 const_iv (GL_TEXTURE_MIN_FILTER), 1942 const_iv (GL_TEXTURE_MIN_FILTER),
1565 const_iv (GL_TEXTURE_ENV_MODE), 1943 const_iv (GL_TEXTURE_ENV_MODE),
1566 const_iv (GL_TEXTURE_WRAP_S), 1944 const_iv (GL_TEXTURE_WRAP_S),
1567 const_iv (GL_TEXTURE_WRAP_T), 1945 const_iv (GL_TEXTURE_WRAP_T),
1946 const_iv (GL_REPEAT),
1568 const_iv (GL_CLAMP), 1947 const_iv (GL_CLAMP),
1569 const_iv (GL_REPEAT), 1948 const_iv (GL_CLAMP_TO_EDGE),
1570 const_iv (GL_NEAREST), 1949 const_iv (GL_NEAREST),
1571 const_iv (GL_LINEAR), 1950 const_iv (GL_LINEAR),
1572 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1951 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1952 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1953 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1585 const_iv (GL_SEPARABLE_2D), 1964 const_iv (GL_SEPARABLE_2D),
1586 const_iv (GL_CONVOLUTION_2D), 1965 const_iv (GL_CONVOLUTION_2D),
1587 const_iv (GL_CONVOLUTION_BORDER_MODE), 1966 const_iv (GL_CONVOLUTION_BORDER_MODE),
1588 const_iv (GL_CONSTANT_BORDER), 1967 const_iv (GL_CONSTANT_BORDER),
1589 const_iv (GL_LINES), 1968 const_iv (GL_LINES),
1969 const_iv (GL_LINE_STRIP),
1590 const_iv (GL_LINE_LOOP), 1970 const_iv (GL_LINE_LOOP),
1591 const_iv (GL_QUADS), 1971 const_iv (GL_QUADS),
1592 const_iv (GL_QUAD_STRIP), 1972 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES), 1973 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP), 1974 const_iv (GL_TRIANGLE_STRIP),
1604 1984
1605 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; )
1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1986 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607} 1987}
1608 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
1609int glGetError () 2010int glGetError ()
2011
2012void glFinish ()
1610 2013
1611void glClear (int mask) 2014void glClear (int mask)
1612 2015
1613void glClearColor (float r, float g, float b, float a = 1.0) 2016void glClearColor (float r, float g, float b, float a = 1.0)
1614 PROTOTYPE: @ 2017 PROTOTYPE: @
1621 2024
1622void glHint (int target, int mode) 2025void glHint (int target, int mode)
1623 2026
1624void glBlendFunc (int sfactor, int dfactor) 2027void glBlendFunc (int sfactor, int dfactor)
1625 2028
2029void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2030 CODE:
2031 gl_BlendFuncSeparate (sa, da, saa, daa);
2032
1626void glDepthMask (int flag) 2033void glDepthMask (int flag)
1627 2034
1628void glLogicOp (int opcode) 2035void glLogicOp (int opcode)
1629 2036
1630void glColorMask (int red, int green, int blue, int alpha) 2037void glColorMask (int red, int green, int blue, int alpha)
1634void glPushMatrix () 2041void glPushMatrix ()
1635 2042
1636void glPopMatrix () 2043void glPopMatrix ()
1637 2044
1638void glLoadIdentity () 2045void glLoadIdentity ()
2046
2047void glDrawBuffer (int buffer)
2048
2049void glReadBuffer (int buffer)
1639 2050
1640# near_ and far_ are due to microsofts buggy "c" compiler 2051# near_ and far_ are due to microsofts buggy "c" compiler
1641void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2052void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642 2053
1643# near_ and far_ are due to microsofts buggy "c" compiler 2054# near_ and far_ are due to microsofts buggy "c" compiler
1663 2074
1664void glEnd () 2075void glEnd ()
1665 2076
1666void glColor (float r, float g, float b, float a = 1.0) 2077void glColor (float r, float g, float b, float a = 1.0)
1667 PROTOTYPE: @ 2078 PROTOTYPE: @
2079 ALIAS:
2080 glColor_premultiply = 1
1668 CODE: 2081 CODE:
2082 if (ix)
2083 {
2084 r *= a;
2085 g *= a;
2086 b *= a;
2087 }
1669 // microsoft visual "c" rounds instead of truncating... 2088 // microsoft visual "c" rounds instead of truncating...
1670 glColor4ub (MIN ((int)(r * 255.f), 255), 2089 glColor4f (r, g, b, a);
1671 MIN ((int)(g * 255.f), 255),
1672 MIN ((int)(b * 255.f), 255),
1673 MIN ((int)(a * 255.f), 255));
1674 2090
1675void glInterleavedArrays (int format, int stride, char *data) 2091void glInterleavedArrays (int format, int stride, char *data)
1676 2092
1677void glDrawElements (int mode, int count, int type, char *indices) 2093void glDrawElements (int mode, int count, int type, char *indices)
1678 2094
1679# 1.2 void glDrawRangeElements (int mode, int start, int end 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);
1680 2101
1681void glVertex (float x, float y, float z = 0.) 2102void glVertex (float x, float y, float z = 0.)
1682 CODE: 2103 CODE:
1683 glVertex3f (x, y, z); 2104 glVertex3f (x, y, z);
1684 2105
1696 2117
1697void glBindTexture (int target, int name) 2118void glBindTexture (int target, int name)
1698 2119
1699void glConvolutionParameter (int target, int pname, float params) 2120void glConvolutionParameter (int target, int pname, float params)
1700 CODE: 2121 CODE:
1701 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2122 if (gl.ConvolutionParameterf)
2123 gl.ConvolutionParameterf (target, pname, params);
1702 2124
1703void 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)
1704 CODE: 2126 CODE:
1705 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2127 if (gl.ConvolutionFilter2D)
1706 (target, internalformat, width, height, format, type, data)); 2128 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1707 2129
1708void 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)
1709 CODE: 2131 CODE:
1710 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2132 if (gl.SeparableFilter2D)
1711 (target, internalformat, width, height, format, type, row, column)); 2133 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1712 2134
1713void 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)
1714 2136
1715void 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)
1716 2138
1717void glRasterPos (int x, int y) 2139void glDrawPixels (int width, int height, int format, int type, char *pixels)
1718 CODE:
1719 glRasterPos2i (x, y);
1720 2140
1721void 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)
1722 2142
1723int glGenTexture () 2143int glGenTexture ()
1724 CODE: 2144 CODE:
1751 2171
1752void glEndList () 2172void glEndList ()
1753 2173
1754void glCallList (int list) 2174void glCallList (int list)
1755 2175
1756

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines