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.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 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{
495 SDL_Event ev; 578 SDL_Event ev;
496 int i;
497 static int modifier;
498 static int modkey[] = {
499 SDLK_RSHIFT, KMOD_RSHIFT,
500 SDLK_LSHIFT, KMOD_LSHIFT,
501 SDLK_RCTRL, KMOD_RCTRL,
502 SDLK_LCTRL, KMOD_LCTRL,
503 SDLK_RALT, KMOD_RALT,
504 SDLK_LALT, KMOD_LALT,
505 SDLK_RMETA, KMOD_RMETA,
506 SDLK_LMETA, KMOD_LMETA,
507 };
508 579
509 while (SDL_PollEvent (&ev)) 580 while (SDL_PollEvent (&ev))
510 { 581 {
511 HV *hv = newHV (); 582 HV *hv = newHV ();
512 hv_store (hv, "type", 4, newSViv (ev.type), 0); 583 hv_store (hv, "type", 4, newSViv (ev.type), 0);
513 584
514 switch (ev.type) 585 switch (ev.type)
515 { 586 {
516 case SDL_KEYDOWN: 587 case SDL_KEYDOWN:
517 case SDL_KEYUP: 588 case SDL_KEYUP:
518
519 for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520 if (modkey [i * 2] == ev.key.keysym.sym)
521 {
522 if (ev.type == SDL_KEYDOWN)
523 modifier |= modkey [i * 2 + 1];
524 else
525 modifier &= ~modkey [i * 2 + 1];
526 break;
527 }
528
529 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 591 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533 break; 593 break;
536 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538 break; 598 break;
539 599
540 case SDL_MOUSEMOTION: 600 case SDL_MOUSEMOTION:
541 hv_store (hv, "mod", 3, newSViv (modifier), 0); 601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542 602
543 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548 break; 608 break;
549 609
550 case SDL_MOUSEBUTTONDOWN: 610 case SDL_MOUSEBUTTONDOWN:
551 case SDL_MOUSEBUTTONUP: 611 case SDL_MOUSEBUTTONUP:
552 hv_store (hv, "mod", 3, newSViv (modifier), 0); 612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553 613
554 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
562 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564 break; 624 break;
565 } 625 }
566 626
567 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568 } 628 }
569} 629}
570 630
571int 631int
572Mix_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)
585 CODE: 645 CODE:
586#ifndef _WIN32 646#ifndef _WIN32
587 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588#endif 648#endif
589 649
590char * 650void
591gl_vendor () 651win32_proxy_info ()
592 CODE: 652 PPCODE:
593 RETVAL = (char *)glGetString (GL_VENDOR); 653{
594 OUTPUT: 654#ifdef _WIN32
595 RETVAL 655 char buffer[2048];
656 DWORD buflen;
596 657
597char * 658 EXTEND (SP, 3);
598gl_version () 659
599 CODE: 660 buflen = sizeof (buffer);
600 RETVAL = (char *)glGetString (GL_VERSION); 661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
601 OUTPUT: 662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
602 RETVAL 663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
603 665
604char * 666 buflen = sizeof (buffer);
605gl_extensions () 667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
606 CODE: 668 {
607 RETVAL = (char *)glGetString (GL_EXTENSIONS); 669 PUSHs (newSVpv (buffer, 0));
608 OUTPUT: 670
609 RETVAL 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}
610 678
611void 679void
612add_font (char *file) 680add_font (char *file)
613 CODE: 681 CODE:
614 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615#ifdef _WIN32
616 // cairo... sigh... requires win2000
617 AddFontResourceEx (file, FR_PRIVATE, 0);
618#endif
619 683
620void 684void
621load_image_inline (SV *image_) 685load_image_inline (SV *image_)
622 ALIAS: 686 ALIAS:
623 load_image_file = 1 687 load_image_file = 1
665 729
666 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667 731
668 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
669 733
734 SDL_LockSurface (surface2);
670 EXTEND (SP, 5); 735 EXTEND (SP, 6);
671 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
672 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
673 SDL_LockSurface (surface2);
674 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675 SDL_UnlockSurface (surface2);
676 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)));
677 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
679 743
680 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
681 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
682} 746}
683 747
719 CODE: 783 CODE:
720 fprintf (stderr, "FATAL: %s\n", message); 784 fprintf (stderr, "FATAL: %s\n", message);
721#ifdef _WIN32 785#ifdef _WIN32
722 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
723#endif 787#endif
724 exit (1); 788 _exit (1);
725 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
726MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
727 800
728CFClient::Font 801CFPlus::Font
729new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
730 CODE: 803 CODE:
731{ 804{
732 int count; 805 int count;
733 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
736} 809}
737 OUTPUT: 810 OUTPUT:
738 RETVAL 811 RETVAL
739 812
740void 813void
741DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
742 CODE: 815 CODE:
743 pango_font_description_free (self); 816 pango_font_description_free (self);
744 817
745void 818void
746make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
747 CODE: 820 CODE:
748 default_font = self; 821 default_font = self;
749 822
750MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
751 824
752CFClient::Layout 825void
753new (SV *class, int rgba = 0) 826reset_glyph_cache ()
754 CODE: 827 CODE:
755#if _WIN32 828 tc_clear ();
756 rgba = 0;//D 829
757#endif 830CFPlus::Layout
831new (SV *class)
832 CODE:
758 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
759 834
760 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
761 RETVAL->rgba = rgba;
762 RETVAL->r = 1.; 836 RETVAL->r = 1.;
763 RETVAL->g = 1.; 837 RETVAL->g = 1.;
764 RETVAL->b = 1.; 838 RETVAL->b = 1.;
765 RETVAL->a = 1.; 839 RETVAL->a = 1.;
766 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
770 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
771 OUTPUT: 845 OUTPUT:
772 RETVAL 846 RETVAL
773 847
774void 848void
775DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
776 CODE: 850 CODE:
777 g_object_unref (self->pl); 851 g_object_unref (self->pl);
778 Safefree (self); 852 Safefree (self);
779 853
780int
781is_rgba (CFClient::Layout self)
782 CODE:
783 RETVAL = self->rgba;
784 OUTPUT:
785 RETVAL
786
787void 854void
788set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
789 CODE: 856 CODE:
790{ 857{
791 STRLEN textlen; 858 STRLEN textlen;
792 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
793 860
794 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
795} 862}
796 863
797void 864void
798set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
799 CODE: 866 CODE:
800{ 867{
801 STRLEN textlen; 868 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
803 870
804 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
805} 872}
806 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
807SV * 959SV *
808get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
809 CODE: 961 CODE:
810 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811 SvUTF8_on (RETVAL); 963 sv_utf8_decode (RETVAL);
812 OUTPUT: 964 OUTPUT:
813 RETVAL 965 RETVAL
814 966
815void 967void
816set_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.)
817 CODE: 969 CODE:
818 self->r = r; 970 self->r = r;
819 self->g = g; 971 self->g = g;
820 self->b = b; 972 self->b = b;
821 self->a = a; 973 self->a = a;
822 974
823void 975void
824set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825 CODE: 977 CODE:
826 if (self->font != font) 978 if (self->font != font)
827 { 979 {
828 self->font = font; 980 self->font = font;
829 layout_update_font (self); 981 layout_update_font (self);
830 } 982 }
831 983
832void 984void
833set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
834 CODE: 986 CODE:
835 if (self->base_height != base_height) 987 if (self->base_height != base_height)
836 { 988 {
837 self->base_height = base_height; 989 self->base_height = base_height;
838 layout_update_font (self); 990 layout_update_font (self);
839 } 991 }
840 992
841void 993void
842set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
843 CODE: 995 CODE:
844 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);
845 997
846void 998void
847set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
848 CODE: 1000 CODE:
849 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850 1002
851void 1003void
852set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
853 CODE: 1005 CODE:
854 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855 1007
856void 1008void
857set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
858 CODE: 1010 CODE:
859 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
860 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
861 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
863 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
864 ); 1016 );
865 1017
866void 1018void
867set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
868 CODE: 1020 CODE:
869 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870 1022
871void 1023void
872size (CFClient::Layout self) 1024size (CFPlus::Layout self)
873 PPCODE: 1025 PPCODE:
874{ 1026{
875 int w, h; 1027 int w, h;
876 1028
877 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
880 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
881 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
882} 1034}
883 1035
884int 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
885xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
886 CODE: 1050 CODE:
887{ 1051{
888 int index, trailing; 1052 int index, trailing;
889 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);
890 RETVAL = index; 1054 RETVAL = index;
891} 1055}
892 OUTPUT: 1056 OUTPUT:
893 RETVAL 1057 RETVAL
894 1058
895void 1059void
896cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
897 PPCODE: 1061 PPCODE:
898{ 1062{
899 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
900 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901 1065
904 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906} 1070}
907 1071
908void 1072void
909render (CFClient::Layout self) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
910 PPCODE: 1074 PPCODE:
911{ 1075 pango_opengl_render_layout_subpixel (
912 SV *retval; 1076 self->pl,
913 int w, h; 1077 x * PANGO_SCALE, y * PANGO_SCALE,
1078 self->r, self->g, self->b, self->a,
1079 flags
1080 );
914 1081
915 layout_get_pixel_size (self, &w, &h); 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
916 1083
917 if (self->rgba) 1084void
1085pad2pot (SV *data_, SV *w_, SV *h_)
1086 CODE:
1087{
1088 int ow = SvIV (w_);
1089 int oh = SvIV (h_);
1090
1091 if (ow && oh)
918 { 1092 {
919 cairo_surface_t *surface; 1093 int nw = minpot (ow);
920 cairo_t *cairo; 1094 int nh = minpot (oh);
921 1095
922 retval = newSV (w * h * 4); 1096 if (nw != ow || nh != oh)
923 SvPOK_only (retval);
924 SvCUR_set (retval, w * h * 4);
925
926 memset (SvPVX (retval), 0, w * h * 4);
927
928 surface = cairo_image_surface_create_for_data (
929 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
930 cairo = cairo_create (surface);
931 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933 pango_cairo_show_layout (cairo, self->pl);
934
935 cairo_destroy (cairo);
936 cairo_surface_destroy (surface);
937
938 // what a mess, and its premultiplied, too :(
939 { 1097 {
940 uint32_t *p = (uint32_t *)SvPVX (retval); 1098 if (SvOK (data_))
941 uint32_t *e = p + w * h;
942
943 while (p < e)
944 { 1099 {
945 uint32_t rgba = *p; 1100 STRLEN datalen;
946 rgba = (rgba >> 24) | (rgba << 8); 1101 char *data = SvPVbyte (data_, datalen);
947#if 0 1102 int bpp = datalen / (ow * oh);
948#ifdef _WIN32 1103 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
949 {//D
950 uint8_t r = rgba >> 24;
951 uint8_t g = rgba >> 16;
952 uint8_t b = rgba >> 8;
953 uint8_t a = rgba >> 0;
954 1104
955 rgba = (rgba & 0xffffff00) | a; 1105 SvPOK_only (result_);
1106 SvCUR_set (result_, nw * nh * bpp);
1107
1108 memset (SvPVX (result_), 0, nw * nh * bpp);
1109 while (oh--)
1110 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1111
1112 sv_setsv (data_, result_);
956 } 1113 }
957#endif 1114
958#endif 1115 sv_setiv (w_, nw);
959 rgba = SDL_SwapBE32 (rgba); 1116 sv_setiv (h_, nh);
960 *p++ = rgba;
961 } 1117 }
962 }
963
964 EXTEND (SP, 5);
965 PUSHs (sv_2mortal (newSViv (w)));
966 PUSHs (sv_2mortal (newSViv (h)));
967 PUSHs (sv_2mortal (retval));
968 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970 } 1118 }
971 else
972 {
973 FT_Bitmap bitmap;
974
975 retval = newSV (w * h);
976 SvPOK_only (retval);
977 SvCUR_set (retval, w * h);
978
979 bitmap.rows = h;
980 bitmap.width = w;
981 bitmap.pitch = w;
982 bitmap.buffer = (unsigned char*)SvPVX (retval);
983 bitmap.num_grays = 256;
984 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986 memset (bitmap.buffer, 0, w * h);
987
988 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990 EXTEND (SP, 5);
991 PUSHs (sv_2mortal (newSViv (w)));
992 PUSHs (sv_2mortal (newSViv (h)));
993 PUSHs (sv_2mortal (retval));
994 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996 }
997} 1119}
998 1120
999MODULE = CFClient PACKAGE = CFClient::Texture
1000
1001void 1121void
1002draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1122draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003 PROTOTYPE: $$$;$$ 1123 PROTOTYPE: $$$;$$
1004 ALIAS: 1124 ALIAS:
1005 draw_quad_alpha = 1 1125 draw_quad_alpha = 1
1006 draw_quad_alpha_premultiplied = 2 1126 draw_quad_alpha_premultiplied = 2
1007 CODE: 1127 CODE:
1008{ 1128{
1009 HV *hv = (HV *)SvRV (self); 1129 HV *hv = (HV *)SvRV (self);
1010 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1130 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1131 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1132 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014 1133
1015 if (items < 5) 1134 if (items < 5)
1016 { 1135 {
1017 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1136 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1137 h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019 } 1138 }
1020 1139
1021 if (ix) 1140 if (ix)
1022 { 1141 {
1023 glEnable (GL_BLEND); 1142 glEnable (GL_BLEND);
1143
1144 if (ix == 2)
1024 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1145 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1146 else
1147 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1148 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1149
1025 glEnable (GL_ALPHA_TEST); 1150 glEnable (GL_ALPHA_TEST);
1026 glAlphaFunc (GL_GREATER, 0.01f); 1151 glAlphaFunc (GL_GREATER, 0.01f);
1027 } 1152 }
1028 1153
1029 glBindTexture (GL_TEXTURE_2D, name); 1154 glBindTexture (GL_TEXTURE_2D, name);
1030
1031 if (wrap_mode)
1032 {
1033 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035 }
1036 1155
1037 glBegin (GL_QUADS); 1156 glBegin (GL_QUADS);
1038 glTexCoord2f (0, 0); glVertex2f (x , y ); 1157 glTexCoord2f (0, 0); glVertex2f (x , y );
1039 glTexCoord2f (0, t); glVertex2f (x , y + h); 1158 glTexCoord2f (0, t); glVertex2f (x , y + h);
1040 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1159 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1046 glDisable (GL_ALPHA_TEST); 1165 glDisable (GL_ALPHA_TEST);
1047 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1048 } 1167 }
1049} 1168}
1050 1169
1051MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1052 1171
1053CFClient::Map 1172CFPlus::Map
1054new (SV *class, int map_width, int map_height) 1173new (SV *class)
1055 CODE: 1174 CODE:
1056 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1057 RETVAL->x = 0; 1176 RETVAL->x = 0;
1058 RETVAL->y = 0; 1177 RETVAL->y = 0;
1059 RETVAL->w = map_width; 1178 RETVAL->w = 0;
1060 RETVAL->h = map_height; 1179 RETVAL->h = 0;
1061 RETVAL->ox = 0; 1180 RETVAL->ox = 0;
1062 RETVAL->oy = 0; 1181 RETVAL->oy = 0;
1063 RETVAL->faces = 8192; 1182 RETVAL->faces = 8192;
1064 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1183 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1065 RETVAL->texs = 8192; 1184 RETVAL->texs = 8192;
1068 RETVAL->row = 0; 1187 RETVAL->row = 0;
1069 OUTPUT: 1188 OUTPUT:
1070 RETVAL 1189 RETVAL
1071 1190
1072void 1191void
1073DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
1074 CODE: 1193 CODE:
1075{ 1194{
1076 map_clear (self); 1195 map_clear (self);
1077 Safefree (self->face); 1196 Safefree (self->face);
1197 Safefree (self->tex);
1078 Safefree (self); 1198 Safefree (self);
1079} 1199}
1080 1200
1081void 1201void
1202resize (CFPlus::Map self, int map_width, int map_height)
1203 CODE:
1204 self->w = map_width;
1205 self->h = map_height;
1206
1207void
1082clear (CFClient::Map self) 1208clear (CFPlus::Map self)
1083 CODE: 1209 CODE:
1084 map_clear (self); 1210 map_clear (self);
1085 1211
1086void 1212void
1087set_face (CFClient::Map self, int face, int texid) 1213set_face (CFPlus::Map self, int face, int texid)
1088 CODE: 1214 CODE:
1089{ 1215{
1090 while (self->faces <= face) 1216 while (self->faces <= face)
1091 { 1217 {
1092 Append (mapface, self->face, self->faces, self->faces); 1218 Append (mapface, self->face, self->faces, self->faces);
1095 1221
1096 self->face [face] = texid; 1222 self->face [face] = texid;
1097} 1223}
1098 1224
1099void 1225void
1100set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1226set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1101 CODE: 1227 CODE:
1102{ 1228{
1103 while (self->texs <= texid) 1229 while (self->texs <= texid)
1104 { 1230 {
1105 Append (maptex, self->tex, self->texs, self->texs); 1231 Append (maptex, self->tex, self->texs, self->texs);
1117 tex->r = r; 1243 tex->r = r;
1118 tex->g = g; 1244 tex->g = g;
1119 tex->b = b; 1245 tex->b = b;
1120 tex->a = a; 1246 tex->a = a;
1121 } 1247 }
1248
1249 // somewhat hackish, but for textures that require it, it really
1250 // improves the look, and most others don't suffer.
1251 glBindTexture (GL_TEXTURE_2D, name);
1252 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1253 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1254 // use uglier nearest interpolation because linear suffers
1255 // from transparent color bleeding and ugly wrapping effects.
1256 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122} 1257}
1123 1258
1124int 1259int
1125ox (CFClient::Map self) 1260ox (CFPlus::Map self)
1126 ALIAS: 1261 ALIAS:
1127 oy = 1 1262 oy = 1
1263 x = 2
1264 y = 3
1265 w = 4
1266 h = 5
1128 CODE: 1267 CODE:
1129 switch (ix) 1268 switch (ix)
1130 { 1269 {
1131 case 0: RETVAL = self->ox; break; 1270 case 0: RETVAL = self->ox; break;
1132 case 1: RETVAL = self->oy; break; 1271 case 1: RETVAL = self->oy; break;
1272 case 2: RETVAL = self->x; break;
1273 case 3: RETVAL = self->y; break;
1274 case 4: RETVAL = self->w; break;
1275 case 5: RETVAL = self->h; break;
1133 } 1276 }
1134 OUTPUT: 1277 OUTPUT:
1135 RETVAL 1278 RETVAL
1136 1279
1137void 1280void
1138scroll (CFClient::Map self, int dx, int dy) 1281scroll (CFPlus::Map self, int dx, int dy)
1139 CODE: 1282 CODE:
1140{ 1283{
1141 if (dx > 0) 1284 if (dx > 0)
1142 map_blank (self, self->x, self->y, dx - 1, self->h); 1285 map_blank (self, self->x, self->y, dx, self->h);
1143 else if (dx < 0) 1286 else if (dx < 0)
1144 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1287 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1145 1288
1146 if (dy > 0) 1289 if (dy > 0)
1147 map_blank (self, self->x, self->y, self->w, dy - 1); 1290 map_blank (self, self->x, self->y, self->w, dy);
1148 else if (dy < 0) 1291 else if (dy < 0)
1149 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1292 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1150 1293
1151 self->ox += dx; self->x += dx; 1294 self->ox += dx; self->x += dx;
1152 self->oy += dy; self->y += dy; 1295 self->oy += dy; self->y += dy;
1153 1296
1154 while (self->y < 0) 1297 while (self->y < 0)
1159 self->y += MAP_EXTEND_Y; 1302 self->y += MAP_EXTEND_Y;
1160 } 1303 }
1161} 1304}
1162 1305
1163void 1306void
1164map1a_update (CFClient::Map self, SV *data_) 1307map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165 CODE: 1308 CODE:
1166{ 1309{
1167 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1310 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1168 uint8_t *data_end = (uint8_t *)SvEND (data_); 1311 uint8_t *data_end = (uint8_t *)SvEND (data_);
1169 mapcell *cell; 1312 mapcell *cell;
1170 int x, y, flags; 1313 int x, y, flags;
1171 1314
1172 while (data < data_end) 1315 while (data < data_end - 1)
1173 { 1316 {
1174 flags = (data [0] << 8) + data [1]; data += 2; 1317 flags = (data [0] << 8) + data [1]; data += 2;
1175 1318
1176 x = ((flags >> 10) & 63) + self->x; 1319 x = self->x + ((flags >> 10) & 63);
1177 y = ((flags >> 4) & 63) + self->y; 1320 y = self->y + ((flags >> 4) & 63);
1178 1321
1179 cell = map_get_cell (self, x, y); 1322 cell = map_get_cell (self, x, y);
1180 1323
1181 if (flags & 15) 1324 if (flags & 15)
1182 { 1325 {
1183 if (cell->darkness < 0) 1326 if (!cell->darkness)
1184 { 1327 {
1328 memset (cell, 0, sizeof (*cell));
1185 cell->darkness = 0; 1329 cell->darkness = 256;
1186 cell->face [0] = 0;
1187 cell->face [1] = 0;
1188 cell->face [2] = 0;
1189 } 1330 }
1190 1331
1191 cell->darkness = flags & 8 ? *data++ : 255;
1192
1193 //TODO: don't trust server data to be in-range(!) 1332 //TODO: don't trust server data to be in-range(!)
1333
1334 if (flags & 8)
1335 {
1336 if (extmap)
1337 {
1338 uint8_t ext, cmd;
1339
1340 do
1341 {
1342 ext = *data++;
1343 cmd = ext & 0x3f;
1344
1345 if (cmd < 4)
1346 cell->darkness = 255 - ext * 64 + 1;
1347 else if (cmd == 5) // health
1348 {
1349 cell->stat_width = 1;
1350 cell->stat_hp = *data++;
1351 }
1352 else if (cmd == 6) // monster width
1353 cell->stat_width = *data++ + 1;
1354 else if (cmd == 0x47) // monster width
1355 {
1356 if (*data == 4)
1357 ; // decode player tag
1358
1359 data += *data + 1;
1360 }
1361 else if (cmd == 8) // cell flags
1362 cell->flags = *data++;
1363 else if (ext & 0x40) // unknown, multibyte => skip
1364 data += *data + 1;
1365 else
1366 data++;
1367 }
1368 while (ext & 0x80);
1369 }
1370 else
1371 cell->darkness = *data++ + 1;
1372 }
1194 1373
1195 if (flags & 4) 1374 if (flags & 4)
1196 { 1375 {
1197 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1376 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1198 } 1377 }
1206 { 1385 {
1207 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1386 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1208 } 1387 }
1209 } 1388 }
1210 else 1389 else
1211 cell->darkness = -1; 1390 cell->darkness = 0;
1212 } 1391 }
1213} 1392}
1214 1393
1215SV * 1394SV *
1216mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1395mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217 CODE: 1396 CODE:
1218{ 1397{
1219 int x1, x; 1398 int x1, x;
1220 int y1, y; 1399 int y1, y;
1221 int z; 1400 int z;
1271} 1450}
1272 OUTPUT: 1451 OUTPUT:
1273 RETVAL 1452 RETVAL
1274 1453
1275void 1454void
1276draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1455draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1277 PPCODE: 1456 CODE:
1278{ 1457{
1279 int vx, vy;
1280 int x, y, z; 1458 int x, y, z;
1281 int last_name; 1459 int last_name;
1282 mapface face; 1460 mapface face;
1283 int sw4 = (sw + 3) & ~3;
1284 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1285 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1286
1287 memset (darkness, 255, sw4 * sh);
1288 SvPOK_only (darkness_sv);
1289 SvCUR_set (darkness_sv, sw4 * sh);
1290
1291 vx = self->x + (self->w - sw) / 2 - shift_x;
1292 vy = self->y + (self->h - sh) / 2 - shift_y;
1293
1294 /*
1295 int vx = self->vx = self->w >= sw
1296 ? self->x + (self->w - sw) / 2
1297 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1298
1299 int vy = self->vy = self->h >= sh
1300 ? self->y + (self->h - sh) / 2
1301 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302 */
1303 1461
1304 glColor4ub (255, 255, 255, 255); 1462 glColor4ub (255, 255, 255, 255);
1305 1463
1464 glEnable (GL_BLEND);
1306 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1465 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307 glEnable (GL_BLEND);
1308 glEnable (GL_TEXTURE_2D); 1466 glEnable (GL_TEXTURE_2D);
1309 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310 1468
1311 glBegin (GL_QUADS); 1469 glBegin (GL_QUADS);
1312 1470
1313 last_name = 0; 1471 last_name = 0;
1314 1472
1473 mx += self->x;
1474 my += self->y;
1475
1315 for (z = 0; z < 3; z++) 1476 for (z = 0; z < 3; z++)
1316 for (y = 0; y < sh; y++) 1477 for (y = 0; y < sh; y++)
1317 if (0 <= y + vy && y + vy < self->rows) 1478 if (0 <= y + my && y + my < self->rows)
1318 { 1479 {
1319 maprow *row = self->row + (y + vy); 1480 maprow *row = self->row + (y + my);
1320 1481
1321 for (x = 0; x < sw; x++) 1482 for (x = 0; x < sw; x++)
1322 if (row->c0 <= x + vx && x + vx < row->c1) 1483 if (row->c0 <= x + mx && x + mx < row->c1)
1323 { 1484 {
1324 mapcell *cell = row->col + (x + vx - row->c0); 1485 mapcell *cell = row->col + (x + mx - row->c0);
1325
1326 darkness[y * sw4 + x] = cell->darkness < 0
1327 ? 255 - FOW_DARKNESS
1328 : 255 - cell->darkness;
1329 1486
1330 face = cell->face [z]; 1487 face = cell->face [z];
1331 1488
1332 if (face) 1489 if (face && face < self->texs)
1333 { 1490 {
1334 maptex tex = self->tex [face]; 1491 maptex tex = self->tex [face];
1335
1336 int px = (x + 1) * 32 - tex.w; 1492 int px = (x + 1) * 32 - tex.w;
1337 int py = (y + 1) * 32 - tex.h; 1493 int py = (y + 1) * 32 - tex.h;
1338 1494
1339 if (last_name != tex.name) 1495 if (last_name != tex.name)
1340 { 1496 {
1341 glEnd (); 1497 glEnd ();
1342 last_name = tex.name;
1343 glBindTexture (GL_TEXTURE_2D, last_name); 1498 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1344 glBegin (GL_QUADS); 1499 glBegin (GL_QUADS);
1345 } 1500 }
1346 1501
1347 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1502 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1348 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1503 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1349 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1504 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1350 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1505 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1351 } 1506 }
1507
1508 if (cell->flags && z == 2)
1509 {
1510 if (cell->flags & 1)
1511 {
1512 maptex tex = self->tex [1];
1513 int px = (x + 1) * 32 - tex.w + 2;
1514 int py = (y + 1) * 32 - tex.h - 6;
1515
1516 glEnd ();
1517 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1518 glBegin (GL_QUADS);
1519
1520 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1521 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1522 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1523 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1524 }
1525 }
1352 } 1526 }
1353 } 1527 }
1354 1528
1355 glEnd (); 1529 glEnd ();
1356 1530
1357 glDisable (GL_TEXTURE_2D); 1531 glDisable (GL_TEXTURE_2D);
1358 glDisable (GL_BLEND); 1532 glDisable (GL_BLEND);
1533
1534 // top layer: overlays such as the health bar
1535 for (y = 0; y < sh; y++)
1536 if (0 <= y + my && y + my < self->rows)
1537 {
1538 maprow *row = self->row + (y + my);
1539
1540 for (x = 0; x < sw; x++)
1541 if (row->c0 <= x + mx && x + mx < row->c1)
1542 {
1543 mapcell *cell = row->col + (x + mx - row->c0);
1544
1545 int px = x * 32;
1546 int py = y * 32;
1547
1548 if (cell->stat_hp)
1549 {
1550 int width = cell->stat_width * 32;
1551 int thick = sh / 28 + 1 + cell->stat_width;
1552
1553 glColor3ub (0, 0, 0);
1554 glRectf (px + 1, py - thick - 2,
1555 px + width - 1, py);
1556
1557 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1558 glRectf (px + 2,
1559 py - thick - 1,
1560 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1561 }
1562 }
1563 }
1564}
1565
1566void
1567draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1568 CODE:
1569{
1570 static float color[16][3] = {
1571 { 0.00F, 0.00F, 0.00F },
1572 { 1.00F, 1.00F, 1.00F },
1573 { 0.00F, 0.00F, 0.55F },
1574 { 1.00F, 0.00F, 0.00F },
1575
1576 { 1.00F, 0.54F, 0.00F },
1577 { 0.11F, 0.56F, 1.00F },
1578 { 0.93F, 0.46F, 0.00F },
1579 { 0.18F, 0.54F, 0.34F },
1580
1581 { 0.56F, 0.73F, 0.56F },
1582 { 0.80F, 0.80F, 0.80F },
1583 { 0.55F, 0.41F, 0.13F },
1584 { 0.99F, 0.77F, 0.26F },
1585
1586 { 0.74F, 0.65F, 0.41F },
1587
1588 { 0.00F, 1.00F, 1.00F },
1589 { 1.00F, 0.00F, 1.00F },
1590 { 1.00F, 1.00F, 0.00F },
1591 };
1592
1593 int x, y;
1594
1595 glEnable (GL_TEXTURE_2D);
1596 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1597 glEnable (GL_BLEND);
1598 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1599 glBegin (GL_QUADS);
1600
1601 for (y = 0; y < h; y++)
1602 for (x = 0; x < w; x++)
1603 {
1604 unsigned char m = data [x + y * w];
1605
1606 if (m)
1607 {
1608 float *c = color [m & 15];
1609
1610 float tx1 = m & 0x40 ? 0.5 : 0.;
1611 float tx2 = tx1 + 0.5;
1612
1613 glColor4f (c[0], c[1], c[2], 0.75);
1614 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1615 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1616 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1617 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1618 }
1619 }
1620
1621 glEnd ();
1622 glDisable (GL_BLEND);
1623 glDisable (GL_TEXTURE_2D);
1624}
1625
1626void
1627fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1628 PPCODE:
1629{
1630 int x, y;
1631 int sw4 = (sw + 3) & ~3;
1632 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1633 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1634
1635 memset (darkness, 255, sw4 * sh);
1636 SvPOK_only (darkness_sv);
1637 SvCUR_set (darkness_sv, sw4 * sh);
1638
1639 mx += self->x;
1640 my += self->y;
1641
1642 for (y = 0; y < sh; y++)
1643 if (0 <= y + my && y + my < self->rows)
1644 {
1645 maprow *row = self->row + (y + my);
1646
1647 for (x = 0; x < sw; x++)
1648 if (row->c0 <= x + mx && x + mx < row->c1)
1649 {
1650 mapcell *cell = row->col + (x + mx - row->c0);
1651
1652 darkness[y * sw4 + x] = cell->darkness
1653 ? 255 - (cell->darkness - 1)
1654 : 255 - FOW_DARKNESS;
1655 }
1656 }
1359 1657
1360 EXTEND (SP, 3); 1658 EXTEND (SP, 3);
1361 PUSHs (sv_2mortal (newSViv (sw4))); 1659 PUSHs (sv_2mortal (newSViv (sw4)));
1362 PUSHs (sv_2mortal (newSViv (sh))); 1660 PUSHs (sv_2mortal (newSViv (sh)));
1363 PUSHs (darkness_sv); 1661 PUSHs (darkness_sv);
1364} 1662}
1365 1663
1366SV * 1664SV *
1367get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1665get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1368 CODE: 1666 CODE:
1369{ 1667{
1370 int x, y, x1, y1; 1668 int x, y, x1, y1;
1371 SV *data_sv = newSV (w * h * 7 + 5); 1669 SV *data_sv = newSV (w * h * 7 + 5);
1372 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1670 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1434} 1732}
1435 OUTPUT: 1733 OUTPUT:
1436 RETVAL 1734 RETVAL
1437 1735
1438void 1736void
1439set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1737set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440 PPCODE: 1738 PPCODE:
1441{ 1739{
1442 int x, y, z; 1740 int x, y, z;
1443 int w, h; 1741 int w, h;
1444 int x1, y1; 1742 int x1, y1;
1476 1774
1477 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1775 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1478 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1776 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1479 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1777 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1480 1778
1481 if (cell->darkness <= 0) 1779 if (cell->darkness == 0)
1482 { 1780 {
1483 cell->darkness = -1; 1781 cell->darkness = 0;
1484 1782
1485 for (z = 0; z <= 2; z++) 1783 for (z = 0; z <= 2; z++)
1486 { 1784 {
1487 cell->face[z] = face[z]; 1785 cell->face[z] = face[z];
1488 1786
1493 } 1791 }
1494 } 1792 }
1495 } 1793 }
1496} 1794}
1497 1795
1498MODULE = CFClient PACKAGE = CFClient::MixChunk 1796MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499 1797
1500CFClient::MixChunk 1798CFPlus::MixChunk
1501new_from_file (SV *class, char *path) 1799new_from_file (SV *class, char *path)
1502 CODE: 1800 CODE:
1503 RETVAL = Mix_LoadWAV (path); 1801 RETVAL = Mix_LoadWAV (path);
1504 OUTPUT: 1802 OUTPUT:
1505 RETVAL 1803 RETVAL
1506 1804
1507void 1805void
1508DESTROY (CFClient::MixChunk self) 1806DESTROY (CFPlus::MixChunk self)
1509 CODE: 1807 CODE:
1510 Mix_FreeChunk (self); 1808 Mix_FreeChunk (self);
1511 1809
1512int 1810int
1513volume (CFClient::MixChunk self, int volume = -1) 1811volume (CFPlus::MixChunk self, int volume = -1)
1514 CODE: 1812 CODE:
1515 RETVAL = Mix_VolumeChunk (self, volume); 1813 RETVAL = Mix_VolumeChunk (self, volume);
1516 OUTPUT: 1814 OUTPUT:
1517 RETVAL 1815 RETVAL
1518 1816
1519int 1817int
1520play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1818play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1521 CODE: 1819 CODE:
1522 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1820 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523 OUTPUT: 1821 OUTPUT:
1524 RETVAL 1822 RETVAL
1525 1823
1526MODULE = CFClient PACKAGE = CFClient::MixMusic 1824MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527 1825
1528int 1826int
1529volume (int volume = -1) 1827volume (int volume = -1)
1530 CODE: 1828 CODE:
1531 RETVAL = Mix_VolumeMusic (volume); 1829 RETVAL = Mix_VolumeMusic (volume);
1532 OUTPUT: 1830 OUTPUT:
1533 RETVAL 1831 RETVAL
1534 1832
1535CFClient::MixMusic 1833CFPlus::MixMusic
1536new_from_file (SV *class, char *path) 1834new_from_file (SV *class, char *path)
1537 CODE: 1835 CODE:
1538 RETVAL = Mix_LoadMUS (path); 1836 RETVAL = Mix_LoadMUS (path);
1539 OUTPUT: 1837 OUTPUT:
1540 RETVAL 1838 RETVAL
1541 1839
1542void 1840void
1543DESTROY (CFClient::MixMusic self) 1841DESTROY (CFPlus::MixMusic self)
1544 CODE: 1842 CODE:
1545 Mix_FreeMusic (self); 1843 Mix_FreeMusic (self);
1546 1844
1547int 1845int
1548play (CFClient::MixMusic self, int loops = -1) 1846play (CFPlus::MixMusic self, int loops = -1)
1549 CODE: 1847 CODE:
1550 RETVAL = Mix_PlayMusic (self, loops); 1848 RETVAL = Mix_PlayMusic (self, loops);
1551 OUTPUT: 1849 OUTPUT:
1552 RETVAL 1850 RETVAL
1553 1851
1554MODULE = CFClient PACKAGE = CFClient::OpenGL 1852MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1555 1853
1556BOOT: 1854BOOT:
1557{ 1855{
1558 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1856 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559 static const struct { 1857 static const struct {
1560 const char *name; 1858 const char *name;
1561 IV iv; 1859 IV iv;
1562 } *civ, const_iv[] = { 1860 } *civ, const_iv[] = {
1563# define const_iv(name) { # name, (IV)name } 1861# define const_iv(name) { # name, (IV)name }
1570 const_iv (GL_SCISSOR_TEST), 1868 const_iv (GL_SCISSOR_TEST),
1571 const_iv (GL_DEPTH_TEST), 1869 const_iv (GL_DEPTH_TEST),
1572 const_iv (GL_ALPHA_TEST), 1870 const_iv (GL_ALPHA_TEST),
1573 const_iv (GL_NORMALIZE), 1871 const_iv (GL_NORMALIZE),
1574 const_iv (GL_RESCALE_NORMAL), 1872 const_iv (GL_RESCALE_NORMAL),
1873 const_iv (GL_FRONT),
1874 const_iv (GL_BACK),
1575 const_iv (GL_AND), 1875 const_iv (GL_AND),
1576 const_iv (GL_ONE), 1876 const_iv (GL_ONE),
1577 const_iv (GL_ZERO), 1877 const_iv (GL_ZERO),
1578 const_iv (GL_SRC_ALPHA), 1878 const_iv (GL_SRC_ALPHA),
1579 const_iv (GL_SRC_ALPHA_SATURATE), 1879 const_iv (GL_DST_ALPHA),
1580 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1880 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581 const_iv (GL_ONE_MINUS_DST_ALPHA), 1881 const_iv (GL_ONE_MINUS_DST_ALPHA),
1882 const_iv (GL_SRC_ALPHA_SATURATE),
1582 const_iv (GL_RGB), 1883 const_iv (GL_RGB),
1583 const_iv (GL_RGBA), 1884 const_iv (GL_RGBA),
1885 const_iv (GL_RGBA4),
1886 const_iv (GL_RGBA8),
1887 const_iv (GL_RGB5_A1),
1584 const_iv (GL_UNSIGNED_BYTE), 1888 const_iv (GL_UNSIGNED_BYTE),
1585 const_iv (GL_UNSIGNED_SHORT), 1889 const_iv (GL_UNSIGNED_SHORT),
1586 const_iv (GL_UNSIGNED_INT), 1890 const_iv (GL_UNSIGNED_INT),
1587 const_iv (GL_ALPHA), 1891 const_iv (GL_ALPHA),
1588 const_iv (GL_INTENSITY), 1892 const_iv (GL_INTENSITY),
1597 const_iv (GL_TEXTURE_MAG_FILTER), 1901 const_iv (GL_TEXTURE_MAG_FILTER),
1598 const_iv (GL_TEXTURE_MIN_FILTER), 1902 const_iv (GL_TEXTURE_MIN_FILTER),
1599 const_iv (GL_TEXTURE_ENV_MODE), 1903 const_iv (GL_TEXTURE_ENV_MODE),
1600 const_iv (GL_TEXTURE_WRAP_S), 1904 const_iv (GL_TEXTURE_WRAP_S),
1601 const_iv (GL_TEXTURE_WRAP_T), 1905 const_iv (GL_TEXTURE_WRAP_T),
1906 const_iv (GL_REPEAT),
1602 const_iv (GL_CLAMP), 1907 const_iv (GL_CLAMP),
1603 const_iv (GL_REPEAT), 1908 const_iv (GL_CLAMP_TO_EDGE),
1604 const_iv (GL_NEAREST), 1909 const_iv (GL_NEAREST),
1605 const_iv (GL_LINEAR), 1910 const_iv (GL_LINEAR),
1606 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1911 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1912 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1913 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1619 const_iv (GL_SEPARABLE_2D), 1924 const_iv (GL_SEPARABLE_2D),
1620 const_iv (GL_CONVOLUTION_2D), 1925 const_iv (GL_CONVOLUTION_2D),
1621 const_iv (GL_CONVOLUTION_BORDER_MODE), 1926 const_iv (GL_CONVOLUTION_BORDER_MODE),
1622 const_iv (GL_CONSTANT_BORDER), 1927 const_iv (GL_CONSTANT_BORDER),
1623 const_iv (GL_LINES), 1928 const_iv (GL_LINES),
1929 const_iv (GL_LINE_STRIP),
1624 const_iv (GL_LINE_LOOP), 1930 const_iv (GL_LINE_LOOP),
1625 const_iv (GL_QUADS), 1931 const_iv (GL_QUADS),
1626 const_iv (GL_QUAD_STRIP), 1932 const_iv (GL_QUAD_STRIP),
1627 const_iv (GL_TRIANGLES), 1933 const_iv (GL_TRIANGLES),
1628 const_iv (GL_TRIANGLE_STRIP), 1934 const_iv (GL_TRIANGLE_STRIP),
1638 1944
1639 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1945 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1946 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641} 1947}
1642 1948
1949char *
1950gl_vendor ()
1951 CODE:
1952 RETVAL = (char *)glGetString (GL_VENDOR);
1953 OUTPUT:
1954 RETVAL
1955
1956char *
1957gl_version ()
1958 CODE:
1959 RETVAL = (char *)glGetString (GL_VERSION);
1960 OUTPUT:
1961 RETVAL
1962
1963char *
1964gl_extensions ()
1965 CODE:
1966 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1967 OUTPUT:
1968 RETVAL
1969
1643int glGetError () 1970int glGetError ()
1971
1972void glFinish ()
1644 1973
1645void glClear (int mask) 1974void glClear (int mask)
1646 1975
1647void glClearColor (float r, float g, float b, float a = 1.0) 1976void glClearColor (float r, float g, float b, float a = 1.0)
1648 PROTOTYPE: @ 1977 PROTOTYPE: @
1655 1984
1656void glHint (int target, int mode) 1985void glHint (int target, int mode)
1657 1986
1658void glBlendFunc (int sfactor, int dfactor) 1987void glBlendFunc (int sfactor, int dfactor)
1659 1988
1989void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1990 CODE:
1991 gl_BlendFuncSeparate (sa, da, saa, daa);
1992
1660void glDepthMask (int flag) 1993void glDepthMask (int flag)
1661 1994
1662void glLogicOp (int opcode) 1995void glLogicOp (int opcode)
1663 1996
1664void glColorMask (int red, int green, int blue, int alpha) 1997void glColorMask (int red, int green, int blue, int alpha)
1668void glPushMatrix () 2001void glPushMatrix ()
1669 2002
1670void glPopMatrix () 2003void glPopMatrix ()
1671 2004
1672void glLoadIdentity () 2005void glLoadIdentity ()
2006
2007void glDrawBuffer (int buffer)
2008
2009void glReadBuffer (int buffer)
1673 2010
1674# near_ and far_ are due to microsofts buggy "c" compiler 2011# near_ and far_ are due to microsofts buggy "c" compiler
1675void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2012void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676 2013
1677# near_ and far_ are due to microsofts buggy "c" compiler 2014# near_ and far_ are due to microsofts buggy "c" compiler
1697 2034
1698void glEnd () 2035void glEnd ()
1699 2036
1700void glColor (float r, float g, float b, float a = 1.0) 2037void glColor (float r, float g, float b, float a = 1.0)
1701 PROTOTYPE: @ 2038 PROTOTYPE: @
2039 ALIAS:
2040 glColor_premultiply = 1
1702 CODE: 2041 CODE:
2042 if (ix)
2043 {
2044 r *= a;
2045 g *= a;
2046 b *= a;
2047 }
1703 // microsoft visual "c" rounds instead of truncating... 2048 // microsoft visual "c" rounds instead of truncating...
1704 glColor4ub (MIN ((int)(r * 255.f), 255), 2049 glColor4f (r, g, b, a);
1705 MIN ((int)(g * 255.f), 255),
1706 MIN ((int)(b * 255.f), 255),
1707 MIN ((int)(a * 255.f), 255));
1708 2050
1709void glInterleavedArrays (int format, int stride, char *data) 2051void glInterleavedArrays (int format, int stride, char *data)
1710 2052
1711void glDrawElements (int mode, int count, int type, char *indices) 2053void glDrawElements (int mode, int count, int type, char *indices)
1712 2054
1735 2077
1736void glBindTexture (int target, int name) 2078void glBindTexture (int target, int name)
1737 2079
1738void glConvolutionParameter (int target, int pname, float params) 2080void glConvolutionParameter (int target, int pname, float params)
1739 CODE: 2081 CODE:
1740 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2082 if (gl.ConvolutionParameterf)
2083 gl.ConvolutionParameterf (target, pname, params);
1741 2084
1742void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2085void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743 CODE: 2086 CODE:
1744 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2087 if (gl.ConvolutionFilter2D)
1745 (target, internalformat, width, height, format, type, data)); 2088 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746 2089
1747void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2090void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1748 CODE: 2091 CODE:
1749 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2092 if (gl.SeparableFilter2D)
1750 (target, internalformat, width, height, format, type, row, column)); 2093 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751 2094
1752void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2095void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753 2096
1754void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2097void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755 2098
1788 2131
1789void glEndList () 2132void glEndList ()
1790 2133
1791void glCallList (int list) 2134void glCallList (int list)
1792 2135
1793

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines