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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines