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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines