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.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
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>
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>
33# include <netinet/tcp.h> 42# include <netinet/tcp.h>
34# include <inttypes.h> 43# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 44#endif
43 45
44#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 47
46#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
47 49
48#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
50 52
51#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
52 60
53static struct 61static struct
54{ 62{
55#define GL_FUNC(ptr,name) ptr name; 63#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 64#include "glfunc.h"
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 74 else
67 glBlendFunc (sa, da); 75 glBlendFunc (sa, da);
68} 76}
69 77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
70typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
72 86
73typedef 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}
74 106
75typedef struct cf_layout { 107typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 108 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 109 float r, g, b, a; // default color for rgba mode
79 int base_height; 110 int base_height;
80 CFClient__Font font; 111 CFPlus__Font font;
81} *CFClient__Layout; 112} *CFPlus__Layout;
82 113
83static CFClient__Font default_font; 114static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 115static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 116static PangoFontMap *opengl_fontmap;
86 117
87static void 118static void
88substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
89{ 120{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
91#ifdef _WIN32 122#ifdef FC_HINT_STYLE
92 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93#else 124#endif
94 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95#endif
96} 126}
97 127
98static void 128static void
99layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
100{ 130{
101 /* 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
102 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
103 */ 133 */
104 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
108 138
109 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
110} 140}
111 141
112static void 142static void
113layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
114{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
115 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
116 149
117 if (!*w) *w = 1; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118 if (!*h) *h = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119 152
120 *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;
121} 158}
122 159
123typedef uint16_t mapface; 160typedef uint16_t mapface;
124 161
125typedef struct { 162typedef struct {
128 float s, t; 165 float s, t;
129 uint8_t r, g, b, a; 166 uint8_t r, g, b, a;
130} maptex; 167} maptex;
131 168
132typedef struct { 169typedef struct {
133 int16_t darkness; 170 uint32_t player;
134 mapface face[3]; 171 mapface face[3];
172 uint16_t darkness;
173 uint8_t stat_width, stat_hp, flags;
135} mapcell; 174} mapcell;
136 175
137typedef struct { 176typedef struct {
138 int32_t c0, c1; 177 int32_t c0, c1;
139 mapcell *col; 178 mapcell *col;
148 int texs; 187 int texs;
149 maptex *tex; 188 maptex *tex;
150 189
151 int32_t rows; 190 int32_t rows;
152 maprow *row; 191 maprow *row;
153} *CFClient__Map; 192} *CFPlus__Map;
154 193
155static char * 194static char *
156prepend (char *ptr, int sze, int inc) 195prepend (char *ptr, int sze, int inc)
157{ 196{
158 char *p; 197 char *p;
176 215
177#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))
178#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))
179 218
180static maprow * 219static maprow *
181map_get_row (CFClient__Map self, int y) 220map_get_row (CFPlus__Map self, int y)
182{ 221{
183 if (0 > y) 222 if (0 > y)
184 { 223 {
185 int extend = - y + MAP_EXTEND_Y; 224 int extend = - y + MAP_EXTEND_Y;
186 Prepend (maprow, self->row, self->rows, extend); 225 Prepend (maprow, self->row, self->rows, extend);
224 263
225 return row->col + (x - row->c0); 264 return row->col + (x - row->c0);
226} 265}
227 266
228static mapcell * 267static mapcell *
229map_get_cell (CFClient__Map self, int x, int y) 268map_get_cell (CFPlus__Map self, int x, int y)
230{ 269{
231 return row_get_cell (map_get_row (self, y), x); 270 return row_get_cell (map_get_row (self, y), x);
232} 271}
233 272
234static void 273static void
235map_clear (CFClient__Map self) 274map_clear (CFPlus__Map self)
236{ 275{
237 int r; 276 int r;
238 277
239 for (r = 0; r < self->rows; r++) 278 for (r = 0; r < self->rows; r++)
240 Safefree (self->row[r].col); 279 Safefree (self->row[r].col);
248 self->row = 0; 287 self->row = 0;
249 self->rows = 0; 288 self->rows = 0;
250} 289}
251 290
252static void 291static void
253map_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)
254{ 293{
255 int x, y; 294 int x, y;
256 maprow *row; 295 maprow *row;
296 mapcell *cell;
257 297
258 for (y = y0; y < y0 + h; y++) 298 for (y = y0; y < y0 + h; y++)
259 if (y >= 0) 299 if (y >= 0)
260 { 300 {
261 if (y >= self->rows) 301 if (y >= self->rows)
267 if (x >= row->c0) 307 if (x >= row->c0)
268 { 308 {
269 if (x >= row->c1) 309 if (x >= row->c1)
270 break; 310 break;
271 311
272 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;
273 } 318 }
274 } 319 }
275} 320}
276 321
277static void 322static void
298 ev.data2 = 0; 343 ev.data2 = 0;
299 344
300 SDL_PushEvent ((SDL_Event *)&ev); 345 SDL_PushEvent ((SDL_Event *)&ev);
301} 346}
302 347
348static unsigned int
349minpot (unsigned int n)
350{
351 if (!n)
352 return 0;
353
354 --n;
355
356 n |= n >> 1;
357 n |= n >> 2;
358 n |= n >> 4;
359 n |= n >> 8;
360 n |= n >> 16;
361
362 return n + 1;
363}
364
365/* SDL should provide this, really. */
366#define SDLK_MODIFIER_MIN 300
367#define SDLK_MODIFIER_MAX 314
368
303MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
304 370
305PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
306 372
307BOOT: 373BOOT:
308{ 374{
309 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
310 static const struct { 376 static const struct {
311 const char *name; 377 const char *name;
312 IV iv; 378 IV iv;
313 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
314# 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
315 const_iv (SDL_ACTIVEEVENT), 384 const_iv (SDL_ACTIVEEVENT),
316 const_iv (SDL_KEYDOWN), 385 const_iv (SDL_KEYDOWN),
317 const_iv (SDL_KEYUP), 386 const_iv (SDL_KEYUP),
318 const_iv (SDL_MOUSEMOTION), 387 const_iv (SDL_MOUSEMOTION),
319 const_iv (SDL_MOUSEBUTTONDOWN), 388 const_iv (SDL_MOUSEBUTTONDOWN),
328 const_iv (SDL_EVENT_RESERVEDA), 397 const_iv (SDL_EVENT_RESERVEDA),
329 const_iv (SDL_EVENT_RESERVEDB), 398 const_iv (SDL_EVENT_RESERVEDB),
330 const_iv (SDL_VIDEORESIZE), 399 const_iv (SDL_VIDEORESIZE),
331 const_iv (SDL_VIDEOEXPOSE), 400 const_iv (SDL_VIDEOEXPOSE),
332 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
333 const_iv (SDLK_KP0), 407 const_iv (SDLK_KP0),
334 const_iv (SDLK_KP1), 408 const_iv (SDLK_KP1),
335 const_iv (SDLK_KP2), 409 const_iv (SDLK_KP2),
336 const_iv (SDLK_KP3), 410 const_iv (SDLK_KP3),
337 const_iv (SDLK_KP4), 411 const_iv (SDLK_KP4),
392 const_iv (SDLK_BREAK), 466 const_iv (SDLK_BREAK),
393 const_iv (SDLK_MENU), 467 const_iv (SDLK_MENU),
394 const_iv (SDLK_POWER), 468 const_iv (SDLK_POWER),
395 const_iv (SDLK_EURO), 469 const_iv (SDLK_EURO),
396 const_iv (SDLK_UNDO), 470 const_iv (SDLK_UNDO),
471
397 const_iv (KMOD_NONE), 472 const_iv (KMOD_NONE),
473 const_iv (KMOD_SHIFT),
398 const_iv (KMOD_LSHIFT), 474 const_iv (KMOD_LSHIFT),
399 const_iv (KMOD_RSHIFT), 475 const_iv (KMOD_RSHIFT),
476 const_iv (KMOD_CTRL),
400 const_iv (KMOD_LCTRL), 477 const_iv (KMOD_LCTRL),
401 const_iv (KMOD_RCTRL), 478 const_iv (KMOD_RCTRL),
479 const_iv (KMOD_ALT),
402 const_iv (KMOD_LALT), 480 const_iv (KMOD_LALT),
403 const_iv (KMOD_RALT), 481 const_iv (KMOD_RALT),
482 const_iv (KMOD_META),
404 const_iv (KMOD_LMETA), 483 const_iv (KMOD_LMETA),
405 const_iv (KMOD_RMETA), 484 const_iv (KMOD_RMETA),
406 const_iv (KMOD_NUM), 485 const_iv (KMOD_NUM),
407 const_iv (KMOD_CAPS), 486 const_iv (KMOD_CAPS),
408 const_iv (KMOD_MODE), 487 const_iv (KMOD_MODE),
409 const_iv (KMOD_CTRL),
410 const_iv (KMOD_SHIFT),
411 const_iv (KMOD_ALT),
412 const_iv (KMOD_META)
413# undef const_iv 488# undef const_iv
414 }; 489 };
415 490
416 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; )
417 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);
418} 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)
419 514
420void 515void
421pango_init () 516pango_init ()
422 CODE: 517 CODE:
423{ 518{
424 // delayed, so it can pick up new fonts added by AddFontResourceEx
425 ft2_fontmap = pango_ft2_font_map_new (); 519 opengl_fontmap = pango_opengl_font_map_new ();
426 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);
427 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 521 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429 cairo_fontmap = pango_cairo_font_map_get_default ();
430 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431} 522}
432 523
433int 524int
434SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 525SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
435 526
436void 527void
437SDL_Quit () 528SDL_Quit ()
438 529
439void 530void
446 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 537 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 538 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 539 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449 540
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 541 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 542 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452 543
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 544 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 545 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 546 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 547 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457 548
458 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
459 554
460 SDL_EnableUNICODE (1); 555 SDL_EnableUNICODE (1);
461 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 556 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462 557
463 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 558 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
515 case SDL_KEYDOWN: 610 case SDL_KEYDOWN:
516 case SDL_KEYUP: 611 case SDL_KEYUP:
517 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 612 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
518 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 613 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
519 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 */
520 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 616 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
521 break; 617 break;
522 618
523 case SDL_ACTIVEEVENT: 619 case SDL_ACTIVEEVENT:
524 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 620 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
550 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 646 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 647 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552 break; 648 break;
553 } 649 }
554 650
555 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 651 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556 } 652 }
557} 653}
558 654
559int 655int
560Mix_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)
574#ifndef _WIN32 670#ifndef _WIN32
575 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 671 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
576#endif 672#endif
577 673
578void 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
579add_font (char *file) 704add_font (char *file)
580 CODE: 705 CODE:
581 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 706 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582#ifdef _WIN32
583 // cairo... sigh... requires win2000
584 AddFontResourceEx (file, FR_PRIVATE, 0);
585#endif
586 707
587void 708void
588load_image_inline (SV *image_) 709load_image_inline (SV *image_)
589 ALIAS: 710 ALIAS:
590 load_image_file = 1 711 load_image_file = 1
632 753
633 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 754 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634 755
635 assert (surface2->pitch == surface2->w * 4); 756 assert (surface2->pitch == surface2->w * 4);
636 757
758 SDL_LockSurface (surface2);
637 EXTEND (SP, 5); 759 EXTEND (SP, 6);
638 PUSHs (sv_2mortal (newSViv (surface2->w))); 760 PUSHs (sv_2mortal (newSViv (surface2->w)));
639 PUSHs (sv_2mortal (newSViv (surface2->h))); 761 PUSHs (sv_2mortal (newSViv (surface2->h)));
640 SDL_LockSurface (surface2);
641 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 762 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642 SDL_UnlockSurface (surface2);
643 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)));
644 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 764 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 765 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
766 SDL_UnlockSurface (surface2);
646 767
647 SDL_FreeSurface (surface); 768 SDL_FreeSurface (surface);
648 SDL_FreeSurface (surface2); 769 SDL_FreeSurface (surface2);
649} 770}
650 771
686 CODE: 807 CODE:
687 fprintf (stderr, "FATAL: %s\n", message); 808 fprintf (stderr, "FATAL: %s\n", message);
688#ifdef _WIN32 809#ifdef _WIN32
689 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 810 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
690#endif 811#endif
691 exit (1); 812 _exit (1);
692 813
814void
815_exit (int retval = 0)
816 CODE:
817#ifdef WIN32
818 ExitThread (retval); // unclean, please beam me up
819#else
820 _exit (retval);
821#endif
822
693MODULE = CFClient PACKAGE = CFClient::Font 823MODULE = CFPlus PACKAGE = CFPlus::Font
694 824
695CFClient::Font 825CFPlus::Font
696new_from_file (SV *class, char *path, int id = 0) 826new_from_file (SV *class, char *path, int id = 0)
697 CODE: 827 CODE:
698{ 828{
699 int count; 829 int count;
700 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 830 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
703} 833}
704 OUTPUT: 834 OUTPUT:
705 RETVAL 835 RETVAL
706 836
707void 837void
708DESTROY (CFClient::Font self) 838DESTROY (CFPlus::Font self)
709 CODE: 839 CODE:
710 pango_font_description_free (self); 840 pango_font_description_free (self);
711 841
712void 842void
713make_default (CFClient::Font self) 843make_default (CFPlus::Font self)
714 CODE: 844 CODE:
715 default_font = self; 845 default_font = self;
716 846
717MODULE = CFClient PACKAGE = CFClient::Layout 847MODULE = CFPlus PACKAGE = CFPlus::Layout
718 848
719CFClient::Layout 849void
720new (SV *class, int rgba = 0) 850reset_glyph_cache ()
721 CODE: 851 CODE:
722#if _WIN32 852 tc_clear ();
723 //rgba = 0;//D makes text nicer, breaks TextView 853
724#endif 854CFPlus::Layout
725 rgba=1;//D 855new (SV *class)
856 CODE:
726 New (0, RETVAL, 1, struct cf_layout); 857 New (0, RETVAL, 1, struct cf_layout);
727 858
728 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 859 RETVAL->pl = pango_layout_new (opengl_context);
729 RETVAL->rgba = rgba;
730 RETVAL->r = 1.; 860 RETVAL->r = 1.;
731 RETVAL->g = 1.; 861 RETVAL->g = 1.;
732 RETVAL->b = 1.; 862 RETVAL->b = 1.;
733 RETVAL->a = 1.; 863 RETVAL->a = 1.;
734 RETVAL->base_height = MIN_FONT_HEIGHT; 864 RETVAL->base_height = MIN_FONT_HEIGHT;
738 layout_update_font (RETVAL); 868 layout_update_font (RETVAL);
739 OUTPUT: 869 OUTPUT:
740 RETVAL 870 RETVAL
741 871
742void 872void
743DESTROY (CFClient::Layout self) 873DESTROY (CFPlus::Layout self)
744 CODE: 874 CODE:
745 g_object_unref (self->pl); 875 g_object_unref (self->pl);
746 Safefree (self); 876 Safefree (self);
747 877
748int
749is_rgba (CFClient::Layout self)
750 CODE:
751 RETVAL = self->rgba;
752 OUTPUT:
753 RETVAL
754
755void 878void
756set_text (CFClient::Layout self, SV *text_) 879set_text (CFPlus::Layout self, SV *text_)
757 CODE: 880 CODE:
758{ 881{
759 STRLEN textlen; 882 STRLEN textlen;
760 char *text = SvPVutf8 (text_, textlen); 883 char *text = SvPVutf8 (text_, textlen);
761 884
762 pango_layout_set_text (self->pl, text, textlen); 885 pango_layout_set_text (self->pl, text, textlen);
763} 886}
764 887
765void 888void
766set_markup (CFClient::Layout self, SV *text_) 889set_markup (CFPlus::Layout self, SV *text_)
767 CODE: 890 CODE:
768{ 891{
769 STRLEN textlen; 892 STRLEN textlen;
770 char *text = SvPVutf8 (text_, textlen); 893 char *text = SvPVutf8 (text_, textlen);
771 894
772 pango_layout_set_markup (self->pl, text, textlen); 895 pango_layout_set_markup (self->pl, text, textlen);
773} 896}
774 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
775SV * 983SV *
776get_text (CFClient::Layout self) 984get_text (CFPlus::Layout self)
777 CODE: 985 CODE:
778 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 986 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779 SvUTF8_on (RETVAL); 987 sv_utf8_decode (RETVAL);
780 OUTPUT: 988 OUTPUT:
781 RETVAL 989 RETVAL
782 990
783void 991void
784set_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.)
785 CODE: 993 CODE:
786 self->r = r; 994 self->r = r;
787 self->g = g; 995 self->g = g;
788 self->b = b; 996 self->b = b;
789 self->a = a; 997 self->a = a;
790 998
791void 999void
792set_font (CFClient::Layout self, CFClient::Font font = 0) 1000set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793 CODE: 1001 CODE:
794 if (self->font != font) 1002 if (self->font != font)
795 { 1003 {
796 self->font = font; 1004 self->font = font;
797 layout_update_font (self); 1005 layout_update_font (self);
798 } 1006 }
799 1007
800void 1008void
801set_height (CFClient::Layout self, int base_height) 1009set_height (CFPlus::Layout self, int base_height)
802 CODE: 1010 CODE:
803 if (self->base_height != base_height) 1011 if (self->base_height != base_height)
804 { 1012 {
805 self->base_height = base_height; 1013 self->base_height = base_height;
806 layout_update_font (self); 1014 layout_update_font (self);
807 } 1015 }
808 1016
809void 1017void
810set_width (CFClient::Layout self, int max_width = -1) 1018set_width (CFPlus::Layout self, int max_width = -1)
811 CODE: 1019 CODE:
812 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);
813 1021
814void 1022void
815set_indent (CFClient::Layout self, int indent) 1023set_indent (CFPlus::Layout self, int indent)
816 CODE: 1024 CODE:
817 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1025 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818 1026
819void 1027void
820set_spacing (CFClient::Layout self, int spacing) 1028set_spacing (CFPlus::Layout self, int spacing)
821 CODE: 1029 CODE:
822 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1030 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823 1031
824void 1032void
825set_ellipsise (CFClient::Layout self, int ellipsise) 1033set_ellipsise (CFPlus::Layout self, int ellipsise)
826 CODE: 1034 CODE:
827 pango_layout_set_ellipsize (self->pl, 1035 pango_layout_set_ellipsize (self->pl,
828 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1036 ellipsise == 1 ? PANGO_ELLIPSIZE_START
829 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1037 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1038 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
831 : PANGO_ELLIPSIZE_NONE 1039 : PANGO_ELLIPSIZE_NONE
832 ); 1040 );
833 1041
834void 1042void
835set_single_paragraph_mode (CFClient::Layout self, int spm) 1043set_single_paragraph_mode (CFPlus::Layout self, int spm)
836 CODE: 1044 CODE:
837 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1045 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838 1046
839void 1047void
840size (CFClient::Layout self) 1048size (CFPlus::Layout self)
841 PPCODE: 1049 PPCODE:
842{ 1050{
843 int w, h; 1051 int w, h;
844 1052
845 layout_get_pixel_size (self, &w, &h); 1053 layout_get_pixel_size (self, &w, &h);
848 PUSHs (sv_2mortal (newSViv (w))); 1056 PUSHs (sv_2mortal (newSViv (w)));
849 PUSHs (sv_2mortal (newSViv (h))); 1057 PUSHs (sv_2mortal (newSViv (h)));
850} 1058}
851 1059
852int 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
853xy_to_index (CFClient::Layout self, int x, int y) 1073xy_to_index (CFPlus::Layout self, int x, int y)
854 CODE: 1074 CODE:
855{ 1075{
856 int index, trailing; 1076 int index, trailing;
857 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);
858 RETVAL = index; 1078 RETVAL = index + trailing;
859} 1079}
860 OUTPUT: 1080 OUTPUT:
861 RETVAL 1081 RETVAL
862 1082
863void 1083void
864cursor_pos (CFClient::Layout self, int index) 1084cursor_pos (CFPlus::Layout self, int index)
865 PPCODE: 1085 PPCODE:
866{ 1086{
867 PangoRectangle strong_pos; 1087 PangoRectangle strong_pos;
868 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1088 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869 1089
872 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1092 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1093 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874} 1094}
875 1095
876void 1096void
877render (CFClient::Layout self) 1097index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
878 PPCODE: 1098 PPCODE:
879{ 1099{
880 SV *retval; 1100 int line, x;
881 int w, h;
882 1101
883 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 */
884 1104
885 if (self->rgba)
886 {
887 cairo_surface_t *surface;
888 cairo_t *cairo;
889
890 retval = newSV (w * h * 4);
891 SvPOK_only (retval);
892 SvCUR_set (retval, w * h * 4);
893
894 memset (SvPVX (retval), 0, w * h * 4);
895
896 surface = cairo_image_surface_create_for_data (
897 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
898 cairo = cairo_create (surface);
899 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901 pango_cairo_show_layout (cairo, self->pl);
902
903 cairo_destroy (cairo);
904 cairo_surface_destroy (surface);
905
906 // what a mess, and its premultiplied, too :(
907 {
908 uint32_t *p = (uint32_t *)SvPVX (retval);
909 uint32_t *e = p + w * h;
910
911 while (p < e)
912 {
913 uint32_t rgba = *p;
914 rgba = (rgba >> 24) | (rgba << 8);
915#if 0
916#ifdef _WIN32
917 {//D
918 uint8_t r = rgba >> 24;
919 uint8_t g = rgba >> 16;
920 uint8_t b = rgba >> 8;
921 uint8_t a = rgba >> 0;
922
923 rgba = (rgba & 0xffffff00) | a;
924 }
925#endif
926#endif
927 rgba = SDL_SwapBE32 (rgba);
928 *p++ = rgba;
929 }
930 }
931
932 EXTEND (SP, 5); 1105 EXTEND (SP, 2);
933 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)
934 PUSHs (sv_2mortal (newSViv (h))); 1127 PUSHs (sv_2mortal (newSViv (index + trailing)));
935 PUSHs (sv_2mortal (retval));
936 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938 }
939 else 1128 else
940 { 1129 {
941 FT_Bitmap bitmap;
942
943 retval = newSV (w * h);
944 SvPOK_only (retval);
945 SvCUR_set (retval, w * h);
946
947 bitmap.rows = h;
948 bitmap.width = w;
949 bitmap.pitch = w;
950 bitmap.buffer = (unsigned char*)SvPVX (retval);
951 bitmap.num_grays = 256;
952 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954 memset (bitmap.buffer, 0, w * h);
955
956 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958 EXTEND (SP, 5);
959 PUSHs (sv_2mortal (newSViv (w))); 1130 PUSHs (sv_2mortal (newSViv (index)));
960 PUSHs (sv_2mortal (newSViv (h))); 1131 PUSHs (sv_2mortal (newSViv (trailing)));
961 PUSHs (sv_2mortal (retval));
962 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964 } 1132 }
965} 1133}
966 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
967MODULE = CFClient PACKAGE = CFClient::Texture 1145MODULE = CFPlus PACKAGE = CFPlus::Texture
968 1146
969void 1147void
1148pad2pot (SV *data_, SV *w_, SV *h_)
1149 CODE:
1150{
1151 int ow = SvIV (w_);
1152 int oh = SvIV (h_);
1153
1154 if (ow && oh)
1155 {
1156 int nw = minpot (ow);
1157 int nh = minpot (oh);
1158
1159 if (nw != ow || nh != oh)
1160 {
1161 if (SvOK (data_))
1162 {
1163 STRLEN datalen;
1164 char *data = SvPVbyte (data_, datalen);
1165 int bpp = datalen / (ow * oh);
1166 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1167
1168 SvPOK_only (result_);
1169 SvCUR_set (result_, nw * nh * bpp);
1170
1171 memset (SvPVX (result_), 0, nw * nh * bpp);
1172 while (oh--)
1173 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1174
1175 sv_setsv (data_, result_);
1176 }
1177
1178 sv_setiv (w_, nw);
1179 sv_setiv (h_, nh);
1180 }
1181 }
1182}
1183
1184void
970draw_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.)
971 PROTOTYPE: $$$;$$ 1186 PROTOTYPE: $$$;$$
972 ALIAS: 1187 ALIAS:
973 draw_quad_alpha = 1 1188 draw_quad_alpha = 1
974 draw_quad_alpha_premultiplied = 2 1189 draw_quad_alpha_premultiplied = 2
975 CODE: 1190 CODE:
1013 glDisable (GL_ALPHA_TEST); 1228 glDisable (GL_ALPHA_TEST);
1014 glDisable (GL_BLEND); 1229 glDisable (GL_BLEND);
1015 } 1230 }
1016} 1231}
1017 1232
1018MODULE = CFClient PACKAGE = CFClient::Map 1233MODULE = CFPlus PACKAGE = CFPlus::Map
1019 1234
1020CFClient::Map 1235CFPlus::Map
1021new (SV *class, int map_width, int map_height) 1236new (SV *class)
1022 CODE: 1237 CODE:
1023 New (0, RETVAL, 1, struct map); 1238 New (0, RETVAL, 1, struct map);
1024 RETVAL->x = 0; 1239 RETVAL->x = 0;
1025 RETVAL->y = 0; 1240 RETVAL->y = 0;
1026 RETVAL->w = map_width; 1241 RETVAL->w = 0;
1027 RETVAL->h = map_height; 1242 RETVAL->h = 0;
1028 RETVAL->ox = 0; 1243 RETVAL->ox = 0;
1029 RETVAL->oy = 0; 1244 RETVAL->oy = 0;
1030 RETVAL->faces = 8192; 1245 RETVAL->faces = 8192;
1031 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1246 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1032 RETVAL->texs = 8192; 1247 RETVAL->texs = 8192;
1035 RETVAL->row = 0; 1250 RETVAL->row = 0;
1036 OUTPUT: 1251 OUTPUT:
1037 RETVAL 1252 RETVAL
1038 1253
1039void 1254void
1040DESTROY (CFClient::Map self) 1255DESTROY (CFPlus::Map self)
1041 CODE: 1256 CODE:
1042{ 1257{
1043 map_clear (self); 1258 map_clear (self);
1044 Safefree (self->face); 1259 Safefree (self->face);
1260 Safefree (self->tex);
1045 Safefree (self); 1261 Safefree (self);
1046} 1262}
1047 1263
1048void 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
1049clear (CFClient::Map self) 1271clear (CFPlus::Map self)
1050 CODE: 1272 CODE:
1051 map_clear (self); 1273 map_clear (self);
1052 1274
1053void 1275void
1054set_face (CFClient::Map self, int face, int texid) 1276set_face (CFPlus::Map self, int face, int texid)
1055 CODE: 1277 CODE:
1056{ 1278{
1057 while (self->faces <= face) 1279 while (self->faces <= face)
1058 { 1280 {
1059 Append (mapface, self->face, self->faces, self->faces); 1281 Append (mapface, self->face, self->faces, self->faces);
1062 1284
1063 self->face [face] = texid; 1285 self->face [face] = texid;
1064} 1286}
1065 1287
1066void 1288void
1067set_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)
1068 CODE: 1290 CODE:
1069{ 1291{
1070 while (self->texs <= texid) 1292 while (self->texs <= texid)
1071 { 1293 {
1072 Append (maptex, self->tex, self->texs, self->texs); 1294 Append (maptex, self->tex, self->texs, self->texs);
1096 // from transparent color bleeding and ugly wrapping effects. 1318 // from transparent color bleeding and ugly wrapping effects.
1097 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1319 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098} 1320}
1099 1321
1100int 1322int
1101ox (CFClient::Map self) 1323ox (CFPlus::Map self)
1102 ALIAS: 1324 ALIAS:
1103 oy = 1 1325 oy = 1
1104 x = 2 1326 x = 2
1105 y = 3 1327 y = 3
1106 w = 4 1328 w = 4
1117 } 1339 }
1118 OUTPUT: 1340 OUTPUT:
1119 RETVAL 1341 RETVAL
1120 1342
1121void 1343void
1122scroll (CFClient::Map self, int dx, int dy) 1344scroll (CFPlus::Map self, int dx, int dy)
1123 CODE: 1345 CODE:
1124{ 1346{
1125 if (dx > 0) 1347 if (dx > 0)
1126 map_blank (self, self->x, self->y, dx - 1, self->h); 1348 map_blank (self, self->x, self->y, dx, self->h);
1127 else if (dx < 0) 1349 else if (dx < 0)
1128 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);
1129 1351
1130 if (dy > 0) 1352 if (dy > 0)
1131 map_blank (self, self->x, self->y, self->w, dy - 1); 1353 map_blank (self, self->x, self->y, self->w, dy);
1132 else if (dy < 0) 1354 else if (dy < 0)
1133 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);
1134 1356
1135 self->ox += dx; self->x += dx; 1357 self->ox += dx; self->x += dx;
1136 self->oy += dy; self->y += dy; 1358 self->oy += dy; self->y += dy;
1137 1359
1138 while (self->y < 0) 1360 while (self->y < 0)
1143 self->y += MAP_EXTEND_Y; 1365 self->y += MAP_EXTEND_Y;
1144 } 1366 }
1145} 1367}
1146 1368
1147void 1369void
1148map1a_update (CFClient::Map self, SV *data_) 1370map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149 CODE: 1371 CODE:
1150{ 1372{
1151 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1373 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1152 uint8_t *data_end = (uint8_t *)SvEND (data_); 1374 uint8_t *data_end = (uint8_t *)SvEND (data_);
1153 mapcell *cell; 1375 mapcell *cell;
1154 int x, y, flags; 1376 int x, y, flags;
1155 1377
1156 while (data < data_end) 1378 while (data < data_end - 1)
1157 { 1379 {
1158 flags = (data [0] << 8) + data [1]; data += 2; 1380 flags = (data [0] << 8) + data [1]; data += 2;
1159 1381
1160 x = ((flags >> 10) & 63) + self->x; 1382 x = self->x + ((flags >> 10) & 63);
1161 y = ((flags >> 4) & 63) + self->y; 1383 y = self->y + ((flags >> 4) & 63);
1162 1384
1163 cell = map_get_cell (self, x, y); 1385 cell = map_get_cell (self, x, y);
1164 1386
1165 if (flags & 15) 1387 if (flags & 15)
1166 { 1388 {
1167 if (cell->darkness < 0) 1389 if (!cell->darkness)
1168 { 1390 {
1391 memset (cell, 0, sizeof (*cell));
1169 cell->darkness = 0; 1392 cell->darkness = 256;
1170 cell->face [0] = 0;
1171 cell->face [1] = 0;
1172 cell->face [2] = 0;
1173 } 1393 }
1174 1394
1175 cell->darkness = flags & 8 ? *data++ : 255;
1176
1177 //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 }
1178 1436
1179 if (flags & 4) 1437 if (flags & 4)
1180 { 1438 {
1181 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;
1182 } 1440 }
1190 { 1448 {
1191 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;
1192 } 1450 }
1193 } 1451 }
1194 else 1452 else
1195 cell->darkness = -1; 1453 cell->darkness = 0;
1196 } 1454 }
1197} 1455}
1198 1456
1199SV * 1457SV *
1200mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1458mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201 CODE: 1459 CODE:
1202{ 1460{
1203 int x1, x; 1461 int x1, x;
1204 int y1, y; 1462 int y1, y;
1205 int z; 1463 int z;
1255} 1513}
1256 OUTPUT: 1514 OUTPUT:
1257 RETVAL 1515 RETVAL
1258 1516
1259void 1517void
1260draw (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)
1261 PPCODE: 1519 CODE:
1262{ 1520{
1263 int vx, vy;
1264 int x, y, z; 1521 int x, y, z;
1265 int last_name; 1522 int last_name;
1266 mapface face; 1523 mapface face;
1267 int sw4 = (sw + 3) & ~3;
1268 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1269 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1270
1271 memset (darkness, 255, sw4 * sh);
1272 SvPOK_only (darkness_sv);
1273 SvCUR_set (darkness_sv, sw4 * sh);
1274
1275 vx = self->x + (self->w - sw) / 2 - shift_x;
1276 vy = self->y + (self->h - sh) / 2 - shift_y;
1277
1278 /*
1279 int vx = self->vx = self->w >= sw
1280 ? self->x + (self->w - sw) / 2
1281 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1282
1283 int vy = self->vy = self->h >= sh
1284 ? self->y + (self->h - sh) / 2
1285 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286 */
1287 1524
1288 glColor4ub (255, 255, 255, 255); 1525 glColor4ub (255, 255, 255, 255);
1289 1526
1527 glEnable (GL_BLEND);
1290 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1528 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291 glEnable (GL_BLEND);
1292 glEnable (GL_TEXTURE_2D); 1529 glEnable (GL_TEXTURE_2D);
1293 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294 1531
1295 glBegin (GL_QUADS); 1532 glBegin (GL_QUADS);
1296 1533
1297 last_name = 0; 1534 last_name = 0;
1298 1535
1536 mx += self->x;
1537 my += self->y;
1538
1299 for (z = 0; z < 3; z++) 1539 for (z = 0; z < 3; z++)
1300 for (y = 0; y < sh; y++) 1540 for (y = 0; y < sh; y++)
1301 if (0 <= y + vy && y + vy < self->rows) 1541 if (0 <= y + my && y + my < self->rows)
1302 { 1542 {
1303 maprow *row = self->row + (y + vy); 1543 maprow *row = self->row + (y + my);
1304 1544
1305 for (x = 0; x < sw; x++) 1545 for (x = 0; x < sw; x++)
1306 if (row->c0 <= x + vx && x + vx < row->c1) 1546 if (row->c0 <= x + mx && x + mx < row->c1)
1307 { 1547 {
1308 mapcell *cell = row->col + (x + vx - row->c0); 1548 mapcell *cell = row->col + (x + mx - row->c0);
1309
1310 darkness[y * sw4 + x] = cell->darkness < 0
1311 ? 255 - FOW_DARKNESS
1312 : 255 - cell->darkness;
1313 1549
1314 face = cell->face [z]; 1550 face = cell->face [z];
1315 1551
1316 if (face) 1552 if (face && face < self->texs)
1317 { 1553 {
1318 maptex tex = self->tex [face]; 1554 maptex tex = self->tex [face];
1319
1320 int px = (x + 1) * 32 - tex.w; 1555 int px = (x + 1) * 32 - tex.w;
1321 int py = (y + 1) * 32 - tex.h; 1556 int py = (y + 1) * 32 - tex.h;
1322 1557
1323 if (last_name != tex.name) 1558 if (last_name != tex.name)
1324 { 1559 {
1325 glEnd (); 1560 glEnd ();
1326 last_name = tex.name;
1327 glBindTexture (GL_TEXTURE_2D, last_name); 1561 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1328 glBegin (GL_QUADS); 1562 glBegin (GL_QUADS);
1329 } 1563 }
1330 1564
1331 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1565 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1332 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1566 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1333 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);
1334 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1568 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1335 } 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) * 32 - tex.w + 2;
1577 int py = (y + 1) * 32 - 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 }
1336 } 1589 }
1337 } 1590 }
1338 1591
1339 glEnd (); 1592 glEnd ();
1340 1593
1341 glDisable (GL_TEXTURE_2D); 1594 glDisable (GL_TEXTURE_2D);
1342 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 * 32;
1609 int py = y * 32;
1610
1611 if (cell->stat_hp)
1612 {
1613 int width = cell->stat_width * 32;
1614 int thick = sh / 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 }
1343 1720
1344 EXTEND (SP, 3); 1721 EXTEND (SP, 3);
1345 PUSHs (sv_2mortal (newSViv (sw4))); 1722 PUSHs (sv_2mortal (newSViv (sw4)));
1346 PUSHs (sv_2mortal (newSViv (sh))); 1723 PUSHs (sv_2mortal (newSViv (sh)));
1347 PUSHs (darkness_sv); 1724 PUSHs (darkness_sv);
1348} 1725}
1349 1726
1350SV * 1727SV *
1351get_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)
1352 CODE: 1729 CODE:
1353{ 1730{
1354 int x, y, x1, y1; 1731 int x, y, x1, y1;
1355 SV *data_sv = newSV (w * h * 7 + 5); 1732 SV *data_sv = newSV (w * h * 7 + 5);
1356 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1733 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1418} 1795}
1419 OUTPUT: 1796 OUTPUT:
1420 RETVAL 1797 RETVAL
1421 1798
1422void 1799void
1423set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1800set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424 PPCODE: 1801 PPCODE:
1425{ 1802{
1426 int x, y, z; 1803 int x, y, z;
1427 int w, h; 1804 int w, h;
1428 int x1, y1; 1805 int x1, y1;
1460 1837
1461 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1838 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1462 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1839 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1463 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1840 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1464 1841
1465 if (cell->darkness <= 0) 1842 if (cell->darkness == 0)
1466 { 1843 {
1467 cell->darkness = -1; 1844 cell->darkness = 0;
1468 1845
1469 for (z = 0; z <= 2; z++) 1846 for (z = 0; z <= 2; z++)
1470 { 1847 {
1471 cell->face[z] = face[z]; 1848 cell->face[z] = face[z];
1472 1849
1477 } 1854 }
1478 } 1855 }
1479 } 1856 }
1480} 1857}
1481 1858
1482MODULE = CFClient PACKAGE = CFClient::MixChunk 1859MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483 1860
1484CFClient::MixChunk 1861CFPlus::MixChunk
1485new_from_file (SV *class, char *path) 1862new_from_file (SV *class, char *path)
1486 CODE: 1863 CODE:
1487 RETVAL = Mix_LoadWAV (path); 1864 RETVAL = Mix_LoadWAV (path);
1488 OUTPUT: 1865 OUTPUT:
1489 RETVAL 1866 RETVAL
1490 1867
1491void 1868void
1492DESTROY (CFClient::MixChunk self) 1869DESTROY (CFPlus::MixChunk self)
1493 CODE: 1870 CODE:
1494 Mix_FreeChunk (self); 1871 Mix_FreeChunk (self);
1495 1872
1496int 1873int
1497volume (CFClient::MixChunk self, int volume = -1) 1874volume (CFPlus::MixChunk self, int volume = -1)
1498 CODE: 1875 CODE:
1499 RETVAL = Mix_VolumeChunk (self, volume); 1876 RETVAL = Mix_VolumeChunk (self, volume);
1500 OUTPUT: 1877 OUTPUT:
1501 RETVAL 1878 RETVAL
1502 1879
1503int 1880int
1504play (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)
1505 CODE: 1882 CODE:
1506 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1883 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507 OUTPUT: 1884 OUTPUT:
1508 RETVAL 1885 RETVAL
1509 1886
1510MODULE = CFClient PACKAGE = CFClient::MixMusic 1887MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511 1888
1512int 1889int
1513volume (int volume = -1) 1890volume (int volume = -1)
1514 CODE: 1891 CODE:
1515 RETVAL = Mix_VolumeMusic (volume); 1892 RETVAL = Mix_VolumeMusic (volume);
1516 OUTPUT: 1893 OUTPUT:
1517 RETVAL 1894 RETVAL
1518 1895
1519CFClient::MixMusic 1896CFPlus::MixMusic
1520new_from_file (SV *class, char *path) 1897new_from_file (SV *class, char *path)
1521 CODE: 1898 CODE:
1522 RETVAL = Mix_LoadMUS (path); 1899 RETVAL = Mix_LoadMUS (path);
1523 OUTPUT: 1900 OUTPUT:
1524 RETVAL 1901 RETVAL
1525 1902
1526void 1903void
1527DESTROY (CFClient::MixMusic self) 1904DESTROY (CFPlus::MixMusic self)
1528 CODE: 1905 CODE:
1529 Mix_FreeMusic (self); 1906 Mix_FreeMusic (self);
1530 1907
1531int 1908int
1532play (CFClient::MixMusic self, int loops = -1) 1909play (CFPlus::MixMusic self, int loops = -1)
1533 CODE: 1910 CODE:
1534 RETVAL = Mix_PlayMusic (self, loops); 1911 RETVAL = Mix_PlayMusic (self, loops);
1535 OUTPUT: 1912 OUTPUT:
1536 RETVAL 1913 RETVAL
1537 1914
1538MODULE = CFClient PACKAGE = CFClient::OpenGL 1915MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539 1916
1540BOOT: 1917BOOT:
1541{ 1918{
1542 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1919 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543 static const struct { 1920 static const struct {
1544 const char *name; 1921 const char *name;
1545 IV iv; 1922 IV iv;
1546 } *civ, const_iv[] = { 1923 } *civ, const_iv[] = {
1547# define const_iv(name) { # name, (IV)name } 1924# define const_iv(name) { # name, (IV)name }
1554 const_iv (GL_SCISSOR_TEST), 1931 const_iv (GL_SCISSOR_TEST),
1555 const_iv (GL_DEPTH_TEST), 1932 const_iv (GL_DEPTH_TEST),
1556 const_iv (GL_ALPHA_TEST), 1933 const_iv (GL_ALPHA_TEST),
1557 const_iv (GL_NORMALIZE), 1934 const_iv (GL_NORMALIZE),
1558 const_iv (GL_RESCALE_NORMAL), 1935 const_iv (GL_RESCALE_NORMAL),
1936 const_iv (GL_FRONT),
1937 const_iv (GL_BACK),
1559 const_iv (GL_AND), 1938 const_iv (GL_AND),
1560 const_iv (GL_ONE), 1939 const_iv (GL_ONE),
1561 const_iv (GL_ZERO), 1940 const_iv (GL_ZERO),
1562 const_iv (GL_SRC_ALPHA), 1941 const_iv (GL_SRC_ALPHA),
1563 const_iv (GL_DST_ALPHA), 1942 const_iv (GL_DST_ALPHA),
1564 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1943 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565 const_iv (GL_ONE_MINUS_DST_ALPHA), 1944 const_iv (GL_ONE_MINUS_DST_ALPHA),
1566 const_iv (GL_SRC_ALPHA_SATURATE), 1945 const_iv (GL_SRC_ALPHA_SATURATE),
1567 const_iv (GL_RGB), 1946 const_iv (GL_RGB),
1568 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),
1569 const_iv (GL_UNSIGNED_BYTE), 1951 const_iv (GL_UNSIGNED_BYTE),
1570 const_iv (GL_UNSIGNED_SHORT), 1952 const_iv (GL_UNSIGNED_SHORT),
1571 const_iv (GL_UNSIGNED_INT), 1953 const_iv (GL_UNSIGNED_INT),
1572 const_iv (GL_ALPHA), 1954 const_iv (GL_ALPHA),
1573 const_iv (GL_INTENSITY), 1955 const_iv (GL_INTENSITY),
1605 const_iv (GL_SEPARABLE_2D), 1987 const_iv (GL_SEPARABLE_2D),
1606 const_iv (GL_CONVOLUTION_2D), 1988 const_iv (GL_CONVOLUTION_2D),
1607 const_iv (GL_CONVOLUTION_BORDER_MODE), 1989 const_iv (GL_CONVOLUTION_BORDER_MODE),
1608 const_iv (GL_CONSTANT_BORDER), 1990 const_iv (GL_CONSTANT_BORDER),
1609 const_iv (GL_LINES), 1991 const_iv (GL_LINES),
1992 const_iv (GL_LINE_STRIP),
1610 const_iv (GL_LINE_LOOP), 1993 const_iv (GL_LINE_LOOP),
1611 const_iv (GL_QUADS), 1994 const_iv (GL_QUADS),
1612 const_iv (GL_QUAD_STRIP), 1995 const_iv (GL_QUAD_STRIP),
1613 const_iv (GL_TRIANGLES), 1996 const_iv (GL_TRIANGLES),
1614 const_iv (GL_TRIANGLE_STRIP), 1997 const_iv (GL_TRIANGLE_STRIP),
1647 OUTPUT: 2030 OUTPUT:
1648 RETVAL 2031 RETVAL
1649 2032
1650int glGetError () 2033int glGetError ()
1651 2034
2035void glFinish ()
2036
1652void glClear (int mask) 2037void glClear (int mask)
1653 2038
1654void glClearColor (float r, float g, float b, float a = 1.0) 2039void glClearColor (float r, float g, float b, float a = 1.0)
1655 PROTOTYPE: @ 2040 PROTOTYPE: @
1656 2041
1679void glPushMatrix () 2064void glPushMatrix ()
1680 2065
1681void glPopMatrix () 2066void glPopMatrix ()
1682 2067
1683void glLoadIdentity () 2068void glLoadIdentity ()
2069
2070void glDrawBuffer (int buffer)
2071
2072void glReadBuffer (int buffer)
1684 2073
1685# near_ and far_ are due to microsofts buggy "c" compiler 2074# near_ and far_ are due to microsofts buggy "c" compiler
1686void 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_)
1687 2076
1688# near_ and far_ are due to microsofts buggy "c" compiler 2077# near_ and far_ are due to microsofts buggy "c" compiler
1718 r *= a; 2107 r *= a;
1719 g *= a; 2108 g *= a;
1720 b *= a; 2109 b *= a;
1721 } 2110 }
1722 // microsoft visual "c" rounds instead of truncating... 2111 // microsoft visual "c" rounds instead of truncating...
1723 glColor4ub (MIN ((int)(r * 256.f), 255), 2112 glColor4f (r, g, b, a);
1724 MIN ((int)(g * 256.f), 255),
1725 MIN ((int)(b * 256.f), 255),
1726 MIN ((int)(a * 256.f), 255));
1727 2113
1728void glInterleavedArrays (int format, int stride, char *data) 2114void glInterleavedArrays (int format, int stride, char *data)
1729 2115
1730void glDrawElements (int mode, int count, int type, char *indices) 2116void glDrawElements (int mode, int count, int type, char *indices)
1731 2117
1808 2194
1809void glEndList () 2195void glEndList ()
1810 2196
1811void glCallList (int list) 2197void glCallList (int list)
1812 2198
1813

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines