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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.173 by root, Wed Apr 4 02:43:29 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // 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
19#include <assert.h>
12#include <math.h> 20#include <math.h>
13#include <string.h> 21#include <string.h>
14#include <stdio.h> 22#include <stdio.h>
15#include <stdlib.h> 23#include <stdlib.h>
16 24
18#include <SDL_endian.h> 26#include <SDL_endian.h>
19#include <SDL_image.h> 27#include <SDL_image.h>
20#include <SDL_mixer.h> 28#include <SDL_mixer.h>
21#include <SDL_opengl.h> 29#include <SDL_opengl.h>
22 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
23#include <glib/gmacros.h> 34#include <glib/gmacros.h>
24 35
25#include <pango/pango.h> 36#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 37
30#ifndef _WIN32 38#ifndef _WIN32
31# include <sys/types.h> 39# include <sys/types.h>
32# include <sys/socket.h> 40# include <sys/socket.h>
33# include <netinet/in.h> 41# include <netinet/in.h>
34# include <netinet/tcp.h> 42# include <netinet/tcp.h>
35# include <inttypes.h> 43# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 44#endif
44 45
45#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 47
47#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
48 49
49#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
51 52
52#define MIN_FONT_HEIGHT 10 53#define MIN_FONT_HEIGHT 10
54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
53 60
54static struct 61static struct
55{ 62{
56#define GL_FUNC(ptr,name) ptr name; 63#define GL_FUNC(ptr,name) ptr name;
57#include "glfunc.h" 64#include "glfunc.h"
66 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67 else 74 else
68 glBlendFunc (sa, da); 75 glBlendFunc (sa, da);
69} 76}
70 77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
71typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
72typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
73 86
74typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
88
89static int
90shape_attr_p (PangoLayoutRun *run)
91{
92 GSList *attrs = run->item->analysis.extra_attrs;
93
94 while (attrs)
95 {
96 PangoAttribute *attr = attrs->data;
97
98 if (attr->klass->type == PANGO_ATTR_SHAPE)
99 return 1;
100
101 attrs = attrs->next;
102 }
103
104 return 0;
105}
75 106
76typedef struct cf_layout { 107typedef struct cf_layout {
77 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
78 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
80 int base_height; 110 int base_height;
81 CFClient__Font font; 111 CFPlus__Font font;
82} *CFClient__Layout; 112} *CFPlus__Layout;
83 113
84static CFClient__Font default_font; 114static CFPlus__Font default_font;
85static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
86static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
87 117
88static void 118static void
89substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
90{ 120{
91 FcPatternAddBool (pattern, FC_HINTING, 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
92#ifdef FC_HINT_STYLE 122#ifdef FC_HINT_STYLE
93 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94#endif 124#endif
95#ifdef _WIN32
96 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97#else
98 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99#endif
100} 126}
101 127
102static void 128static void
103layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
104{ 130{
105 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
106 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
107 */ 133 */
108 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
112 138
113 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
114} 140}
115 141
116static void 142static void
117layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
118{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
119 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
120 149
121 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123 152
124 *w = (*w + 3) & ~3; 153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
125} 158}
126 159
127typedef uint16_t mapface; 160typedef uint16_t mapface;
128 161
129typedef struct { 162typedef struct {
132 float s, t; 165 float s, t;
133 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
134} maptex; 167} maptex;
135 168
136typedef struct { 169typedef struct {
137 int16_t darkness; 170 uint32_t player;
138 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
139} mapcell; 174} mapcell;
140 175
141typedef struct { 176typedef struct {
142 int32_t c0, c1; 177 int32_t c0, c1;
143 mapcell *col; 178 mapcell *col;
152 int texs; 187 int texs;
153 maptex *tex; 188 maptex *tex;
154 189
155 int32_t rows; 190 int32_t rows;
156 maprow *row; 191 maprow *row;
157} *CFClient__Map; 192} *CFPlus__Map;
158 193
159static char * 194static char *
160prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
161{ 196{
162 char *p; 197 char *p;
180 215
181#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183 218
184static maprow * 219static maprow *
185map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
186{ 221{
187 if (0 > y) 222 if (0 > y)
188 { 223 {
189 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
190 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
228 263
229 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
230} 265}
231 266
232static mapcell * 267static mapcell *
233map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
234{ 269{
235 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
236} 271}
237 272
238static void 273static void
239map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
240{ 275{
241 int r; 276 int r;
242 277
243 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
244 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
252 self->row = 0; 287 self->row = 0;
253 self->rows = 0; 288 self->rows = 0;
254} 289}
255 290
256static void 291static void
257map_blank (CFClient__Map self, int x0, int y0, int w, int h) 292map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258{ 293{
259 int x, y; 294 int x, y;
260 maprow *row; 295 maprow *row;
296 mapcell *cell;
261 297
262 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
263 if (y >= 0) 299 if (y >= 0)
264 { 300 {
265 if (y >= self->rows) 301 if (y >= self->rows)
271 if (x >= row->c0) 307 if (x >= row->c0)
272 { 308 {
273 if (x >= row->c1) 309 if (x >= row->c1)
274 break; 310 break;
275 311
276 row->col[x - row->c0].darkness = -1; 312 cell = row->col + x - row->c0;
313
314 cell->darkness = 0;
315 cell->stat_hp = 0;
316 cell->flags = 0;
317 cell->player = 0;
277 } 318 }
278 } 319 }
279} 320}
280 321
281static void 322static void
319 n |= n >> 16; 360 n |= n >> 16;
320 361
321 return n + 1; 362 return n + 1;
322} 363}
323 364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
324MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
325 370
326PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
327 372
328BOOT: 373BOOT:
329{ 374{
330 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
331 static const struct { 376 static const struct {
332 const char *name; 377 const char *name;
333 IV iv; 378 IV iv;
334 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
335# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
381 const_iv (SDLK_MODIFIER_MIN),
382 const_iv (SDLK_MODIFIER_MAX),
383
336 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
337 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
338 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
339 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
340 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
349 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
350 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
351 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
352 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
353 const_iv (SDL_USEREVENT), 401 const_iv (SDL_USEREVENT),
402
403 const_iv (SDL_APPINPUTFOCUS),
404 const_iv (SDL_APPMOUSEFOCUS),
405 const_iv (SDL_APPACTIVE),
406
354 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
355 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
356 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
357 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
358 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
413 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
414 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
415 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
416 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
417 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
418 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
419 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
420 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
421 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
422 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
423 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
424 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
425 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
426 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
427 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
428 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
429 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
430 const_iv (KMOD_CTRL),
431 const_iv (KMOD_SHIFT),
432 const_iv (KMOD_ALT),
433 const_iv (KMOD_META)
434# undef const_iv 488# undef const_iv
435 }; 489 };
436 490
437 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 491 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 492 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
493
494 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
495 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
439} 496}
497
498void
499weaken (SV *rv)
500 PROTOTYPE: $
501 CODE:
502 sv_rvweaken (rv);
503
504int
505in_destruct ()
506 CODE:
507 RETVAL = PL_main_cv == Nullcv;
508 OUTPUT:
509 RETVAL
510
511NV floor (NV x)
512
513NV ceil (NV x)
440 514
441void 515void
442pango_init () 516pango_init ()
443 CODE: 517 CODE:
444 // delayed, so it can pick up new fonts added by AddFontResourceEx
445{ 518{
446 {
447 ft2_fontmap = pango_ft2_font_map_new (); 519 opengl_fontmap = pango_opengl_font_map_new ();
448 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 520 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450 }
451 {
452 cairo_font_options_t *fopt = cairo_font_options_create ();
453 cairo_fontmap = pango_cairo_font_map_get_default ();
454 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455#ifdef _WIN32
456 // cairo looks like shit eaten twice on windows
457 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458#else
459 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460#endif
461 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463 pango_cairo_context_set_font_options (cairo_context, fopt);
464 cairo_font_options_destroy (fopt);
465 }
466} 522}
467 523
468int 524int
469SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
470 526
471void 527void
472SDL_Quit () 528SDL_Quit ()
473 529
474void 530void
481 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484 540
485 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487 543
488 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492 548
493 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 549 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550#if SDL_VERSION_ATLEAST(1,2,10)
551 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553#endif
494 554
495 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
496 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497 557
498 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
550 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
551 case SDL_KEYUP: 611 case SDL_KEYUP:
552 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
553 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
554 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 614 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
615 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
555 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
556 break; 617 break;
557 618
558 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
559 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
585 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587 break; 648 break;
588 } 649 }
589 650
590 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591 } 652 }
592} 653}
593 654
594int 655int
595Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 656Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
609#ifndef _WIN32 670#ifndef _WIN32
610 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
611#endif 672#endif
612 673
613void 674void
675win32_proxy_info ()
676 PPCODE:
677{
678#ifdef _WIN32
679 char buffer[2048];
680 DWORD buflen;
681
682 EXTEND (SP, 3);
683
684 buflen = sizeof (buffer);
685 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
686 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
687 {
688 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
689
690 buflen = sizeof (buffer);
691 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
692 {
693 PUSHs (newSVpv (buffer, 0));
694
695 buflen = sizeof (buffer);
696 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
697 PUSHs (newSVpv (buffer, 0));
698 }
699 }
700#endif
701}
702
703void
614add_font (char *file) 704add_font (char *file)
615 CODE: 705 CODE:
616 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617#ifdef _WIN32
618 // cairo... sigh... requires win2000
619 AddFontResourceEx (file, FR_PRIVATE, 0);
620#endif
621 707
622void 708void
623load_image_inline (SV *image_) 709load_image_inline (SV *image_)
624 ALIAS: 710 ALIAS:
625 load_image_file = 1 711 load_image_file = 1
667 753
668 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669 755
670 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
671 757
758 SDL_LockSurface (surface2);
672 EXTEND (SP, 5); 759 EXTEND (SP, 6);
673 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
674 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
675 SDL_LockSurface (surface2);
676 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677 SDL_UnlockSurface (surface2);
678 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 763 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
681 767
682 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
683 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
684} 770}
685 771
724 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
725#endif 811#endif
726 _exit (1); 812 _exit (1);
727 813
728void 814void
729_exit (int retval) 815_exit (int retval = 0)
730 CODE: 816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
731 _exit (retval); 820 _exit (retval);
821#endif
732 822
733MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
734 824
735CFClient::Font 825CFPlus::Font
736new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
737 CODE: 827 CODE:
738{ 828{
739 int count; 829 int count;
740 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
743} 833}
744 OUTPUT: 834 OUTPUT:
745 RETVAL 835 RETVAL
746 836
747void 837void
748DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
749 CODE: 839 CODE:
750 pango_font_description_free (self); 840 pango_font_description_free (self);
751 841
752void 842void
753make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
754 CODE: 844 CODE:
755 default_font = self; 845 default_font = self;
756 846
757MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
758 848
759CFClient::Layout 849void
760new (SV *class, int rgba = 0) 850reset_glyph_cache ()
851 CODE:
852 tc_clear ();
853
854CFPlus::Layout
855new (SV *class)
761 CODE: 856 CODE:
762 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
763 858
764 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
765 RETVAL->rgba = rgba;
766 RETVAL->r = 1.; 860 RETVAL->r = 1.;
767 RETVAL->g = 1.; 861 RETVAL->g = 1.;
768 RETVAL->b = 1.; 862 RETVAL->b = 1.;
769 RETVAL->a = 1.; 863 RETVAL->a = 1.;
770 RETVAL->base_height = MIN_FONT_HEIGHT; 864 RETVAL->base_height = MIN_FONT_HEIGHT;
774 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
775 OUTPUT: 869 OUTPUT:
776 RETVAL 870 RETVAL
777 871
778void 872void
779DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
780 CODE: 874 CODE:
781 g_object_unref (self->pl); 875 g_object_unref (self->pl);
782 Safefree (self); 876 Safefree (self);
783 877
784int
785is_rgba (CFClient::Layout self)
786 CODE:
787 RETVAL = self->rgba;
788 OUTPUT:
789 RETVAL
790
791void 878void
792set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
793 CODE: 880 CODE:
794{ 881{
795 STRLEN textlen; 882 STRLEN textlen;
796 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
797 884
798 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
799} 886}
800 887
801void 888void
802set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
803 CODE: 890 CODE:
804{ 891{
805 STRLEN textlen; 892 STRLEN textlen;
806 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
807 894
808 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
809} 896}
810 897
898void
899set_shapes (CFPlus::Layout self, ...)
900 CODE:
901{
902 PangoAttrList *attrs = 0;
903 const char *text = pango_layout_get_text (self->pl);
904 const char *pos = text;
905 int arg = 4;
906
907 while (arg < items && (pos = strstr (pos, OBJ_STR)))
908 {
909 PangoRectangle inkrect, rect;
910 PangoAttribute *attr;
911
912 int x = SvIV (ST (arg - 3));
913 int y = SvIV (ST (arg - 2));
914 int w = SvIV (ST (arg - 1));
915 int h = SvIV (ST (arg ));
916
917 inkrect.x = 0;
918 inkrect.y = 0;
919 inkrect.width = 0;
920 inkrect.height = 0;
921
922 rect.x = x * PANGO_SCALE;
923 rect.y = y * PANGO_SCALE;
924 rect.width = w * PANGO_SCALE;
925 rect.height = h * PANGO_SCALE;
926
927 if (!attrs)
928 attrs = pango_layout_get_attributes (self->pl);
929
930 attr = pango_attr_shape_new (&inkrect, &rect);
931 attr->start_index = pos - text;
932 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
933 pango_attr_list_insert (attrs, attr);
934
935 arg += 4;
936 pos += sizeof (OBJ_STR) - 1;
937 }
938
939 if (attrs)
940 pango_layout_set_attributes (self->pl, attrs);
941}
942
943void
944get_shapes (CFPlus::Layout self)
945 PPCODE:
946{
947 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
948
949 do
950 {
951 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
952
953 if (run && shape_attr_p (run))
954 {
955 PangoRectangle extents;
956 pango_layout_iter_get_run_extents (iter, 0, &extents);
957
958 EXTEND (SP, 2);
959 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
960 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
961 }
962 }
963 while (pango_layout_iter_next_run (iter));
964
965 pango_layout_iter_free (iter);
966}
967
968int
969has_wrapped (CFPlus::Layout self)
970 CODE:
971{
972 int lines = 1;
973 const char *text = pango_layout_get_text (self->pl);
974
975 while (*text)
976 lines += *text++ == '\n';
977
978 RETVAL = lines < pango_layout_get_line_count (self->pl);
979}
980 OUTPUT:
981 RETVAL
982
811SV * 983SV *
812get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
813 CODE: 985 CODE:
814 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815 sv_utf8_decode (RETVAL); 987 sv_utf8_decode (RETVAL);
816 OUTPUT: 988 OUTPUT:
817 RETVAL 989 RETVAL
818 990
819void 991void
820set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 992set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821 CODE: 993 CODE:
822 self->r = r; 994 self->r = r;
823 self->g = g; 995 self->g = g;
824 self->b = b; 996 self->b = b;
825 self->a = a; 997 self->a = a;
826 998
827void 999void
828set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829 CODE: 1001 CODE:
830 if (self->font != font) 1002 if (self->font != font)
831 { 1003 {
832 self->font = font; 1004 self->font = font;
833 layout_update_font (self); 1005 layout_update_font (self);
834 } 1006 }
835 1007
836void 1008void
837set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
838 CODE: 1010 CODE:
839 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
840 { 1012 {
841 self->base_height = base_height; 1013 self->base_height = base_height;
842 layout_update_font (self); 1014 layout_update_font (self);
843 } 1015 }
844 1016
845void 1017void
846set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
847 CODE: 1019 CODE:
848 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1020 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849 1021
850void 1022void
851set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
852 CODE: 1024 CODE:
853 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854 1026
855void 1027void
856set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
857 CODE: 1029 CODE:
858 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859 1031
860void 1032void
861set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
862 CODE: 1034 CODE:
863 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
864 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
865 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
867 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
868 ); 1040 );
869 1041
870void 1042void
871set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
872 CODE: 1044 CODE:
873 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874 1046
875void 1047void
876size (CFClient::Layout self) 1048size (CFPlus::Layout self)
877 PPCODE: 1049 PPCODE:
878{ 1050{
879 int w, h; 1051 int w, h;
880 1052
881 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
884 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
885 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
886} 1058}
887 1059
888int 1060int
1061descent (CFPlus::Layout self)
1062 CODE:
1063{
1064 PangoRectangle rect;
1065 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1066 pango_layout_line_get_pixel_extents (line, 0, &rect);
1067 RETVAL = PANGO_DESCENT (rect);
1068}
1069 OUTPUT:
1070 RETVAL
1071
1072int
889xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
890 CODE: 1074 CODE:
891{ 1075{
892 int index, trailing; 1076 int index, trailing;
893 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1077 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894 RETVAL = index; 1078 RETVAL = index + trailing;
895} 1079}
896 OUTPUT: 1080 OUTPUT:
897 RETVAL 1081 RETVAL
898 1082
899void 1083void
900cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
901 PPCODE: 1085 PPCODE:
902{ 1086{
903 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
904 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905 1089
908 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910} 1094}
911 1095
912void 1096void
913render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
914 PPCODE: 1098 PPCODE:
915{ 1099{
916 SV *retval; 1100 int line, x;
917 int w, h;
918 1101
919 layout_get_pixel_size (self, &w, &h); 1102 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1103 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
920 1104
921 if (self->rgba)
922 {
923 cairo_surface_t *surface;
924 cairo_t *cairo;
925
926 retval = newSV (w * h * 4);
927 SvPOK_only (retval);
928 SvCUR_set (retval, w * h * 4);
929
930 memset (SvPVX (retval), 0, w * h * 4);
931
932 surface = cairo_image_surface_create_for_data (
933 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
934 cairo = cairo_create (surface);
935 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937 pango_cairo_show_layout (cairo, self->pl);
938
939 cairo_destroy (cairo);
940 cairo_surface_destroy (surface);
941
942 // what a mess, and its premultiplied, too :(
943 {
944 uint32_t *p = (uint32_t *)SvPVX (retval);
945 uint32_t *e = p + w * h;
946
947 while (p < e)
948 {
949 uint32_t rgba = *p;
950 rgba = (rgba >> 24) | (rgba << 8);
951#if 0
952#ifdef _WIN32
953 {//D
954 uint8_t r = rgba >> 24;
955 uint8_t g = rgba >> 16;
956 uint8_t b = rgba >> 8;
957 uint8_t a = rgba >> 0;
958
959 rgba = (rgba & 0xffffff00) | a;
960 }
961#endif
962#endif
963 rgba = SDL_SwapBE32 (rgba);
964 *p++ = rgba;
965 }
966 }
967
968 EXTEND (SP, 5); 1105 EXTEND (SP, 2);
969 PUSHs (sv_2mortal (newSViv (w))); 1106 PUSHs (sv_2mortal (newSViv (line - 1)));
1107 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1108}
1109
1110void
1111line_x_to_index (CFPlus::Layout self, int line, int x)
1112 PPCODE:
1113{
1114 PangoLayoutLine *lp;
1115 int index, trailing;
1116
1117 if (line < 0)
1118 XSRETURN_EMPTY;
1119
1120 if (!(lp = pango_layout_get_line (self->pl, line)))
1121 XSRETURN_EMPTY; /* do better */
1122
1123 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1124
1125 EXTEND (SP, 2);
1126 if (GIMME_V == G_SCALAR)
970 PUSHs (sv_2mortal (newSViv (h))); 1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
971 PUSHs (sv_2mortal (retval));
972 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974 }
975 else 1128 else
976 { 1129 {
977 FT_Bitmap bitmap;
978
979 retval = newSV (w * h);
980 SvPOK_only (retval);
981 SvCUR_set (retval, w * h);
982
983 bitmap.rows = h;
984 bitmap.width = w;
985 bitmap.pitch = w;
986 bitmap.buffer = (unsigned char*)SvPVX (retval);
987 bitmap.num_grays = 256;
988 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990 memset (bitmap.buffer, 0, w * h);
991
992 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994 EXTEND (SP, 5);
995 PUSHs (sv_2mortal (newSViv (w))); 1130 PUSHs (sv_2mortal (newSViv (index)));
996 PUSHs (sv_2mortal (newSViv (h))); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
997 PUSHs (sv_2mortal (retval));
998 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000 } 1132 }
1001} 1133}
1002 1134
1135void
1136render (CFPlus::Layout self, float x, float y, int flags = 0)
1137 PPCODE:
1138 pango_opengl_render_layout_subpixel (
1139 self->pl,
1140 x * PANGO_SCALE, y * PANGO_SCALE,
1141 self->r, self->g, self->b, self->a,
1142 flags
1143 );
1144
1003MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
1004 1146
1005void 1147void
1006pad2pot (SV *data_, SV *w_, SV *h_) 1148pad2pot (SV *data_, SV *w_, SV *h_)
1007 CODE: 1149 CODE:
1008{ 1150{
1038 } 1180 }
1039 } 1181 }
1040} 1182}
1041 1183
1042void 1184void
1043draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1185draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
1045 ALIAS: 1187 ALIAS:
1046 draw_quad_alpha = 1 1188 draw_quad_alpha = 1
1047 draw_quad_alpha_premultiplied = 2 1189 draw_quad_alpha_premultiplied = 2
1048 CODE: 1190 CODE:
1086 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
1087 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1088 } 1230 }
1089} 1231}
1090 1232
1091MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1092 1234
1093CFClient::Map 1235CFPlus::Map
1094new (SV *class, int map_width, int map_height) 1236new (SV *class)
1095 CODE: 1237 CODE:
1096 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1097 RETVAL->x = 0; 1239 RETVAL->x = 0;
1098 RETVAL->y = 0; 1240 RETVAL->y = 0;
1099 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1100 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1101 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1102 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1103 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1104 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1105 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
1108 RETVAL->row = 0; 1250 RETVAL->row = 0;
1109 OUTPUT: 1251 OUTPUT:
1110 RETVAL 1252 RETVAL
1111 1253
1112void 1254void
1113DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1114 CODE: 1256 CODE:
1115{ 1257{
1116 map_clear (self); 1258 map_clear (self);
1117 Safefree (self->face); 1259 Safefree (self->face);
1118 Safefree (self->tex); 1260 Safefree (self->tex);
1119 Safefree (self); 1261 Safefree (self);
1120} 1262}
1121 1263
1122void 1264void
1265resize (CFPlus::Map self, int map_width, int map_height)
1266 CODE:
1267 self->w = map_width;
1268 self->h = map_height;
1269
1270void
1123clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1124 CODE: 1272 CODE:
1125 map_clear (self); 1273 map_clear (self);
1126 1274
1127void 1275void
1128set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1129 CODE: 1277 CODE:
1130{ 1278{
1131 while (self->faces <= face) 1279 while (self->faces <= face)
1132 { 1280 {
1133 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
1136 1284
1137 self->face [face] = texid; 1285 self->face [face] = texid;
1138} 1286}
1139 1287
1140void 1288void
1141set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1289set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1142 CODE: 1290 CODE:
1143{ 1291{
1144 while (self->texs <= texid) 1292 while (self->texs <= texid)
1145 { 1293 {
1146 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
1170 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1171 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172} 1320}
1173 1321
1174int 1322int
1175ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1176 ALIAS: 1324 ALIAS:
1177 oy = 1 1325 oy = 1
1178 x = 2 1326 x = 2
1179 y = 3 1327 y = 3
1180 w = 4 1328 w = 4
1191 } 1339 }
1192 OUTPUT: 1340 OUTPUT:
1193 RETVAL 1341 RETVAL
1194 1342
1195void 1343void
1196scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1197 CODE: 1345 CODE:
1198{ 1346{
1199 if (dx > 0) 1347 if (dx > 0)
1200 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1201 else if (dx < 0) 1349 else if (dx < 0)
1202 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1350 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1203 1351
1204 if (dy > 0) 1352 if (dy > 0)
1205 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1206 else if (dy < 0) 1354 else if (dy < 0)
1207 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1355 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1208 1356
1209 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1210 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1211 1359
1212 while (self->y < 0) 1360 while (self->y < 0)
1217 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1218 } 1366 }
1219} 1367}
1220 1368
1221void 1369void
1222map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223 CODE: 1371 CODE:
1224{ 1372{
1225 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1226 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1227 mapcell *cell; 1375 mapcell *cell;
1228 int x, y, flags; 1376 int x, y, flags;
1229 1377
1230 while (data < data_end) 1378 while (data < data_end - 1)
1231 { 1379 {
1232 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1233 1381
1234 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
1235 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
1236 1384
1237 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1238 1386
1239 if (flags & 15) 1387 if (flags & 15)
1240 { 1388 {
1241 if (cell->darkness < 0) 1389 if (!cell->darkness)
1242 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1243 cell->darkness = 0; 1392 cell->darkness = 256;
1244 cell->face [0] = 0;
1245 cell->face [1] = 0;
1246 cell->face [2] = 0;
1247 } 1393 }
1248 1394
1249 cell->darkness = flags & 8 ? *data++ : 255;
1250
1251 //TODO: don't trust server data to be in-range(!) 1395 //TODO: don't trust server data to be in-range(!)
1396
1397 if (flags & 8)
1398 {
1399 if (extmap)
1400 {
1401 uint8_t ext, cmd;
1402
1403 do
1404 {
1405 ext = *data++;
1406 cmd = ext & 0x3f;
1407
1408 if (cmd < 4)
1409 cell->darkness = 255 - ext * 64 + 1;
1410 else if (cmd == 5) // health
1411 {
1412 cell->stat_width = 1;
1413 cell->stat_hp = *data++;
1414 }
1415 else if (cmd == 6) // monster width
1416 cell->stat_width = *data++ + 1;
1417 else if (cmd == 0x47)
1418 {
1419 if (*data == 8)
1420 ; // decode player uuid
1421
1422 data += *data + 1;
1423 }
1424 else if (cmd == 8) // cell flags
1425 cell->flags = *data++;
1426 else if (ext & 0x40) // unknown, multibyte => skip
1427 data += *data + 1;
1428 else
1429 data++;
1430 }
1431 while (ext & 0x80);
1432 }
1433 else
1434 cell->darkness = *data++ + 1;
1435 }
1252 1436
1253 if (flags & 4) 1437 if (flags & 4)
1254 { 1438 {
1255 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1439 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256 } 1440 }
1264 { 1448 {
1265 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1449 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266 } 1450 }
1267 } 1451 }
1268 else 1452 else
1269 cell->darkness = -1; 1453 cell->darkness = 0;
1270 } 1454 }
1271} 1455}
1272 1456
1273SV * 1457SV *
1274mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275 CODE: 1459 CODE:
1276{ 1460{
1277 int x1, x; 1461 int x1, x;
1278 int y1, y; 1462 int y1, y;
1279 int z; 1463 int z;
1302 1486
1303 for (z = 0; z <= 0; z++) 1487 for (z = 0; z <= 0; z++)
1304 { 1488 {
1305 mapface face = cell->face [z]; 1489 mapface face = cell->face [z];
1306 1490
1307 if (face) 1491 if (face > 0 && face < self->texs)
1308 { 1492 {
1309 maptex tex = self->tex [face]; 1493 maptex tex = self->tex [face];
1310 int a0 = 255 - tex.a; 1494 int a0 = 255 - tex.a;
1311 int a1 = tex.a; 1495 int a1 = tex.a;
1312 1496
1329} 1513}
1330 OUTPUT: 1514 OUTPUT:
1331 RETVAL 1515 RETVAL
1332 1516
1333void 1517void
1334draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1518draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1335 PPCODE: 1519 CODE:
1336{ 1520{
1337 int vx, vy;
1338 int x, y, z; 1521 int x, y, z;
1339 int last_name; 1522 int last_name;
1340 mapface face; 1523 mapface face;
1341 int sw4 = (sw + 3) & ~3;
1342 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1343 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1344
1345 memset (darkness, 255, sw4 * sh);
1346 SvPOK_only (darkness_sv);
1347 SvCUR_set (darkness_sv, sw4 * sh);
1348
1349 vx = self->x + (self->w - sw) / 2 - shift_x;
1350 vy = self->y + (self->h - sh) / 2 - shift_y;
1351
1352 /*
1353 int vx = self->vx = self->w >= sw
1354 ? self->x + (self->w - sw) / 2
1355 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1356
1357 int vy = self->vy = self->h >= sh
1358 ? self->y + (self->h - sh) / 2
1359 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360 */
1361 1524
1362 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1363 1526
1527 glEnable (GL_BLEND);
1364 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365 glEnable (GL_BLEND);
1366 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1367 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368 1531
1369 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1370 1533
1371 last_name = 0; 1534 last_name = 0;
1372 1535
1536 mx += self->x;
1537 my += self->y;
1538
1373 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1374 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1375 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1376 { 1542 {
1377 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1378 1544
1379 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1380 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1381 { 1547 {
1382 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1383
1384 darkness[y * sw4 + x] = cell->darkness < 0
1385 ? 255 - FOW_DARKNESS
1386 : 255 - cell->darkness;
1387 1549
1388 face = cell->face [z]; 1550 face = cell->face [z];
1389 1551
1390 if (face) 1552 if (face > 0 && face < self->texs)
1391 { 1553 {
1392 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1393
1394 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * T - tex.w;
1395 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * T - tex.h;
1396 1557
1397 if (last_name != tex.name) 1558 if (last_name != tex.name)
1398 { 1559 {
1399 glEnd (); 1560 glEnd ();
1400 last_name = tex.name;
1401 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1402 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1403 } 1563 }
1404 1564
1405 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1406 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1407 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1567 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1408 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1409 } 1569 }
1570
1571 if (cell->flags && z == 2)
1572 {
1573 if (cell->flags & 1)
1574 {
1575 maptex tex = self->tex [1];
1576 int px = (x + 1) * T - tex.w + 2;
1577 int py = (y + 1) * T - tex.h - 6;
1578
1579 glEnd ();
1580 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581 glBegin (GL_QUADS);
1582
1583 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587 }
1588 }
1410 } 1589 }
1411 } 1590 }
1412 1591
1413 glEnd (); 1592 glEnd ();
1414 1593
1415 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1416 glDisable (GL_BLEND); 1595 glDisable (GL_BLEND);
1596
1597 // top layer: overlays such as the health bar
1598 for (y = 0; y < sh; y++)
1599 if (0 <= y + my && y + my < self->rows)
1600 {
1601 maprow *row = self->row + (y + my);
1602
1603 for (x = 0; x < sw; x++)
1604 if (row->c0 <= x + mx && x + mx < row->c1)
1605 {
1606 mapcell *cell = row->col + (x + mx - row->c0);
1607
1608 int px = x * T;
1609 int py = y * T;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * T;
1614 int thick = (sh * T / 32) / 28 + 1 + cell->stat_width;
1615
1616 glColor3ub (0, 0, 0);
1617 glRectf (px + 1, py - thick - 2,
1618 px + width - 1, py);
1619
1620 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1621 glRectf (px + 2,
1622 py - thick - 1,
1623 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1624 }
1625 }
1626 }
1627}
1628
1629void
1630draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1631 CODE:
1632{
1633 static float color[16][3] = {
1634 { 0.00F, 0.00F, 0.00F },
1635 { 1.00F, 1.00F, 1.00F },
1636 { 0.00F, 0.00F, 0.55F },
1637 { 1.00F, 0.00F, 0.00F },
1638
1639 { 1.00F, 0.54F, 0.00F },
1640 { 0.11F, 0.56F, 1.00F },
1641 { 0.93F, 0.46F, 0.00F },
1642 { 0.18F, 0.54F, 0.34F },
1643
1644 { 0.56F, 0.73F, 0.56F },
1645 { 0.80F, 0.80F, 0.80F },
1646 { 0.55F, 0.41F, 0.13F },
1647 { 0.99F, 0.77F, 0.26F },
1648
1649 { 0.74F, 0.65F, 0.41F },
1650
1651 { 0.00F, 1.00F, 1.00F },
1652 { 1.00F, 0.00F, 1.00F },
1653 { 1.00F, 1.00F, 0.00F },
1654 };
1655
1656 int x, y;
1657
1658 glEnable (GL_TEXTURE_2D);
1659 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1660 glEnable (GL_BLEND);
1661 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1662 glBegin (GL_QUADS);
1663
1664 for (y = 0; y < h; y++)
1665 for (x = 0; x < w; x++)
1666 {
1667 unsigned char m = data [x + y * w];
1668
1669 if (m)
1670 {
1671 float *c = color [m & 15];
1672
1673 float tx1 = m & 0x40 ? 0.5 : 0.;
1674 float tx2 = tx1 + 0.5;
1675
1676 glColor4f (c[0], c[1], c[2], 0.75);
1677 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1678 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1679 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1680 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1681 }
1682 }
1683
1684 glEnd ();
1685 glDisable (GL_BLEND);
1686 glDisable (GL_TEXTURE_2D);
1687}
1688
1689void
1690fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1691 PPCODE:
1692{
1693 int x, y;
1694 int sw4 = (sw + 3) & ~3;
1695 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1696 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1697
1698 memset (darkness, 255, sw4 * sh);
1699 SvPOK_only (darkness_sv);
1700 SvCUR_set (darkness_sv, sw4 * sh);
1701
1702 mx += self->x;
1703 my += self->y;
1704
1705 for (y = 0; y < sh; y++)
1706 if (0 <= y + my && y + my < self->rows)
1707 {
1708 maprow *row = self->row + (y + my);
1709
1710 for (x = 0; x < sw; x++)
1711 if (row->c0 <= x + mx && x + mx < row->c1)
1712 {
1713 mapcell *cell = row->col + (x + mx - row->c0);
1714
1715 darkness[y * sw4 + x] = cell->darkness
1716 ? 255 - (cell->darkness - 1)
1717 : 255 - FOW_DARKNESS;
1718 }
1719 }
1417 1720
1418 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1419 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1420 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1421 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1422} 1725}
1423 1726
1424SV * 1727SV *
1425get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1728get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426 CODE: 1729 CODE:
1427{ 1730{
1428 int x, y, x1, y1; 1731 int x, y, x1, y1;
1429 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1430 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1492} 1795}
1493 OUTPUT: 1796 OUTPUT:
1494 RETVAL 1797 RETVAL
1495 1798
1496void 1799void
1497set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498 PPCODE: 1801 PPCODE:
1499{ 1802{
1500 int x, y, z; 1803 int x, y, z;
1501 int w, h; 1804 int w, h;
1502 int x1, y1; 1805 int x1, y1;
1534 1837
1535 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1536 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1537 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1538 1841
1539 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1540 { 1843 {
1541 cell->darkness = -1; 1844 cell->darkness = 0;
1542 1845
1543 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1544 { 1847 {
1545 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1546 1849
1551 } 1854 }
1552 } 1855 }
1553 } 1856 }
1554} 1857}
1555 1858
1556MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557 1860
1558CFClient::MixChunk 1861CFPlus::MixChunk
1559new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1560 CODE: 1863 CODE:
1561 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1562 OUTPUT: 1865 OUTPUT:
1563 RETVAL 1866 RETVAL
1564 1867
1565void 1868void
1566DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1567 CODE: 1870 CODE:
1568 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1569 1872
1570int 1873int
1571volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1572 CODE: 1875 CODE:
1573 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1574 OUTPUT: 1877 OUTPUT:
1575 RETVAL 1878 RETVAL
1576 1879
1577int 1880int
1578play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1881play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579 CODE: 1882 CODE:
1580 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581 OUTPUT: 1884 OUTPUT:
1582 RETVAL 1885 RETVAL
1583 1886
1584MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585 1888
1586int 1889int
1587volume (int volume = -1) 1890volume (int volume = -1)
1588 CODE: 1891 CODE:
1589 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1590 OUTPUT: 1893 OUTPUT:
1591 RETVAL 1894 RETVAL
1592 1895
1593CFClient::MixMusic 1896CFPlus::MixMusic
1594new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1595 CODE: 1898 CODE:
1596 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1597 OUTPUT: 1900 OUTPUT:
1598 RETVAL 1901 RETVAL
1599 1902
1600void 1903void
1601DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1602 CODE: 1905 CODE:
1603 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1604 1907
1605int 1908int
1606play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1607 CODE: 1910 CODE:
1608 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1609 OUTPUT: 1912 OUTPUT:
1610 RETVAL 1913 RETVAL
1611 1914
1612MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613 1916
1614BOOT: 1917BOOT:
1615{ 1918{
1616 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617 static const struct { 1920 static const struct {
1618 const char *name; 1921 const char *name;
1619 IV iv; 1922 IV iv;
1620 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1621# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1628 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1629 const_iv (GL_DEPTH_TEST), 1932 const_iv (GL_DEPTH_TEST),
1630 const_iv (GL_ALPHA_TEST), 1933 const_iv (GL_ALPHA_TEST),
1631 const_iv (GL_NORMALIZE), 1934 const_iv (GL_NORMALIZE),
1632 const_iv (GL_RESCALE_NORMAL), 1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1633 const_iv (GL_AND), 1938 const_iv (GL_AND),
1634 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1635 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1636 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1637 const_iv (GL_DST_ALPHA), 1942 const_iv (GL_DST_ALPHA),
1638 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1640 const_iv (GL_SRC_ALPHA_SATURATE), 1945 const_iv (GL_SRC_ALPHA_SATURATE),
1641 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1642 const_iv (GL_RGBA), 1947 const_iv (GL_RGBA),
1948 const_iv (GL_RGBA4),
1949 const_iv (GL_RGBA8),
1950 const_iv (GL_RGB5_A1),
1643 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1644 const_iv (GL_UNSIGNED_SHORT), 1952 const_iv (GL_UNSIGNED_SHORT),
1645 const_iv (GL_UNSIGNED_INT), 1953 const_iv (GL_UNSIGNED_INT),
1646 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1647 const_iv (GL_INTENSITY), 1955 const_iv (GL_INTENSITY),
1679 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1680 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1681 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1682 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1683 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1684 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1685 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1686 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1687 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1688 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
1721 OUTPUT: 2030 OUTPUT:
1722 RETVAL 2031 RETVAL
1723 2032
1724int glGetError () 2033int glGetError ()
1725 2034
2035void glFinish ()
2036
1726void glClear (int mask) 2037void glClear (int mask)
1727 2038
1728void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1729 PROTOTYPE: @ 2040 PROTOTYPE: @
1730 2041
1753void glPushMatrix () 2064void glPushMatrix ()
1754 2065
1755void glPopMatrix () 2066void glPopMatrix ()
1756 2067
1757void glLoadIdentity () 2068void glLoadIdentity ()
2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
1758 2073
1759# near_ and far_ are due to microsofts buggy "c" compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
1760void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2075void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761 2076
1762# near_ and far_ are due to microsofts buggy "c" compiler 2077# near_ and far_ are due to microsofts buggy "c" compiler
1792 r *= a; 2107 r *= a;
1793 g *= a; 2108 g *= a;
1794 b *= a; 2109 b *= a;
1795 } 2110 }
1796 // microsoft visual "c" rounds instead of truncating... 2111 // microsoft visual "c" rounds instead of truncating...
1797 glColor4ub (MIN ((int)(r * 256.f), 255), 2112 glColor4f (r, g, b, a);
1798 MIN ((int)(g * 256.f), 255),
1799 MIN ((int)(b * 256.f), 255),
1800 MIN ((int)(a * 256.f), 255));
1801 2113
1802void glInterleavedArrays (int format, int stride, char *data) 2114void glInterleavedArrays (int format, int stride, char *data)
1803 2115
1804void glDrawElements (int mode, int count, int type, char *indices) 2116void glDrawElements (int mode, int count, int type, char *indices)
1805 2117
1882 2194
1883void glEndList () 2195void glEndList ()
1884 2196
1885void glCallList (int list) 2197void glCallList (int list)
1886 2198
1887

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines