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.55 by root, Thu Apr 20 08:11:56 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
3#endif 9#endif
4 10
5#include "EXTERN.h" 11#include "EXTERN.h"
6#include "perl.h" 12#include "perl.h"
7#include "XSUB.h" 13#include "XSUB.h"
8 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <math.h>
9#include <string.h> 20#include <string.h>
10#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h>
11 23
12#include <SDL.h> 24#include <SDL.h>
25#include <SDL_endian.h>
13#include <SDL_image.h> 26#include <SDL_image.h>
14#include <SDL_mixer.h> 27#include <SDL_mixer.h>
15#include <SDL_opengl.h> 28#include <SDL_opengl.h>
16 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
17#include <glib/gmacros.h> 33#include <glib/gmacros.h>
18 34
19#include <pango/pango.h> 35#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 36
23#ifndef _WIN32 37#ifndef _WIN32
24# include <sys/types.h> 38# include <sys/types.h>
25# include <sys/socket.h> 39# include <sys/socket.h>
26# include <netinet/in.h> 40# include <netinet/in.h>
27# include <netinet/tcp.h> 41# include <netinet/tcp.h>
28# include <inttypes.h> 42# include <inttypes.h>
29#else
30 typedef unsigned char uint8_t;
31 typedef unsigned short uint16_t;
32 typedef unsigned int uint32_t;
33 typedef signed char int8_t;
34 typedef signed short int16_t;
35 typedef signed int int32_t;
36#endif 43#endif
44
45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
37 46
38#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
39 48
40#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
42 51
52#define MIN_FONT_HEIGHT 10
53
54#if 0
55# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else
57# define PARACHUTE 0
58#endif
59
60static struct
61{
62#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h"
64#undef GL_FUNC
65} gl;
66
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{
69 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else
74 glBlendFunc (sa, da);
75}
76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
43typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
45 85
46static PangoContext *context; 86typedef PangoFontDescription *CFPlus__Font;
47static PangoFontMap *fontmap; 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}
48 105
49typedef struct cf_layout { 106typedef struct cf_layout {
50 PangoLayout *pl; 107 PangoLayout *pl;
108 float r, g, b, a; // default color for rgba mode
51 int base_height; 109 int base_height;
110 CFPlus__Font font;
52} *CFClient__Layout; 111} *CFPlus__Layout;
112
113static CFPlus__Font default_font;
114static PangoContext *opengl_context;
115static PangoFontMap *opengl_fontmap;
53 116
54static void 117static void
55substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
56{ 119{
57 FcPatternAddBool (pattern, FC_HINTING , 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
121#ifdef FC_HINT_STYLE
122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
123#endif
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 125}
60 126
61static void 127static void
62layout_update (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
63{ 129{
64 /* 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
65 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
66 */ 132 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 133 PangoFontDescription *font = self->font ? self->font : default_font;
68 134
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 135 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 136 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 137
138 pango_layout_set_font_description (self->pl, font);
76} 139}
77 140
78static void 141static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80{ 143{
81 layout_update (self); 144 PangoRectangle rect;
82 145
146 // get_pixel_* wrongly rounds down
83 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
84 148
85 *w = (*w + 3) & ~3; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86 if (!*w) *w = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87 if (!*h) *h = 1; 151
152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
88} 157}
89 158
90typedef uint16_t mapface; 159typedef uint16_t mapface;
91 160
92typedef struct { 161typedef struct {
95 float s, t; 164 float s, t;
96 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
97} maptex; 166} maptex;
98 167
99typedef struct { 168typedef struct {
100 int16_t darkness; 169 uint32_t player;
101 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
102} mapcell; 173} mapcell;
103 174
104typedef struct { 175typedef struct {
105 int32_t c0, c1; 176 int32_t c0, c1;
106 mapcell *col; 177 mapcell *col;
115 int texs; 186 int texs;
116 maptex *tex; 187 maptex *tex;
117 188
118 int32_t rows; 189 int32_t rows;
119 maprow *row; 190 maprow *row;
120} *CFClient__Map; 191} *CFPlus__Map;
121 192
122static char * 193static char *
123prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
124{ 195{
125 char *p; 196 char *p;
143 214
144#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))
145#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))
146 217
147static maprow * 218static maprow *
148map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
149{ 220{
150 if (0 > y) 221 if (0 > y)
151 { 222 {
152 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
153 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
191 262
192 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
193} 264}
194 265
195static mapcell * 266static mapcell *
196map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
197{ 268{
198 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
199} 270}
200 271
201static void 272static void
202map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
203{ 274{
204 int r; 275 int r;
205 276
206 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
207 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
215 self->row = 0; 286 self->row = 0;
216 self->rows = 0; 287 self->rows = 0;
217} 288}
218 289
219static void 290static void
220map_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)
221{ 292{
222 int x, y; 293 int x, y;
223 maprow *row; 294 maprow *row;
295 mapcell *cell;
224 296
225 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
226 if (y >= 0) 298 if (y >= 0)
227 { 299 {
228 if (y >= self->rows) 300 if (y >= self->rows)
234 if (x >= row->c0) 306 if (x >= row->c0)
235 { 307 {
236 if (x >= row->c1) 308 if (x >= row->c1)
237 break; 309 break;
238 310
239 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;
240 } 317 }
241 } 318 }
242} 319}
243 320
321static void
322music_finished (void)
323{
324 SDL_UserEvent ev;
325
326 ev.type = SDL_USEREVENT;
327 ev.code = 0;
328 ev.data1 = 0;
329 ev.data2 = 0;
330
331 SDL_PushEvent ((SDL_Event *)&ev);
332}
333
334static void
335channel_finished (int channel)
336{
337 SDL_UserEvent ev;
338
339 ev.type = SDL_USEREVENT;
340 ev.code = 1;
341 ev.data1 = (void *)(long)channel;
342 ev.data2 = 0;
343
344 SDL_PushEvent ((SDL_Event *)&ev);
345}
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
244MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
245 365
246PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
247 367
248BOOT: 368BOOT:
249{ 369{
250 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
251 static const struct { 371 static const struct {
252 const char *name; 372 const char *name;
253 IV iv; 373 IV iv;
254 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
255# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
354# undef const_iv 474# undef const_iv
355 }; 475 };
356 476
357 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
358 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359
360 fontmap = pango_ft2_font_map_new ();
361 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
362 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
363} 479}
364 480
365int 481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
488NV floor (NV x)
489
490NV ceil (NV x)
491
492void
493pango_init ()
494 CODE:
495{
496 opengl_fontmap = pango_opengl_font_map_new ();
497 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
498 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
499}
500
501int
366SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
367 503
368void 504void
369SDL_Quit () 505SDL_Quit ()
370 506
371void 507void
377 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381 517
518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
520
382 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386 525
387 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
388 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
390 531
391 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
392 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393 534
394 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
403 544
404 ++m; 545 ++m;
405 } 546 }
406} 547}
407 548
549char *
550SDL_GetError ()
551
408int 552int
409SDL_SetVideoMode (int w, int h, int fullscreen) 553SDL_SetVideoMode (int w, int h, int fullscreen)
410 CODE: 554 CODE:
411 RETVAL = !!SDL_SetVideoMode ( 555 RETVAL = !!SDL_SetVideoMode (
412 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
413 ); 557 );
558 if (RETVAL)
559 {
414 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562# include "glfunc.h"
563# undef GL_FUNC
564 }
415 OUTPUT: 565 OUTPUT:
416 RETVAL 566 RETVAL
417 567
418void 568void
419SDL_GL_SwapBuffers () 569SDL_GL_SwapBuffers ()
570
571char *
572SDL_GetKeyName (int sym)
420 573
421void 574void
422SDL_PollEvent () 575SDL_PollEvent ()
423 PPCODE: 576 PPCODE:
424{ 577{
426 579
427 while (SDL_PollEvent (&ev)) 580 while (SDL_PollEvent (&ev))
428 { 581 {
429 HV *hv = newHV (); 582 HV *hv = newHV ();
430 hv_store (hv, "type", 4, newSViv (ev.type), 0); 583 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584
431 switch (ev.type) 585 switch (ev.type)
432 { 586 {
433 case SDL_KEYDOWN: 587 case SDL_KEYDOWN:
434 case SDL_KEYUP: 588 case SDL_KEYUP:
435 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
442 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444 break; 598 break;
445 599
446 case SDL_MOUSEMOTION: 600 case SDL_MOUSEMOTION:
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
447 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452 break; 608 break;
453 609
454 case SDL_MOUSEBUTTONDOWN: 610 case SDL_MOUSEBUTTONDOWN:
455 case SDL_MOUSEBUTTONUP: 611 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
613
456 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 614 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 615 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 616 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 617 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
618 break;
619
620 case SDL_USEREVENT:
621 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
624 break;
460 } 625 }
461 626
462 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463 } 628 }
464} 629}
465 630
466int 631int
467Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
633 POSTCALL:
634 Mix_HookMusicFinished (music_finished);
635 Mix_ChannelFinished (channel_finished);
468 636
469void 637void
470Mix_CloseAudio () 638Mix_CloseAudio ()
471 639
472int 640int
477 CODE: 645 CODE:
478#ifndef _WIN32 646#ifndef _WIN32
479 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480#endif 648#endif
481 649
482char * 650void
483gl_version () 651win32_proxy_info ()
484 CODE: 652 PPCODE:
485 RETVAL = (char *)glGetString (GL_VERSION); 653{
486 OUTPUT: 654#ifdef _WIN32
487 RETVAL 655 char buffer[2048];
656 DWORD buflen;
488 657
489char * 658 EXTEND (SP, 3);
490gl_extensions () 659
491 CODE: 660 buflen = sizeof (buffer);
492 RETVAL = (char *)glGetString (GL_EXTENSIONS); 661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
493 OUTPUT: 662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
494 RETVAL 663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
495 678
496void 679void
497add_font (char *file) 680add_font (char *file)
498 CODE: 681 CODE:
499 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
500
501void
502set_font (char *file)
503 CODE:
504{
505 int count;
506 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508 FcPatternDestroy (pattern);
509 pango_context_set_font_description (context, font);
510}
511 683
512void 684void
513load_image_inline (SV *image_) 685load_image_inline (SV *image_)
514 ALIAS: 686 ALIAS:
515 load_image_file = 1 687 load_image_file = 1
557 729
558 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559 731
560 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
561 733
734 SDL_LockSurface (surface2);
562 EXTEND (SP, 5); 735 EXTEND (SP, 6);
563 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
564 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
565 SDL_LockSurface (surface2);
566 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
567 SDL_UnlockSurface (surface2);
568 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
569 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
571 743
572 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
573 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
574} 746}
575 747
597 PUSHs (sv_2mortal (newSViv (b / y))); 769 PUSHs (sv_2mortal (newSViv (b / y)));
598 PUSHs (sv_2mortal (newSViv (a / y))); 770 PUSHs (sv_2mortal (newSViv (a / y)));
599} 771}
600 772
601void 773void
774error (char *message)
775 CODE:
776 fprintf (stderr, "ERROR: %s\n", message);
777#ifdef _WIN32
778 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
779#endif
780
781void
602fatal (char *message) 782fatal (char *message)
603 CODE: 783 CODE:
784 fprintf (stderr, "FATAL: %s\n", message);
604#ifdef _WIN32 785#ifdef _WIN32
605 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
787#endif
788 _exit (1);
789
790void
791_exit (int retval = 0)
792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
606#else 795#else
607 fprintf (stderr, "FATAL: %s\n", message); 796 _exit (retval);
608#endif 797#endif
609 exit (1);
610 798
799MODULE = CFPlus PACKAGE = CFPlus::Font
800
801CFPlus::Font
802new_from_file (SV *class, char *path, int id = 0)
803 CODE:
804{
805 int count;
806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
807 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
808 FcPatternDestroy (pattern);
809}
810 OUTPUT:
811 RETVAL
812
813void
814DESTROY (CFPlus::Font self)
815 CODE:
816 pango_font_description_free (self);
817
818void
819make_default (CFPlus::Font self)
820 CODE:
821 default_font = self;
822
611MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
612 824
613CFClient::Layout 825void
614new (SV *class, int base_height = 10) 826reset_glyph_cache ()
827 CODE:
828 tc_clear ();
829
830CFPlus::Layout
831new (SV *class)
615 CODE: 832 CODE:
616 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
617 RETVAL->base_height = base_height; 834
618 RETVAL->pl = pango_layout_new (context); 835 RETVAL->pl = pango_layout_new (opengl_context);
836 RETVAL->r = 1.;
837 RETVAL->g = 1.;
838 RETVAL->b = 1.;
839 RETVAL->a = 1.;
840 RETVAL->base_height = MIN_FONT_HEIGHT;
841 RETVAL->font = 0;
842
619 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 843 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
844 layout_update_font (RETVAL);
620 OUTPUT: 845 OUTPUT:
621 RETVAL 846 RETVAL
622 847
623void 848void
624DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
625 CODE: 850 CODE:
626 g_object_unref (self->pl); 851 g_object_unref (self->pl);
627 Safefree (self); 852 Safefree (self);
628 853
629void 854void
630set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
631 CODE: 856 CODE:
632{ 857{
633 STRLEN textlen; 858 STRLEN textlen;
634 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
635 860
636 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
637} 862}
638 863
639void 864void
640set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
641 CODE: 866 CODE:
642{ 867{
643 STRLEN textlen; 868 STRLEN textlen;
644 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
645 870
646 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
647} 872}
648 873
874void
875set_shapes (CFPlus::Layout self, ...)
876 CODE:
877{
878 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text;
881 int arg = 4;
882
883 while (arg < items && (pos = strstr (pos, OBJ_STR)))
884 {
885 PangoRectangle inkrect, rect;
886 PangoAttribute *attr;
887
888 int x = SvIV (ST (arg - 3));
889 int y = SvIV (ST (arg - 2));
890 int w = SvIV (ST (arg - 1));
891 int h = SvIV (ST (arg ));
892
893 inkrect.x = 0;
894 inkrect.y = 0;
895 inkrect.width = 0;
896 inkrect.height = 0;
897
898 rect.x = x * PANGO_SCALE;
899 rect.y = y * PANGO_SCALE;
900 rect.width = w * PANGO_SCALE;
901 rect.height = h * PANGO_SCALE;
902
903 if (!attrs)
904 attrs = pango_layout_get_attributes (self->pl);
905
906 attr = pango_attr_shape_new (&inkrect, &rect);
907 attr->start_index = pos - text;
908 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
909 pango_attr_list_insert (attrs, attr);
910
911 arg += 4;
912 pos += sizeof (OBJ_STR) - 1;
913 }
914
915 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs);
917}
918
919void
920get_shapes (CFPlus::Layout self)
921 PPCODE:
922{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924
925 do
926 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
928
929 if (run && shape_attr_p (run))
930 {
931 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents);
933
934 EXTEND (SP, 2);
935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
937 }
938 }
939 while (pango_layout_iter_next_run (iter));
940
941 pango_layout_iter_free (iter);
942}
943
944int
945has_wrapped (CFPlus::Layout self)
946 CODE:
947{
948 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl);
950
951 while (*text)
952 lines += *text++ == '\n';
953
954 RETVAL = lines < pango_layout_get_line_count (self->pl);
955}
956 OUTPUT:
957 RETVAL
958
649SV * 959SV *
650get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
651 CODE: 961 CODE:
652 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653 SvUTF8_on (RETVAL); 963 sv_utf8_decode (RETVAL);
654 OUTPUT: 964 OUTPUT:
655 RETVAL 965 RETVAL
656 966
657void 967void
968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
969 CODE:
970 self->r = r;
971 self->g = g;
972 self->b = b;
973 self->a = a;
974
975void
976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
977 CODE:
978 if (self->font != font)
979 {
980 self->font = font;
981 layout_update_font (self);
982 }
983
984void
658set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
659 CODE: 986 CODE:
987 if (self->base_height != base_height)
988 {
660 self->base_height = base_height; 989 self->base_height = base_height;
990 layout_update_font (self);
991 }
661 992
662void 993void
663set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
664 CODE: 995 CODE:
665 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
666 997
667void 998void
999set_indent (CFPlus::Layout self, int indent)
1000 CODE:
1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1002
1003void
1004set_spacing (CFPlus::Layout self, int spacing)
1005 CODE:
1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1007
1008void
1009set_ellipsise (CFPlus::Layout self, int ellipsise)
1010 CODE:
1011 pango_layout_set_ellipsize (self->pl,
1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1015 : PANGO_ELLIPSIZE_NONE
1016 );
1017
1018void
1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
1020 CODE:
1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1022
1023void
668size (CFClient::Layout self) 1024size (CFPlus::Layout self)
669 PPCODE: 1025 PPCODE:
670{ 1026{
671 int w, h; 1027 int w, h;
672 1028
673 layout_update (self);
674 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
675 1030
676 EXTEND (SP, 2); 1031 EXTEND (SP, 2);
677 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
678 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
679} 1034}
680 1035
681int 1036int
1037descent (CFPlus::Layout self)
1038 CODE:
1039{
1040 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect);
1044}
1045 OUTPUT:
1046 RETVAL
1047
1048int
682xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
683 CODE: 1050 CODE:
684{ 1051{
685 int index, trailing; 1052 int index, trailing;
686
687 layout_update (self);
688 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
689
690 RETVAL = index; 1054 RETVAL = index + trailing;
691} 1055}
692 OUTPUT: 1056 OUTPUT:
693 RETVAL 1057 RETVAL
694 1058
695void 1059void
696cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
697 PPCODE: 1061 PPCODE:
698{ 1062{
699 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
700 layout_update (self);
701 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702 1065
703 EXTEND (SP, 3); 1066 EXTEND (SP, 3);
704 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1067 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707} 1070}
708 1071
709void 1072void
710render (CFClient::Layout self) 1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
711 PPCODE: 1074 PPCODE:
712{ 1075{
713 SV *retval; 1076 int line, x;
714 int w, h;
715 FT_Bitmap bitmap;
716 1077
717 layout_update (self); 1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
718 layout_get_pixel_size (self, &w, &h); 1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
719 1080
720 retval = newSV (w * h);
721 SvPOK_only (retval);
722 SvCUR_set (retval, w * h);
723
724 bitmap.rows = h;
725 bitmap.width = w;
726 bitmap.pitch = w;
727 bitmap.buffer = (unsigned char*)SvPVX (retval);
728 bitmap.num_grays = 256;
729 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730
731 memset (bitmap.buffer, 0, w * h);
732
733 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
734
735 EXTEND (SP, 3); 1081 EXTEND (SP, 2);
736 PUSHs (sv_2mortal (newSViv (w))); 1082 PUSHs (sv_2mortal (newSViv (line - 1)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084}
1085
1086void
1087line_x_to_index (CFPlus::Layout self, int line, int x)
1088 PPCODE:
1089{
1090 PangoLayoutLine *lp;
1091 int index, trailing;
1092
1093 if (line < 0)
1094 XSRETURN_EMPTY;
1095
1096 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */
1098
1099 if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))
1100 XSRETURN_EMPTY; /* do better */
1101
1102 EXTEND (SP, 2);
1103 if (GIMME_V == G_SCALAR)
1104 PUSHs (sv_2mortal (newSViv (index + trailing)));
1105 else
1106 {
737 PUSHs (sv_2mortal (newSViv (h))); 1107 PUSHs (sv_2mortal (newSViv (index)));
738 PUSHs (sv_2mortal (retval)); 1108 PUSHs (sv_2mortal (newSViv (trailing)));
1109 }
739} 1110}
740 1111
1112void
1113render (CFPlus::Layout self, float x, float y, int flags = 0)
1114 PPCODE:
1115 pango_opengl_render_layout_subpixel (
1116 self->pl,
1117 x * PANGO_SCALE, y * PANGO_SCALE,
1118 self->r, self->g, self->b, self->a,
1119 flags
1120 );
1121
741MODULE = CFClient PACKAGE = CFClient::Texture 1122MODULE = CFPlus PACKAGE = CFPlus::Texture
742 1123
743void 1124void
1125pad2pot (SV *data_, SV *w_, SV *h_)
1126 CODE:
1127{
1128 int ow = SvIV (w_);
1129 int oh = SvIV (h_);
1130
1131 if (ow && oh)
1132 {
1133 int nw = minpot (ow);
1134 int nh = minpot (oh);
1135
1136 if (nw != ow || nh != oh)
1137 {
1138 if (SvOK (data_))
1139 {
1140 STRLEN datalen;
1141 char *data = SvPVbyte (data_, datalen);
1142 int bpp = datalen / (ow * oh);
1143 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1144
1145 SvPOK_only (result_);
1146 SvCUR_set (result_, nw * nh * bpp);
1147
1148 memset (SvPVX (result_), 0, nw * nh * bpp);
1149 while (oh--)
1150 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1151
1152 sv_setsv (data_, result_);
1153 }
1154
1155 sv_setiv (w_, nw);
1156 sv_setiv (h_, nh);
1157 }
1158 }
1159}
1160
1161void
744draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1162draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
745 PROTOTYPE: $$$;$$ 1163 PROTOTYPE: $$$;$$
1164 ALIAS:
1165 draw_quad_alpha = 1
1166 draw_quad_alpha_premultiplied = 2
746 CODE: 1167 CODE:
747{ 1168{
748 HV *hv = (HV *)SvRV (self); 1169 HV *hv = (HV *)SvRV (self);
749 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1170 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1171 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1172 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753 1173
754 if (items < 5) 1174 if (items < 5)
755 { 1175 {
756 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1176 w = SvNV (*hv_fetch (hv, "w", 1, 1));
757 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1177 h = SvNV (*hv_fetch (hv, "h", 1, 1));
758 } 1178 }
759 1179
1180 if (ix)
1181 {
1182 glEnable (GL_BLEND);
1183
1184 if (ix == 2)
1185 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1186 else
1187 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1188 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1189
1190 glEnable (GL_ALPHA_TEST);
1191 glAlphaFunc (GL_GREATER, 0.01f);
1192 }
1193
760 glBindTexture (GL_TEXTURE_2D, name); 1194 glBindTexture (GL_TEXTURE_2D, name);
761 if (wrap_mode) { 1195
762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764 }
765 glBegin (GL_QUADS); 1196 glBegin (GL_QUADS);
766 glTexCoord2f (0, 0); glVertex2f (x , y ); 1197 glTexCoord2f (0, 0); glVertex2f (x , y );
767 glTexCoord2f (0, t); glVertex2f (x , y + h); 1198 glTexCoord2f (0, t); glVertex2f (x , y + h);
768 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1199 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1200 glTexCoord2f (s, 0); glVertex2f (x + w, y );
770 glEnd (); 1201 glEnd ();
771}
772 1202
1203 if (ix)
1204 {
1205 glDisable (GL_ALPHA_TEST);
1206 glDisable (GL_BLEND);
1207 }
1208}
1209
773MODULE = CFClient PACKAGE = CFClient::Map 1210MODULE = CFPlus PACKAGE = CFPlus::Map
774 1211
775CFClient::Map 1212CFPlus::Map
776new (SV *class, int map_width, int map_height) 1213new (SV *class)
777 CODE: 1214 CODE:
778 New (0, RETVAL, 1, struct map); 1215 New (0, RETVAL, 1, struct map);
779 RETVAL->x = 0; 1216 RETVAL->x = 0;
780 RETVAL->y = 0; 1217 RETVAL->y = 0;
781 RETVAL->w = map_width; 1218 RETVAL->w = 0;
782 RETVAL->h = map_height; 1219 RETVAL->h = 0;
783 RETVAL->ox = 0; 1220 RETVAL->ox = 0;
784 RETVAL->oy = 0; 1221 RETVAL->oy = 0;
785 RETVAL->faces = 8192; 1222 RETVAL->faces = 8192;
786 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1223 Newz (0, RETVAL->face, RETVAL->faces, mapface);
787 RETVAL->texs = 8192; 1224 RETVAL->texs = 8192;
790 RETVAL->row = 0; 1227 RETVAL->row = 0;
791 OUTPUT: 1228 OUTPUT:
792 RETVAL 1229 RETVAL
793 1230
794void 1231void
795DESTROY (CFClient::Map self) 1232DESTROY (CFPlus::Map self)
796 CODE: 1233 CODE:
797{ 1234{
798 map_clear (self); 1235 map_clear (self);
799 Safefree (self->face); 1236 Safefree (self->face);
1237 Safefree (self->tex);
800 Safefree (self); 1238 Safefree (self);
801} 1239}
802 1240
803void 1241void
1242resize (CFPlus::Map self, int map_width, int map_height)
1243 CODE:
1244 self->w = map_width;
1245 self->h = map_height;
1246
1247void
804clear (CFClient::Map self) 1248clear (CFPlus::Map self)
805 CODE: 1249 CODE:
806 map_clear (self); 1250 map_clear (self);
807 1251
808void 1252void
809set_face (CFClient::Map self, int face, int texid) 1253set_face (CFPlus::Map self, int face, int texid)
810 CODE: 1254 CODE:
811{ 1255{
812 while (self->faces <= face) 1256 while (self->faces <= face)
813 { 1257 {
814 Append (mapface, self->face, self->faces, self->faces); 1258 Append (mapface, self->face, self->faces, self->faces);
817 1261
818 self->face [face] = texid; 1262 self->face [face] = texid;
819} 1263}
820 1264
821void 1265void
822set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1266set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
823 CODE: 1267 CODE:
824{ 1268{
825 while (self->texs <= texid) 1269 while (self->texs <= texid)
826 { 1270 {
827 Append (maptex, self->tex, self->texs, self->texs); 1271 Append (maptex, self->tex, self->texs, self->texs);
839 tex->r = r; 1283 tex->r = r;
840 tex->g = g; 1284 tex->g = g;
841 tex->b = b; 1285 tex->b = b;
842 tex->a = a; 1286 tex->a = a;
843 } 1287 }
1288
1289 // somewhat hackish, but for textures that require it, it really
1290 // improves the look, and most others don't suffer.
1291 glBindTexture (GL_TEXTURE_2D, name);
1292 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1293 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1294 // use uglier nearest interpolation because linear suffers
1295 // from transparent color bleeding and ugly wrapping effects.
1296 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
844} 1297}
845 1298
846int 1299int
847ox (CFClient::Map self) 1300ox (CFPlus::Map self)
848 ALIAS: 1301 ALIAS:
849 oy = 1 1302 oy = 1
1303 x = 2
1304 y = 3
1305 w = 4
1306 h = 5
850 CODE: 1307 CODE:
851 switch (ix) 1308 switch (ix)
852 { 1309 {
853 case 0: RETVAL = self->ox; break; 1310 case 0: RETVAL = self->ox; break;
854 case 1: RETVAL = self->oy; break; 1311 case 1: RETVAL = self->oy; break;
1312 case 2: RETVAL = self->x; break;
1313 case 3: RETVAL = self->y; break;
1314 case 4: RETVAL = self->w; break;
1315 case 5: RETVAL = self->h; break;
855 } 1316 }
856 OUTPUT: 1317 OUTPUT:
857 RETVAL 1318 RETVAL
858 1319
859void 1320void
860scroll (CFClient::Map self, int dx, int dy) 1321scroll (CFPlus::Map self, int dx, int dy)
861 CODE: 1322 CODE:
862{ 1323{
863 if (dx > 0) 1324 if (dx > 0)
864 map_blank (self, self->x, self->y, dx - 1, self->h); 1325 map_blank (self, self->x, self->y, dx, self->h);
865 else if (dx < 0) 1326 else if (dx < 0)
866 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1327 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
867 1328
868 if (dy > 0) 1329 if (dy > 0)
869 map_blank (self, self->x, self->y, self->w, dy - 1); 1330 map_blank (self, self->x, self->y, self->w, dy);
870 else if (dy < 0) 1331 else if (dy < 0)
871 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1332 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
872 1333
873 self->ox += dx; self->x += dx; 1334 self->ox += dx; self->x += dx;
874 self->oy += dy; self->y += dy; 1335 self->oy += dy; self->y += dy;
875 1336
876 while (self->y < 0) 1337 while (self->y < 0)
881 self->y += MAP_EXTEND_Y; 1342 self->y += MAP_EXTEND_Y;
882 } 1343 }
883} 1344}
884 1345
885void 1346void
886map1a_update (CFClient::Map self, SV *data_) 1347map1a_update (CFPlus::Map self, SV *data_, int extmap)
887 CODE: 1348 CODE:
888{ 1349{
889 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1350 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
890 uint8_t *data_end = (uint8_t *)SvEND (data_); 1351 uint8_t *data_end = (uint8_t *)SvEND (data_);
891 mapcell *cell; 1352 mapcell *cell;
892 int x, y, flags; 1353 int x, y, flags;
893 1354
894 while (data < data_end) 1355 while (data < data_end - 1)
895 { 1356 {
896 flags = (data [0] << 8) + data [1]; data += 2; 1357 flags = (data [0] << 8) + data [1]; data += 2;
897 1358
898 x = ((flags >> 10) & 63) + self->x; 1359 x = self->x + ((flags >> 10) & 63);
899 y = ((flags >> 4) & 63) + self->y; 1360 y = self->y + ((flags >> 4) & 63);
900 1361
901 cell = map_get_cell (self, x, y); 1362 cell = map_get_cell (self, x, y);
902 1363
903 if (flags & 15) 1364 if (flags & 15)
904 { 1365 {
905 if (cell->darkness < 0) 1366 if (!cell->darkness)
906 { 1367 {
1368 memset (cell, 0, sizeof (*cell));
907 cell->darkness = 0; 1369 cell->darkness = 256;
908 cell->face [0] = 0;
909 cell->face [1] = 0;
910 cell->face [2] = 0;
911 } 1370 }
912 1371
913 cell->darkness = flags & 8 ? *data++ : 255;
914
915 //TODO: don't trust server data to be in-range(!) 1372 //TODO: don't trust server data to be in-range(!)
1373
1374 if (flags & 8)
1375 {
1376 if (extmap)
1377 {
1378 uint8_t ext, cmd;
1379
1380 do
1381 {
1382 ext = *data++;
1383 cmd = ext & 0x3f;
1384
1385 if (cmd < 4)
1386 cell->darkness = 255 - ext * 64 + 1;
1387 else if (cmd == 5) // health
1388 {
1389 cell->stat_width = 1;
1390 cell->stat_hp = *data++;
1391 }
1392 else if (cmd == 6) // monster width
1393 cell->stat_width = *data++ + 1;
1394 else if (cmd == 0x47) // monster width
1395 {
1396 if (*data == 4)
1397 ; // decode player tag
1398
1399 data += *data + 1;
1400 }
1401 else if (cmd == 8) // cell flags
1402 cell->flags = *data++;
1403 else if (ext & 0x40) // unknown, multibyte => skip
1404 data += *data + 1;
1405 else
1406 data++;
1407 }
1408 while (ext & 0x80);
1409 }
1410 else
1411 cell->darkness = *data++ + 1;
1412 }
916 1413
917 if (flags & 4) 1414 if (flags & 4)
918 { 1415 {
919 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1416 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
920 } 1417 }
928 { 1425 {
929 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1426 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
930 } 1427 }
931 } 1428 }
932 else 1429 else
933 cell->darkness = -1; 1430 cell->darkness = 0;
934 } 1431 }
935} 1432}
936 1433
937SV * 1434SV *
938mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1435mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939 CODE: 1436 CODE:
940{ 1437{
941 int x1, x; 1438 int x1, x;
942 int y1, y; 1439 int y1, y;
943 int z; 1440 int z;
993} 1490}
994 OUTPUT: 1491 OUTPUT:
995 RETVAL 1492 RETVAL
996 1493
997void 1494void
998draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1495draw (CFPlus::Map self, int mx, int my, int sw, int sh)
999 PPCODE: 1496 CODE:
1000{ 1497{
1001 int vx, vy;
1002 int x, y, z; 1498 int x, y, z;
1003 int last_name; 1499 int last_name;
1004 mapface face; 1500 mapface face;
1005 int sw4 = (sw + 3) & ~3;
1006 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1007 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1008
1009 memset (darkness, 255, sw4 * sh);
1010 SvPOK_only (darkness_sv);
1011 SvCUR_set (darkness_sv, sw4 * sh);
1012
1013 vx = self->x + (self->w - sw) / 2 - shift_x;
1014 vy = self->y + (self->h - sh) / 2 - shift_y;
1015
1016 /*
1017 int vx = self->vx = self->w >= sw
1018 ? self->x + (self->w - sw) / 2
1019 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1020
1021 int vy = self->vy = self->h >= sh
1022 ? self->y + (self->h - sh) / 2
1023 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1024 */
1025 1501
1026 glColor4ub (255, 255, 255, 255); 1502 glColor4ub (255, 255, 255, 255);
1027 1503
1504 glEnable (GL_BLEND);
1028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1505 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029 glEnable (GL_BLEND);
1030 glEnable (GL_TEXTURE_2D); 1506 glEnable (GL_TEXTURE_2D);
1031 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1507 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032 1508
1033 glBegin (GL_QUADS); 1509 glBegin (GL_QUADS);
1034 1510
1035 last_name = 0; 1511 last_name = 0;
1036 1512
1513 mx += self->x;
1514 my += self->y;
1515
1037 for (z = 0; z < 3; z++) 1516 for (z = 0; z < 3; z++)
1038 for (y = 0; y < sh; y++) 1517 for (y = 0; y < sh; y++)
1039 if (0 <= y + vy && y + vy < self->rows) 1518 if (0 <= y + my && y + my < self->rows)
1040 { 1519 {
1041 maprow *row = self->row + (y + vy); 1520 maprow *row = self->row + (y + my);
1042 1521
1043 for (x = 0; x < sw; x++) 1522 for (x = 0; x < sw; x++)
1044 if (row->c0 <= x + vx && x + vx < row->c1) 1523 if (row->c0 <= x + mx && x + mx < row->c1)
1045 { 1524 {
1046 mapcell *cell = row->col + (x + vx - row->c0); 1525 mapcell *cell = row->col + (x + mx - row->c0);
1047
1048 darkness[y * sw4 + x] = cell->darkness < 0
1049 ? 255 - FOW_DARKNESS
1050 : 255 - cell->darkness;
1051 1526
1052 face = cell->face [z]; 1527 face = cell->face [z];
1053 1528
1054 if (face) 1529 if (face && face < self->texs)
1055 { 1530 {
1056 maptex tex = self->tex [face]; 1531 maptex tex = self->tex [face];
1057
1058 int px = (x + 1) * 32 - tex.w; 1532 int px = (x + 1) * 32 - tex.w;
1059 int py = (y + 1) * 32 - tex.h; 1533 int py = (y + 1) * 32 - tex.h;
1060 1534
1061 if (last_name != tex.name) 1535 if (last_name != tex.name)
1062 { 1536 {
1063 glEnd (); 1537 glEnd ();
1064 last_name = tex.name;
1065 glBindTexture (GL_TEXTURE_2D, last_name); 1538 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1066 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1067 } 1540 }
1068 1541
1069 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1542 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1070 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1543 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1071 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1544 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1072 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1545 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1073 } 1546 }
1547
1548 if (cell->flags && z == 2)
1549 {
1550 if (cell->flags & 1)
1551 {
1552 maptex tex = self->tex [1];
1553 int px = (x + 1) * 32 - tex.w + 2;
1554 int py = (y + 1) * 32 - tex.h - 6;
1555
1556 glEnd ();
1557 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1558 glBegin (GL_QUADS);
1559
1560 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1561 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1562 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1563 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1564 }
1565 }
1074 } 1566 }
1075 } 1567 }
1076 1568
1077 glEnd (); 1569 glEnd ();
1078 1570
1079 glDisable (GL_TEXTURE_2D); 1571 glDisable (GL_TEXTURE_2D);
1080 glDisable (GL_BLEND); 1572 glDisable (GL_BLEND);
1573
1574 // top layer: overlays such as the health bar
1575 for (y = 0; y < sh; y++)
1576 if (0 <= y + my && y + my < self->rows)
1577 {
1578 maprow *row = self->row + (y + my);
1579
1580 for (x = 0; x < sw; x++)
1581 if (row->c0 <= x + mx && x + mx < row->c1)
1582 {
1583 mapcell *cell = row->col + (x + mx - row->c0);
1584
1585 int px = x * 32;
1586 int py = y * 32;
1587
1588 if (cell->stat_hp)
1589 {
1590 int width = cell->stat_width * 32;
1591 int thick = sh / 28 + 1 + cell->stat_width;
1592
1593 glColor3ub (0, 0, 0);
1594 glRectf (px + 1, py - thick - 2,
1595 px + width - 1, py);
1596
1597 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1598 glRectf (px + 2,
1599 py - thick - 1,
1600 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1601 }
1602 }
1603 }
1604}
1605
1606void
1607draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1608 CODE:
1609{
1610 static float color[16][3] = {
1611 { 0.00F, 0.00F, 0.00F },
1612 { 1.00F, 1.00F, 1.00F },
1613 { 0.00F, 0.00F, 0.55F },
1614 { 1.00F, 0.00F, 0.00F },
1615
1616 { 1.00F, 0.54F, 0.00F },
1617 { 0.11F, 0.56F, 1.00F },
1618 { 0.93F, 0.46F, 0.00F },
1619 { 0.18F, 0.54F, 0.34F },
1620
1621 { 0.56F, 0.73F, 0.56F },
1622 { 0.80F, 0.80F, 0.80F },
1623 { 0.55F, 0.41F, 0.13F },
1624 { 0.99F, 0.77F, 0.26F },
1625
1626 { 0.74F, 0.65F, 0.41F },
1627
1628 { 0.00F, 1.00F, 1.00F },
1629 { 1.00F, 0.00F, 1.00F },
1630 { 1.00F, 1.00F, 0.00F },
1631 };
1632
1633 int x, y;
1634
1635 glEnable (GL_TEXTURE_2D);
1636 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1637 glEnable (GL_BLEND);
1638 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1639 glBegin (GL_QUADS);
1640
1641 for (y = 0; y < h; y++)
1642 for (x = 0; x < w; x++)
1643 {
1644 unsigned char m = data [x + y * w];
1645
1646 if (m)
1647 {
1648 float *c = color [m & 15];
1649
1650 float tx1 = m & 0x40 ? 0.5 : 0.;
1651 float tx2 = tx1 + 0.5;
1652
1653 glColor4f (c[0], c[1], c[2], 0.75);
1654 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1655 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1656 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1657 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1658 }
1659 }
1660
1661 glEnd ();
1662 glDisable (GL_BLEND);
1663 glDisable (GL_TEXTURE_2D);
1664}
1665
1666void
1667fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1668 PPCODE:
1669{
1670 int x, y;
1671 int sw4 = (sw + 3) & ~3;
1672 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1673 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1674
1675 memset (darkness, 255, sw4 * sh);
1676 SvPOK_only (darkness_sv);
1677 SvCUR_set (darkness_sv, sw4 * sh);
1678
1679 mx += self->x;
1680 my += self->y;
1681
1682 for (y = 0; y < sh; y++)
1683 if (0 <= y + my && y + my < self->rows)
1684 {
1685 maprow *row = self->row + (y + my);
1686
1687 for (x = 0; x < sw; x++)
1688 if (row->c0 <= x + mx && x + mx < row->c1)
1689 {
1690 mapcell *cell = row->col + (x + mx - row->c0);
1691
1692 darkness[y * sw4 + x] = cell->darkness
1693 ? 255 - (cell->darkness - 1)
1694 : 255 - FOW_DARKNESS;
1695 }
1696 }
1081 1697
1082 EXTEND (SP, 3); 1698 EXTEND (SP, 3);
1083 PUSHs (sv_2mortal (newSViv (sw4))); 1699 PUSHs (sv_2mortal (newSViv (sw4)));
1084 PUSHs (sv_2mortal (newSViv (sh))); 1700 PUSHs (sv_2mortal (newSViv (sh)));
1085 PUSHs (darkness_sv); 1701 PUSHs (darkness_sv);
1086} 1702}
1087 1703
1088SV * 1704SV *
1089get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1705get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1090 CODE: 1706 CODE:
1091{ 1707{
1092 int x, y, x1, y1; 1708 int x, y, x1, y1;
1093 SV *data_sv = newSV (w * h * 7 + 5); 1709 SV *data_sv = newSV (w * h * 7 + 5);
1094 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1710 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1156} 1772}
1157 OUTPUT: 1773 OUTPUT:
1158 RETVAL 1774 RETVAL
1159 1775
1160void 1776void
1161set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1777set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1162 PPCODE: 1778 PPCODE:
1163{ 1779{
1164 int x, y, z; 1780 int x, y, z;
1165 int w, h; 1781 int w, h;
1166 int x1, y1; 1782 int x1, y1;
1198 1814
1199 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1815 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1200 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1816 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1201 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1817 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1202 1818
1203 if (cell->darkness <= 0) 1819 if (cell->darkness == 0)
1204 { 1820 {
1205 cell->darkness = -1; 1821 cell->darkness = 0;
1206 1822
1207 for (z = 0; z <= 2; z++) 1823 for (z = 0; z <= 2; z++)
1208 { 1824 {
1209 cell->face[z] = face[z]; 1825 cell->face[z] = face[z];
1210 1826
1215 } 1831 }
1216 } 1832 }
1217 } 1833 }
1218} 1834}
1219 1835
1220MODULE = CFClient PACKAGE = CFClient::MixChunk 1836MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221 1837
1222CFClient::MixChunk 1838CFPlus::MixChunk
1223new_from_file (SV *class, char *path) 1839new_from_file (SV *class, char *path)
1224 CODE: 1840 CODE:
1225 RETVAL = Mix_LoadWAV (path); 1841 RETVAL = Mix_LoadWAV (path);
1226 OUTPUT: 1842 OUTPUT:
1227 RETVAL 1843 RETVAL
1228 1844
1229void 1845void
1230DESTROY (CFClient::MixChunk self) 1846DESTROY (CFPlus::MixChunk self)
1231 CODE: 1847 CODE:
1232 Mix_FreeChunk (self); 1848 Mix_FreeChunk (self);
1233 1849
1234int 1850int
1235volume (CFClient::MixChunk self, int volume = -1) 1851volume (CFPlus::MixChunk self, int volume = -1)
1236 CODE: 1852 CODE:
1237 RETVAL = Mix_VolumeChunk (self, volume); 1853 RETVAL = Mix_VolumeChunk (self, volume);
1238 OUTPUT: 1854 OUTPUT:
1239 RETVAL 1855 RETVAL
1240 1856
1241int 1857int
1242play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1858play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1243 CODE: 1859 CODE:
1244 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1860 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245 OUTPUT: 1861 OUTPUT:
1246 RETVAL 1862 RETVAL
1247 1863
1248MODULE = CFClient PACKAGE = CFClient::MixMusic 1864MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249 1865
1250int 1866int
1251volume (int volume = -1) 1867volume (int volume = -1)
1252 CODE: 1868 CODE:
1253 RETVAL = Mix_VolumeMusic (volume); 1869 RETVAL = Mix_VolumeMusic (volume);
1254 OUTPUT: 1870 OUTPUT:
1255 RETVAL 1871 RETVAL
1256 1872
1257CFClient::MixMusic 1873CFPlus::MixMusic
1258new_from_file (SV *class, char *path) 1874new_from_file (SV *class, char *path)
1259 CODE: 1875 CODE:
1260 RETVAL = Mix_LoadMUS (path); 1876 RETVAL = Mix_LoadMUS (path);
1261 OUTPUT: 1877 OUTPUT:
1262 RETVAL 1878 RETVAL
1263 1879
1264void 1880void
1265DESTROY (CFClient::MixMusic self) 1881DESTROY (CFPlus::MixMusic self)
1266 CODE: 1882 CODE:
1267 Mix_FreeMusic (self); 1883 Mix_FreeMusic (self);
1268 1884
1269int 1885int
1270play (CFClient::MixMusic self, int loops = -1) 1886play (CFPlus::MixMusic self, int loops = -1)
1271 CODE: 1887 CODE:
1272 RETVAL = Mix_PlayMusic (self, loops); 1888 RETVAL = Mix_PlayMusic (self, loops);
1273 OUTPUT: 1889 OUTPUT:
1274 RETVAL 1890 RETVAL
1275 1891
1276MODULE = CFClient PACKAGE = CFClient::OpenGL 1892MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277 1893
1278BOOT: 1894BOOT:
1279{ 1895{
1280 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1896 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281 static const struct { 1897 static const struct {
1282 const char *name; 1898 const char *name;
1283 IV iv; 1899 IV iv;
1284 } *civ, const_iv[] = { 1900 } *civ, const_iv[] = {
1285# define const_iv(name) { # name, (IV)name } 1901# define const_iv(name) { # name, (IV)name }
1286 const_iv (GL_COLOR_MATERIAL), 1902 const_iv (GL_COLOR_MATERIAL),
1287 const_iv (GL_SMOOTH), 1903 const_iv (GL_SMOOTH),
1288 const_iv (GL_FLAT), 1904 const_iv (GL_FLAT),
1905 const_iv (GL_DITHER),
1289 const_iv (GL_BLEND), 1906 const_iv (GL_BLEND),
1907 const_iv (GL_CULL_FACE),
1908 const_iv (GL_SCISSOR_TEST),
1909 const_iv (GL_DEPTH_TEST),
1910 const_iv (GL_ALPHA_TEST),
1911 const_iv (GL_NORMALIZE),
1912 const_iv (GL_RESCALE_NORMAL),
1913 const_iv (GL_FRONT),
1914 const_iv (GL_BACK),
1290 const_iv (GL_AND), 1915 const_iv (GL_AND),
1916 const_iv (GL_ONE),
1917 const_iv (GL_ZERO),
1291 const_iv (GL_SRC_ALPHA), 1918 const_iv (GL_SRC_ALPHA),
1919 const_iv (GL_DST_ALPHA),
1292 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1920 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1921 const_iv (GL_ONE_MINUS_DST_ALPHA),
1922 const_iv (GL_SRC_ALPHA_SATURATE),
1293 const_iv (GL_RGB), 1923 const_iv (GL_RGB),
1294 const_iv (GL_RGBA), 1924 const_iv (GL_RGBA),
1925 const_iv (GL_RGBA4),
1926 const_iv (GL_RGBA8),
1927 const_iv (GL_RGB5_A1),
1295 const_iv (GL_UNSIGNED_BYTE), 1928 const_iv (GL_UNSIGNED_BYTE),
1296 const_iv (GL_ALPHA4), 1929 const_iv (GL_UNSIGNED_SHORT),
1930 const_iv (GL_UNSIGNED_INT),
1297 const_iv (GL_ALPHA), 1931 const_iv (GL_ALPHA),
1932 const_iv (GL_INTENSITY),
1933 const_iv (GL_LUMINANCE),
1934 const_iv (GL_LUMINANCE_ALPHA),
1298 const_iv (GL_FLOAT), 1935 const_iv (GL_FLOAT),
1299 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1936 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300 const_iv (GL_COMPILE), 1937 const_iv (GL_COMPILE),
1301 const_iv (GL_TEXTURE_1D), 1938 const_iv (GL_TEXTURE_1D),
1302 const_iv (GL_TEXTURE_2D), 1939 const_iv (GL_TEXTURE_2D),
1304 const_iv (GL_TEXTURE_MAG_FILTER), 1941 const_iv (GL_TEXTURE_MAG_FILTER),
1305 const_iv (GL_TEXTURE_MIN_FILTER), 1942 const_iv (GL_TEXTURE_MIN_FILTER),
1306 const_iv (GL_TEXTURE_ENV_MODE), 1943 const_iv (GL_TEXTURE_ENV_MODE),
1307 const_iv (GL_TEXTURE_WRAP_S), 1944 const_iv (GL_TEXTURE_WRAP_S),
1308 const_iv (GL_TEXTURE_WRAP_T), 1945 const_iv (GL_TEXTURE_WRAP_T),
1946 const_iv (GL_REPEAT),
1309 const_iv (GL_CLAMP), 1947 const_iv (GL_CLAMP),
1310 const_iv (GL_REPEAT), 1948 const_iv (GL_CLAMP_TO_EDGE),
1311 const_iv (GL_NEAREST), 1949 const_iv (GL_NEAREST),
1312 const_iv (GL_LINEAR), 1950 const_iv (GL_LINEAR),
1951 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1952 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1953 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1954 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1955 const_iv (GL_GENERATE_MIPMAP),
1313 const_iv (GL_MODULATE), 1956 const_iv (GL_MODULATE),
1957 const_iv (GL_DECAL),
1314 const_iv (GL_REPLACE), 1958 const_iv (GL_REPLACE),
1959 const_iv (GL_DEPTH_BUFFER_BIT),
1315 const_iv (GL_COLOR_BUFFER_BIT), 1960 const_iv (GL_COLOR_BUFFER_BIT),
1316 const_iv (GL_PROJECTION), 1961 const_iv (GL_PROJECTION),
1317 const_iv (GL_MODELVIEW), 1962 const_iv (GL_MODELVIEW),
1318 const_iv (GL_COLOR_LOGIC_OP), 1963 const_iv (GL_COLOR_LOGIC_OP),
1964 const_iv (GL_SEPARABLE_2D),
1319 const_iv (GL_CONVOLUTION_2D), 1965 const_iv (GL_CONVOLUTION_2D),
1320 const_iv (GL_CONVOLUTION_BORDER_MODE), 1966 const_iv (GL_CONVOLUTION_BORDER_MODE),
1321 const_iv (GL_CONSTANT_BORDER), 1967 const_iv (GL_CONSTANT_BORDER),
1322 const_iv (GL_LINES), 1968 const_iv (GL_LINES),
1969 const_iv (GL_LINE_STRIP),
1970 const_iv (GL_LINE_LOOP),
1323 const_iv (GL_QUADS), 1971 const_iv (GL_QUADS),
1324 const_iv (GL_LINE_LOOP), 1972 const_iv (GL_QUAD_STRIP),
1973 const_iv (GL_TRIANGLES),
1974 const_iv (GL_TRIANGLE_STRIP),
1975 const_iv (GL_TRIANGLE_FAN),
1325 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1976 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1326 const_iv (GL_FASTEST), 1977 const_iv (GL_FASTEST),
1978 const_iv (GL_V2F),
1979 const_iv (GL_V3F),
1980 const_iv (GL_T2F_V3F),
1981 const_iv (GL_T2F_N3F_V3F),
1327# undef const_iv 1982# undef const_iv
1328 }; 1983 };
1329 1984
1330 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1985 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1331 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1986 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1332} 1987}
1333 1988
1989char *
1990gl_vendor ()
1991 CODE:
1992 RETVAL = (char *)glGetString (GL_VENDOR);
1993 OUTPUT:
1994 RETVAL
1995
1996char *
1997gl_version ()
1998 CODE:
1999 RETVAL = (char *)glGetString (GL_VERSION);
2000 OUTPUT:
2001 RETVAL
2002
2003char *
2004gl_extensions ()
2005 CODE:
2006 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2007 OUTPUT:
2008 RETVAL
2009
1334int glGetError () 2010int glGetError ()
2011
2012void glFinish ()
1335 2013
1336void glClear (int mask) 2014void glClear (int mask)
1337 2015
1338void glClearColor (float r, float g, float b, float a = 1.0) 2016void glClearColor (float r, float g, float b, float a = 1.0)
1339 PROTOTYPE: @ 2017 PROTOTYPE: @
1346 2024
1347void glHint (int target, int mode) 2025void glHint (int target, int mode)
1348 2026
1349void glBlendFunc (int sfactor, int dfactor) 2027void glBlendFunc (int sfactor, int dfactor)
1350 2028
2029void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2030 CODE:
2031 gl_BlendFuncSeparate (sa, da, saa, daa);
2032
2033void glDepthMask (int flag)
2034
1351void glLogicOp (int opcode) 2035void glLogicOp (int opcode)
1352 2036
2037void glColorMask (int red, int green, int blue, int alpha)
2038
1353void glMatrixMode (int mode) 2039void glMatrixMode (int mode)
1354 2040
1355void glPushMatrix () 2041void glPushMatrix ()
1356 2042
1357void glPopMatrix () 2043void glPopMatrix ()
1358 2044
1359void glLoadIdentity () 2045void glLoadIdentity ()
1360 2046
2047void glDrawBuffer (int buffer)
2048
2049void glReadBuffer (int buffer)
2050
2051# near_ and far_ are due to microsofts buggy "c" compiler
2052void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2053
2054# near_ and far_ are due to microsofts buggy "c" compiler
1361void glOrtho (double left, double right, double bottom, double top, double near, double far) 2055void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1362 2056
1363void glViewport (int x, int y, int width, int height) 2057void glViewport (int x, int y, int width, int height)
2058
2059void glScissor (int x, int y, int width, int height)
1364 2060
1365void glTranslate (float x, float y, float z = 0.) 2061void glTranslate (float x, float y, float z = 0.)
1366 CODE: 2062 CODE:
1367 glTranslatef (x, y, z); 2063 glTranslatef (x, y, z);
1368 2064
1369void glScale (float x, float y, float z) 2065void glScale (float x, float y, float z = 1.)
1370 CODE: 2066 CODE:
1371 glScalef (x, y, z); 2067 glScalef (x, y, z);
1372 2068
1373void glRotate (float angle, float x, float y, float z) 2069void glRotate (float angle, float x, float y, float z)
1374 CODE: 2070 CODE:
1378 2074
1379void glEnd () 2075void glEnd ()
1380 2076
1381void glColor (float r, float g, float b, float a = 1.0) 2077void glColor (float r, float g, float b, float a = 1.0)
1382 PROTOTYPE: @ 2078 PROTOTYPE: @
2079 ALIAS:
2080 glColor_premultiply = 1
1383 CODE: 2081 CODE:
2082 if (ix)
2083 {
2084 r *= a;
2085 g *= a;
2086 b *= a;
2087 }
2088 // microsoft visual "c" rounds instead of truncating...
1384 glColor4f (r, g, b, a); 2089 glColor4f (r, g, b, a);
2090
2091void glInterleavedArrays (int format, int stride, char *data)
2092
2093void glDrawElements (int mode, int count, int type, char *indices)
2094
2095# 1.2 void glDrawRangeElements (int mode, int start, int end
2096
2097void glRasterPos (float x, float y, float z = 0.)
2098 CODE:
2099 glRasterPos3f (0, 0, z);
2100 glBitmap (0, 0, 0, 0, x, y, 0);
1385 2101
1386void glVertex (float x, float y, float z = 0.) 2102void glVertex (float x, float y, float z = 0.)
1387 CODE: 2103 CODE:
1388 glVertex3f (x, y, z); 2104 glVertex3f (x, y, z);
1389 2105
1401 2117
1402void glBindTexture (int target, int name) 2118void glBindTexture (int target, int name)
1403 2119
1404void glConvolutionParameter (int target, int pname, float params) 2120void glConvolutionParameter (int target, int pname, float params)
1405 CODE: 2121 CODE:
2122 if (gl.ConvolutionParameterf)
1406 glConvolutionParameterf (target, pname, params); 2123 gl.ConvolutionParameterf (target, pname, params);
1407 2124
1408void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2125void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
2126 CODE:
2127 if (gl.ConvolutionFilter2D)
2128 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2129
2130void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2131 CODE:
2132 if (gl.SeparableFilter2D)
2133 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1409 2134
1410void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2135void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1411 2136
1412void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2137void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2138
2139void glDrawPixels (int width, int height, int format, int type, char *pixels)
2140
2141void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1413 2142
1414int glGenTexture () 2143int glGenTexture ()
1415 CODE: 2144 CODE:
1416{ 2145{
1417 GLuint name; 2146 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines