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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines