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.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines