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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
52 58
53#define GL_CALL(type,func,args) \ 59#if 0
54 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 61#else
56 static type fptr_; \ 62# define PARACHUTE 0
57 \ 63#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 64
65static struct
66{
67#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h"
69#undef GL_FUNC
70} gl;
71
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{
74 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else
79 glBlendFunc (sa, da);
80}
81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
68typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
70 90
71typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
72 110
73typedef struct cf_layout { 111typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
77 int base_height; 114 int base_height;
78 CFClient__Font font; 115 CFPlus__Font font;
79} *CFClient__Layout; 116} *CFPlus__Layout;
80 117
81static CFClient__Font default_font; 118static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
84 121
85static void 122static void
86substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
87{ 124{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 126#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 128#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 130}
95 131
96static void 132static void
97layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
98{ 134{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
101 */ 137 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
106 142
107 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
108} 144}
109 145
110static void 146static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
114 153
115 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 156
118 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
119} 162}
120 163
121typedef uint16_t mapface; 164typedef uint16_t mapface;
122 165
123typedef struct { 166typedef struct {
126 float s, t; 169 float s, t;
127 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
128} maptex; 171} maptex;
129 172
130typedef struct { 173typedef struct {
131 int16_t darkness; 174 uint32_t player;
132 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
133} mapcell; 178} mapcell;
134 179
135typedef struct { 180typedef struct {
136 int32_t c0, c1; 181 int32_t c0, c1;
137 mapcell *col; 182 mapcell *col;
146 int texs; 191 int texs;
147 maptex *tex; 192 maptex *tex;
148 193
149 int32_t rows; 194 int32_t rows;
150 maprow *row; 195 maprow *row;
151} *CFClient__Map; 196} *CFPlus__Map;
152 197
153static char * 198static char *
154prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
155{ 200{
156 char *p; 201 char *p;
174 219
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 222
178static maprow * 223static maprow *
179map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
180{ 225{
181 if (0 > y) 226 if (0 > y)
182 { 227 {
183 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
222 267
223 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
224} 269}
225 270
226static mapcell * 271static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
228{ 273{
229 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
230} 275}
231 276
232static void 277static void
233map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
234{ 279{
235 int r; 280 int r;
236 281
237 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
246 self->row = 0; 291 self->row = 0;
247 self->rows = 0; 292 self->rows = 0;
248} 293}
249 294
250static void 295static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 296map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 297{
253 int x, y; 298 int x, y;
254 maprow *row; 299 maprow *row;
300 mapcell *cell;
255 301
256 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 303 if (y >= 0)
258 { 304 {
259 if (y >= self->rows) 305 if (y >= self->rows)
265 if (x >= row->c0) 311 if (x >= row->c0)
266 { 312 {
267 if (x >= row->c1) 313 if (x >= row->c1)
268 break; 314 break;
269 315
270 row->col[x - row->c0].darkness = -1; 316 cell = row->col + x - row->c0;
317
318 cell->darkness = 0;
319 cell->stat_hp = 0;
320 cell->flags = 0;
321 cell->player = 0;
271 } 322 }
272 } 323 }
273} 324}
274 325
275static void 326static void
296 ev.data2 = 0; 347 ev.data2 = 0;
297 348
298 SDL_PushEvent ((SDL_Event *)&ev); 349 SDL_PushEvent ((SDL_Event *)&ev);
299} 350}
300 351
352static unsigned int
353minpot (unsigned int n)
354{
355 if (!n)
356 return 0;
357
358 --n;
359
360 n |= n >> 1;
361 n |= n >> 2;
362 n |= n >> 4;
363 n |= n >> 8;
364 n |= n >> 16;
365
366 return n + 1;
367}
368
301MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
302 370
303PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
304 372
305BOOT: 373BOOT:
306{ 374{
307 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 376 static const struct {
309 const char *name; 377 const char *name;
310 IV iv; 378 IV iv;
311 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
413 481
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 484}
417 485
486int
487in_destruct ()
488 CODE:
489 RETVAL = PL_main_cv == Nullcv;
490 OUTPUT:
491 RETVAL
492
493NV floor (NV x)
494
495NV ceil (NV x)
496
418void 497void
419pango_init () 498pango_init ()
420 CODE: 499 CODE:
421{ 500{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 501 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 502 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 503 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427 cairo_fontmap = pango_cairo_font_map_get_default ();
428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429} 504}
430 505
431int 506int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 507SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 508
434void 509void
435SDL_Quit () 510SDL_Quit ()
436 511
437void 512void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 519 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 522
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 524 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 525
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 530
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10)
533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif
457 536
458 SDL_EnableUNICODE (1); 537 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 539
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 558SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 559 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 560 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 562 );
563 if (RETVAL)
564 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 565 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
567# include "glfunc.h"
568# undef GL_FUNC
569 }
485 OUTPUT: 570 OUTPUT:
486 RETVAL 571 RETVAL
487 572
488void 573void
489SDL_GL_SwapBuffers () 574SDL_GL_SwapBuffers ()
575
576char *
577SDL_GetKeyName (int sym)
490 578
491void 579void
492SDL_PollEvent () 580SDL_PollEvent ()
493 PPCODE: 581 PPCODE:
494{ 582{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 603 break;
516 604
517 case SDL_MOUSEMOTION: 605 case SDL_MOUSEMOTION:
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 613 break;
524 614
525 case SDL_MOUSEBUTTONDOWN: 615 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 616 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
618
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 619 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 620 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 621 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 622 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 623 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 627 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 628 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 629 break;
538 } 630 }
539 631
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 632 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 633 }
542} 634}
543 635
544int 636int
545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 637Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
558 CODE: 650 CODE:
559#ifndef _WIN32 651#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 653#endif
562 654
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583
584void 655void
585add_font (char *file) 656add_font (char *file)
586 CODE: 657 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 658 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 659
593void 660void
594load_image_inline (SV *image_) 661load_image_inline (SV *image_)
595 ALIAS: 662 ALIAS:
596 load_image_file = 1 663 load_image_file = 1
638 705
639 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 706 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640 707
641 assert (surface2->pitch == surface2->w * 4); 708 assert (surface2->pitch == surface2->w * 4);
642 709
710 SDL_LockSurface (surface2);
643 EXTEND (SP, 5); 711 EXTEND (SP, 6);
644 PUSHs (sv_2mortal (newSViv (surface2->w))); 712 PUSHs (sv_2mortal (newSViv (surface2->w)));
645 PUSHs (sv_2mortal (newSViv (surface2->h))); 713 PUSHs (sv_2mortal (newSViv (surface2->h)));
646 SDL_LockSurface (surface2);
647 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 714 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
648 SDL_UnlockSurface (surface2);
649 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 715 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
650 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 716 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 717 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
718 SDL_UnlockSurface (surface2);
652 719
653 SDL_FreeSurface (surface); 720 SDL_FreeSurface (surface);
654 SDL_FreeSurface (surface2); 721 SDL_FreeSurface (surface2);
655} 722}
656 723
692 CODE: 759 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 760 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 761#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 763#endif
697 exit (1); 764 _exit (1);
698 765
766void
767_exit (int retval)
768 CODE:
769 _exit (retval);
770
699MODULE = CFClient PACKAGE = CFClient::Font 771MODULE = CFPlus PACKAGE = CFPlus::Font
700 772
701CFClient::Font 773CFPlus::Font
702new_from_file (SV *class, char *path, int id = 0) 774new_from_file (SV *class, char *path, int id = 0)
703 CODE: 775 CODE:
704{ 776{
705 int count; 777 int count;
706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
709} 781}
710 OUTPUT: 782 OUTPUT:
711 RETVAL 783 RETVAL
712 784
713void 785void
714DESTROY (CFClient::Font self) 786DESTROY (CFPlus::Font self)
715 CODE: 787 CODE:
716 pango_font_description_free (self); 788 pango_font_description_free (self);
717 789
718void 790void
719make_default (CFClient::Font self) 791make_default (CFPlus::Font self)
720 CODE: 792 CODE:
721 default_font = self; 793 default_font = self;
722 794
723MODULE = CFClient PACKAGE = CFClient::Layout 795MODULE = CFPlus PACKAGE = CFPlus::Layout
724 796
725CFClient::Layout 797void
726new (SV *class, int rgba = 0) 798reset_glyph_cache ()
727 CODE: 799 CODE:
728#if _WIN32 800 tc_clear ();
729 rgba = 0;//D 801
730#endif 802CFPlus::Layout
803new (SV *class)
804 CODE:
731 New (0, RETVAL, 1, struct cf_layout); 805 New (0, RETVAL, 1, struct cf_layout);
732 806
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 807 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 808 RETVAL->r = 1.;
736 RETVAL->g = 1.; 809 RETVAL->g = 1.;
737 RETVAL->b = 1.; 810 RETVAL->b = 1.;
738 RETVAL->a = 1.; 811 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 812 RETVAL->base_height = MIN_FONT_HEIGHT;
743 layout_update_font (RETVAL); 816 layout_update_font (RETVAL);
744 OUTPUT: 817 OUTPUT:
745 RETVAL 818 RETVAL
746 819
747void 820void
748DESTROY (CFClient::Layout self) 821DESTROY (CFPlus::Layout self)
749 CODE: 822 CODE:
750 g_object_unref (self->pl); 823 g_object_unref (self->pl);
751 Safefree (self); 824 Safefree (self);
752 825
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 826void
761set_text (CFClient::Layout self, SV *text_) 827set_text (CFPlus::Layout self, SV *text_)
762 CODE: 828 CODE:
763{ 829{
764 STRLEN textlen; 830 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 831 char *text = SvPVutf8 (text_, textlen);
766 832
767 pango_layout_set_text (self->pl, text, textlen); 833 pango_layout_set_text (self->pl, text, textlen);
768} 834}
769 835
770void 836void
771set_markup (CFClient::Layout self, SV *text_) 837set_markup (CFPlus::Layout self, SV *text_)
772 CODE: 838 CODE:
773{ 839{
774 STRLEN textlen; 840 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 841 char *text = SvPVutf8 (text_, textlen);
776 842
777 pango_layout_set_markup (self->pl, text, textlen); 843 pango_layout_set_markup (self->pl, text, textlen);
778} 844}
779 845
846void
847set_shapes (CFPlus::Layout self, ...)
848 CODE:
849{
850 PangoAttrList *attrs = 0;
851 const char *text = pango_layout_get_text (self->pl);
852 const char *pos = text;
853 int arg = 4;
854
855 while (arg < items && (pos = strstr (pos, OBJ_STR)))
856 {
857 PangoRectangle inkrect, rect;
858 PangoAttribute *attr;
859
860 int x = SvIV (ST (arg - 3));
861 int y = SvIV (ST (arg - 2));
862 int w = SvIV (ST (arg - 1));
863 int h = SvIV (ST (arg ));
864
865 inkrect.x = 0;
866 inkrect.y = 0;
867 inkrect.width = 0;
868 inkrect.height = 0;
869
870 rect.x = x * PANGO_SCALE;
871 rect.y = y * PANGO_SCALE;
872 rect.width = w * PANGO_SCALE;
873 rect.height = h * PANGO_SCALE;
874
875 if (!attrs)
876 attrs = pango_layout_get_attributes (self->pl);
877
878 attr = pango_attr_shape_new (&inkrect, &rect);
879 attr->start_index = pos - text;
880 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
881 pango_attr_list_insert (attrs, attr);
882
883 arg += 4;
884 pos += sizeof (OBJ_STR) - 1;
885 }
886
887 if (attrs)
888 pango_layout_set_attributes (self->pl, attrs);
889}
890
891void
892get_shapes (CFPlus::Layout self)
893 PPCODE:
894{
895 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
896
897 do
898 {
899 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
900
901 if (run && shape_attr_p (run))
902 {
903 PangoRectangle extents;
904 pango_layout_iter_get_run_extents (iter, 0, &extents);
905
906 EXTEND (SP, 2);
907 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
908 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
909 }
910 }
911 while (pango_layout_iter_next_run (iter));
912
913 pango_layout_iter_free (iter);
914}
915
916int
917has_wrapped (CFPlus::Layout self)
918 CODE:
919{
920 int lines = 1;
921 const char *text = pango_layout_get_text (self->pl);
922
923 while (*text)
924 lines += *text++ == '\n';
925
926 RETVAL = lines < pango_layout_get_line_count (self->pl);
927}
928 OUTPUT:
929 RETVAL
930
780SV * 931SV *
781get_text (CFClient::Layout self) 932get_text (CFPlus::Layout self)
782 CODE: 933 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 935 sv_utf8_decode (RETVAL);
785 OUTPUT: 936 OUTPUT:
786 RETVAL 937 RETVAL
787 938
788void 939void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 940set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790 CODE: 941 CODE:
791 self->r = r; 942 self->r = r;
792 self->g = g; 943 self->g = g;
793 self->b = b; 944 self->b = b;
794 self->a = a; 945 self->a = a;
795 946
796void 947void
797set_font (CFClient::Layout self, CFClient::Font font = 0) 948set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798 CODE: 949 CODE:
799 if (self->font != font) 950 if (self->font != font)
800 { 951 {
801 self->font = font; 952 self->font = font;
802 layout_update_font (self); 953 layout_update_font (self);
803 } 954 }
804 955
805void 956void
806set_height (CFClient::Layout self, int base_height) 957set_height (CFPlus::Layout self, int base_height)
807 CODE: 958 CODE:
808 if (self->base_height != base_height) 959 if (self->base_height != base_height)
809 { 960 {
810 self->base_height = base_height; 961 self->base_height = base_height;
811 layout_update_font (self); 962 layout_update_font (self);
812 } 963 }
813 964
814void 965void
815set_width (CFClient::Layout self, int max_width = -1) 966set_width (CFPlus::Layout self, int max_width = -1)
816 CODE: 967 CODE:
817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 968 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
818 969
819void 970void
820set_indent (CFClient::Layout self, int indent) 971set_indent (CFPlus::Layout self, int indent)
821 CODE: 972 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 973 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823 974
824void 975void
825set_spacing (CFClient::Layout self, int spacing) 976set_spacing (CFPlus::Layout self, int spacing)
826 CODE: 977 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 978 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828 979
829void 980void
830set_ellipsise (CFClient::Layout self, int ellipsise) 981set_ellipsise (CFPlus::Layout self, int ellipsise)
831 CODE: 982 CODE:
832 pango_layout_set_ellipsize (self->pl, 983 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START 984 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 985 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 986 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE 987 : PANGO_ELLIPSIZE_NONE
837 ); 988 );
838 989
839void 990void
840set_single_paragraph_mode (CFClient::Layout self, int spm) 991set_single_paragraph_mode (CFPlus::Layout self, int spm)
841 CODE: 992 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 993 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843 994
844void 995void
845size (CFClient::Layout self) 996size (CFPlus::Layout self)
846 PPCODE: 997 PPCODE:
847{ 998{
848 int w, h; 999 int w, h;
849 1000
850 layout_get_pixel_size (self, &w, &h); 1001 layout_get_pixel_size (self, &w, &h);
853 PUSHs (sv_2mortal (newSViv (w))); 1004 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 1005 PUSHs (sv_2mortal (newSViv (h)));
855} 1006}
856 1007
857int 1008int
1009descent (CFPlus::Layout self)
1010 CODE:
1011{
1012 PangoRectangle rect;
1013 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1014 pango_layout_line_get_pixel_extents (line, 0, &rect);
1015 RETVAL = PANGO_DESCENT (rect);
1016}
1017 OUTPUT:
1018 RETVAL
1019
1020int
858xy_to_index (CFClient::Layout self, int x, int y) 1021xy_to_index (CFPlus::Layout self, int x, int y)
859 CODE: 1022 CODE:
860{ 1023{
861 int index, trailing; 1024 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
863 RETVAL = index; 1026 RETVAL = index;
864} 1027}
865 OUTPUT: 1028 OUTPUT:
866 RETVAL 1029 RETVAL
867 1030
868void 1031void
869cursor_pos (CFClient::Layout self, int index) 1032cursor_pos (CFPlus::Layout self, int index)
870 PPCODE: 1033 PPCODE:
871{ 1034{
872 PangoRectangle strong_pos; 1035 PangoRectangle strong_pos;
873 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874 1037
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1042}
880 1043
881void 1044void
882render (CFClient::Layout self) 1045render (CFPlus::Layout self, float x, float y, int flags = 0)
883 PPCODE: 1046 PPCODE:
884{ 1047 pango_opengl_render_layout_subpixel (
885 SV *retval; 1048 self->pl,
886 int w, h; 1049 x * PANGO_SCALE, y * PANGO_SCALE,
1050 self->r, self->g, self->b, self->a,
1051 flags
1052 );
887 1053
888 layout_get_pixel_size (self, &w, &h); 1054MODULE = CFPlus PACKAGE = CFPlus::Texture
889 1055
890 if (self->rgba) 1056void
1057pad2pot (SV *data_, SV *w_, SV *h_)
1058 CODE:
1059{
1060 int ow = SvIV (w_);
1061 int oh = SvIV (h_);
1062
1063 if (ow && oh)
891 { 1064 {
892 cairo_surface_t *surface; 1065 int nw = minpot (ow);
893 cairo_t *cairo; 1066 int nh = minpot (oh);
894 1067
895 retval = newSV (w * h * 4); 1068 if (nw != ow || nh != oh)
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 { 1069 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1070 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1071 {
918 uint32_t rgba = *p; 1072 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1073 char *data = SvPVbyte (data_, datalen);
920#if 0 1074 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1075 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927 1076
928 rgba = (rgba & 0xffffff00) | a; 1077 SvPOK_only (result_);
1078 SvCUR_set (result_, nw * nh * bpp);
1079
1080 memset (SvPVX (result_), 0, nw * nh * bpp);
1081 while (oh--)
1082 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1083
1084 sv_setsv (data_, result_);
929 } 1085 }
930#endif 1086
931#endif 1087 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1088 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1089 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 } 1090 }
944 else
945 {
946 FT_Bitmap bitmap;
947
948 retval = newSV (w * h);
949 SvPOK_only (retval);
950 SvCUR_set (retval, w * h);
951
952 bitmap.rows = h;
953 bitmap.width = w;
954 bitmap.pitch = w;
955 bitmap.buffer = (unsigned char*)SvPVX (retval);
956 bitmap.num_grays = 256;
957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959 memset (bitmap.buffer, 0, w * h);
960
961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963 EXTEND (SP, 5);
964 PUSHs (sv_2mortal (newSViv (w)));
965 PUSHs (sv_2mortal (newSViv (h)));
966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
970} 1091}
971 1092
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1093void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1094draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1095 PROTOTYPE: $$$;$$
977 ALIAS: 1096 ALIAS:
978 draw_quad_alpha = 1 1097 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1098 draw_quad_alpha_premultiplied = 2
980 CODE: 1099 CODE:
981{ 1100{
982 HV *hv = (HV *)SvRV (self); 1101 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1102 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1103 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1104 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1105
988 if (items < 5) 1106 if (items < 5)
989 { 1107 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1108 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1109 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1110 }
993 1111
994 if (ix) 1112 if (ix)
995 { 1113 {
996 glEnable (GL_BLEND); 1114 glEnable (GL_BLEND);
1115
1116 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1117 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1118 else
1119 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1120 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1121
998 glEnable (GL_ALPHA_TEST); 1122 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1123 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1124 }
1001 1125
1002 glBindTexture (GL_TEXTURE_2D, name); 1126 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1127
1010 glBegin (GL_QUADS); 1128 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1129 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1130 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1131 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1019 glDisable (GL_ALPHA_TEST); 1137 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND); 1138 glDisable (GL_BLEND);
1021 } 1139 }
1022} 1140}
1023 1141
1024MODULE = CFClient PACKAGE = CFClient::Map 1142MODULE = CFPlus PACKAGE = CFPlus::Map
1025 1143
1026CFClient::Map 1144CFPlus::Map
1027new (SV *class, int map_width, int map_height) 1145new (SV *class, int map_width, int map_height)
1028 CODE: 1146 CODE:
1029 New (0, RETVAL, 1, struct map); 1147 New (0, RETVAL, 1, struct map);
1030 RETVAL->x = 0; 1148 RETVAL->x = 0;
1031 RETVAL->y = 0; 1149 RETVAL->y = 0;
1041 RETVAL->row = 0; 1159 RETVAL->row = 0;
1042 OUTPUT: 1160 OUTPUT:
1043 RETVAL 1161 RETVAL
1044 1162
1045void 1163void
1046DESTROY (CFClient::Map self) 1164DESTROY (CFPlus::Map self)
1047 CODE: 1165 CODE:
1048{ 1166{
1049 map_clear (self); 1167 map_clear (self);
1050 Safefree (self->face); 1168 Safefree (self->face);
1169 Safefree (self->tex);
1051 Safefree (self); 1170 Safefree (self);
1052} 1171}
1053 1172
1054void 1173void
1055clear (CFClient::Map self) 1174clear (CFPlus::Map self)
1056 CODE: 1175 CODE:
1057 map_clear (self); 1176 map_clear (self);
1058 1177
1059void 1178void
1060set_face (CFClient::Map self, int face, int texid) 1179set_face (CFPlus::Map self, int face, int texid)
1061 CODE: 1180 CODE:
1062{ 1181{
1063 while (self->faces <= face) 1182 while (self->faces <= face)
1064 { 1183 {
1065 Append (mapface, self->face, self->faces, self->faces); 1184 Append (mapface, self->face, self->faces, self->faces);
1068 1187
1069 self->face [face] = texid; 1188 self->face [face] = texid;
1070} 1189}
1071 1190
1072void 1191void
1073set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1074 CODE: 1193 CODE:
1075{ 1194{
1076 while (self->texs <= texid) 1195 while (self->texs <= texid)
1077 { 1196 {
1078 Append (maptex, self->tex, self->texs, self->texs); 1197 Append (maptex, self->tex, self->texs, self->texs);
1090 tex->r = r; 1209 tex->r = r;
1091 tex->g = g; 1210 tex->g = g;
1092 tex->b = b; 1211 tex->b = b;
1093 tex->a = a; 1212 tex->a = a;
1094 } 1213 }
1214
1215 // somewhat hackish, but for textures that require it, it really
1216 // improves the look, and most others don't suffer.
1217 glBindTexture (GL_TEXTURE_2D, name);
1218 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1219 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1220 // use uglier nearest interpolation because linear suffers
1221 // from transparent color bleeding and ugly wrapping effects.
1222 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1223}
1096 1224
1097int 1225int
1098ox (CFClient::Map self) 1226ox (CFPlus::Map self)
1099 ALIAS: 1227 ALIAS:
1100 oy = 1 1228 oy = 1
1229 x = 2
1230 y = 3
1231 w = 4
1232 h = 5
1101 CODE: 1233 CODE:
1102 switch (ix) 1234 switch (ix)
1103 { 1235 {
1104 case 0: RETVAL = self->ox; break; 1236 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1237 case 1: RETVAL = self->oy; break;
1238 case 2: RETVAL = self->x; break;
1239 case 3: RETVAL = self->y; break;
1240 case 4: RETVAL = self->w; break;
1241 case 5: RETVAL = self->h; break;
1106 } 1242 }
1107 OUTPUT: 1243 OUTPUT:
1108 RETVAL 1244 RETVAL
1109 1245
1110void 1246void
1111scroll (CFClient::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1112 CODE: 1248 CODE:
1113{ 1249{
1114 if (dx > 0) 1250 if (dx > 0)
1115 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1116 else if (dx < 0) 1252 else if (dx < 0)
1117 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1118 1254
1119 if (dy > 0) 1255 if (dy > 0)
1120 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1121 else if (dy < 0) 1257 else if (dy < 0)
1122 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1123 1259
1124 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1125 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1126 1262
1127 while (self->y < 0) 1263 while (self->y < 0)
1132 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1133 } 1269 }
1134} 1270}
1135 1271
1136void 1272void
1137map1a_update (CFClient::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1138 CODE: 1274 CODE:
1139{ 1275{
1140 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1141 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1142 mapcell *cell; 1278 mapcell *cell;
1143 int x, y, flags; 1279 int x, y, flags;
1144 1280
1145 while (data < data_end) 1281 while (data < data_end - 1)
1146 { 1282 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1148 1284
1149 x = ((flags >> 10) & 63) + self->x; 1285 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1286 y = self->y + ((flags >> 4) & 63);
1151 1287
1152 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1153 1289
1154 if (flags & 15) 1290 if (flags & 15)
1155 { 1291 {
1156 if (cell->darkness < 0) 1292 if (!cell->darkness)
1157 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1158 cell->darkness = 0; 1295 cell->darkness = 256;
1159 cell->face [0] = 0;
1160 cell->face [1] = 0;
1161 cell->face [2] = 0;
1162 } 1296 }
1163 1297
1164 cell->darkness = flags & 8 ? *data++ : 255;
1165
1166 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1299
1300 if (flags & 8)
1301 {
1302 if (extmap)
1303 {
1304 uint8_t ext, cmd;
1305
1306 do
1307 {
1308 ext = *data++;
1309 cmd = ext & 0x3f;
1310
1311 if (cmd < 4)
1312 cell->darkness = 255 - ext * 64 + 1;
1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
1316 cell->stat_hp = *data++;
1317 }
1318 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width
1321 {
1322 if (*data == 4)
1323 ; // decode player tag
1324
1325 data += *data + 1;
1326 }
1327 else if (cmd == 8) // cell flags
1328 cell->flags = *data++;
1329 else if (ext & 0x40) // unknown, multibyte => skip
1330 data += *data + 1;
1331 else
1332 data++;
1333 }
1334 while (ext & 0x80);
1335 }
1336 else
1337 cell->darkness = *data++ + 1;
1338 }
1167 1339
1168 if (flags & 4) 1340 if (flags & 4)
1169 { 1341 {
1170 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1342 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1171 } 1343 }
1179 { 1351 {
1180 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181 } 1353 }
1182 } 1354 }
1183 else 1355 else
1184 cell->darkness = -1; 1356 cell->darkness = 0;
1185 } 1357 }
1186} 1358}
1187 1359
1188SV * 1360SV *
1189mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1361mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190 CODE: 1362 CODE:
1191{ 1363{
1192 int x1, x; 1364 int x1, x;
1193 int y1, y; 1365 int y1, y;
1194 int z; 1366 int z;
1244} 1416}
1245 OUTPUT: 1417 OUTPUT:
1246 RETVAL 1418 RETVAL
1247 1419
1248void 1420void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1421draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1422 CODE:
1251{ 1423{
1252 int vx, vy; 1424 int vx, vy;
1253 int x, y, z; 1425 int x, y, z;
1254 int last_name; 1426 int last_name;
1255 mapface face; 1427 mapface face;
1256 int sw4 = (sw + 3) & ~3;
1257 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1258 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1259 1428
1260 memset (darkness, 255, sw4 * sh);
1261 SvPOK_only (darkness_sv);
1262 SvCUR_set (darkness_sv, sw4 * sh);
1263
1264 vx = self->x + (self->w - sw) / 2 - shift_x; 1429 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1430 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1431
1267 /* 1432 /*
1268 int vx = self->vx = self->w >= sw 1433 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1434 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1435 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1439 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1440 */
1276 1441
1277 glColor4ub (255, 255, 255, 255); 1442 glColor4ub (255, 255, 255, 255);
1278 1443
1444 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1445 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1446 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1447 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1448
1284 glBegin (GL_QUADS); 1449 glBegin (GL_QUADS);
1285 1450
1294 for (x = 0; x < sw; x++) 1459 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1460 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1461 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1462 mapcell *cell = row->col + (x + vx - row->c0);
1298 1463
1299 darkness[y * sw4 + x] = cell->darkness < 0
1300 ? 255 - FOW_DARKNESS
1301 : 255 - cell->darkness;
1302
1303 face = cell->face [z]; 1464 face = cell->face [z];
1304 1465
1305 if (face) 1466 if (face && face < self->texs)
1306 { 1467 {
1307 maptex tex = self->tex [face]; 1468 maptex tex = self->tex [face];
1308
1309 int px = (x + 1) * 32 - tex.w; 1469 int px = (x + 1) * 32 - tex.w;
1310 int py = (y + 1) * 32 - tex.h; 1470 int py = (y + 1) * 32 - tex.h;
1311 1471
1312 if (last_name != tex.name) 1472 if (last_name != tex.name)
1313 { 1473 {
1314 glEnd (); 1474 glEnd ();
1315 last_name = tex.name;
1316 glBindTexture (GL_TEXTURE_2D, last_name); 1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1317 glBegin (GL_QUADS); 1476 glBegin (GL_QUADS);
1318 } 1477 }
1319 1478
1320 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1321 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1322 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1481 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1323 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1324 } 1483 }
1484
1485 if (cell->flags && z == 2)
1486 {
1487 if (cell->flags & 1)
1488 {
1489 maptex tex = self->tex [1];
1490 int px = (x + 1) * 32 - tex.w + 2;
1491 int py = (y + 1) * 32 - tex.h - 6;
1492
1493 glEnd ();
1494 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1495 glBegin (GL_QUADS);
1496
1497 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1498 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1499 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1500 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1501 }
1502 }
1325 } 1503 }
1326 } 1504 }
1327 1505
1328 glEnd (); 1506 glEnd ();
1329 1507
1330 glDisable (GL_TEXTURE_2D); 1508 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1509 glDisable (GL_BLEND);
1510
1511 // top layer: overlays such as the health bar
1512 for (y = 0; y < sh; y++)
1513 if (0 <= y + vy && y + vy < self->rows)
1514 {
1515 maprow *row = self->row + (y + vy);
1516
1517 for (x = 0; x < sw; x++)
1518 if (row->c0 <= x + vx && x + vx < row->c1)
1519 {
1520 mapcell *cell = row->col + (x + vx - row->c0);
1521
1522 int px = x * 32;
1523 int py = y * 32;
1524
1525 if (cell->stat_hp)
1526 {
1527 int width = cell->stat_width * 32;
1528 int thick = sh / 28 + 1 + cell->stat_width;
1529
1530 glColor3ub (0, 0, 0);
1531 glRectf (px + 1, py - thick - 2,
1532 px + width - 1, py);
1533
1534 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1535 glRectf (px + 2,
1536 py - thick - 1,
1537 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1538 }
1539 }
1540 }
1541}
1542
1543void
1544draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1545 CODE:
1546{
1547 static float color[16][3] = {
1548 { 0.00F, 0.00F, 0.00F },
1549 { 1.00F, 1.00F, 1.00F },
1550 { 0.00F, 0.00F, 0.55F },
1551 { 1.00F, 0.00F, 0.00F },
1552
1553 { 1.00F, 0.54F, 0.00F },
1554 { 0.11F, 0.56F, 1.00F },
1555 { 0.93F, 0.46F, 0.00F },
1556 { 0.18F, 0.54F, 0.34F },
1557
1558 { 0.56F, 0.73F, 0.56F },
1559 { 0.80F, 0.80F, 0.80F },
1560 { 0.55F, 0.41F, 0.13F },
1561 { 0.99F, 0.77F, 0.26F },
1562
1563 { 0.74F, 0.65F, 0.41F },
1564
1565 { 0.00F, 1.00F, 1.00F },
1566 { 1.00F, 0.00F, 1.00F },
1567 { 1.00F, 1.00F, 0.00F },
1568 };
1569
1570 int x, y;
1571
1572 glEnable (GL_TEXTURE_2D);
1573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1574 glEnable (GL_BLEND);
1575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1576 glBegin (GL_QUADS);
1577
1578 for (y = 0; y < h; y++)
1579 for (x = 0; x < w; x++)
1580 {
1581 unsigned char m = data [x + y * w];
1582
1583 if (m)
1584 {
1585 float *c = color [m & 15];
1586
1587 float tx1 = m & 0x40 ? 0.5 : 0.;
1588 float tx2 = tx1 + 0.5;
1589
1590 glColor4f (c[0], c[1], c[2], 0.75);
1591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1595 }
1596 }
1597
1598 glEnd ();
1599 glDisable (GL_BLEND);
1600 glDisable (GL_TEXTURE_2D);
1601}
1602
1603void
1604fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1605 PPCODE:
1606{
1607 int vx, vy;
1608 int x, y;
1609 int sw4 = (sw + 3) & ~3;
1610 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1611 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1612
1613 memset (darkness, 255, sw4 * sh);
1614 SvPOK_only (darkness_sv);
1615 SvCUR_set (darkness_sv, sw4 * sh);
1616
1617 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1618 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1619
1620 for (y = 0; y < sh; y++)
1621 if (0 <= y + vy && y + vy < self->rows)
1622 {
1623 maprow *row = self->row + (y + vy);
1624
1625 for (x = 0; x < sw; x++)
1626 if (row->c0 <= x + vx && x + vx < row->c1)
1627 {
1628 mapcell *cell = row->col + (x + vx - row->c0);
1629
1630 darkness[y * sw4 + x] = cell->darkness
1631 ? 255 - (cell->darkness - 1)
1632 : 255 - FOW_DARKNESS;
1633 }
1634 }
1332 1635
1333 EXTEND (SP, 3); 1636 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1637 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1638 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1639 PUSHs (darkness_sv);
1337} 1640}
1338 1641
1339SV * 1642SV *
1340get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1643get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341 CODE: 1644 CODE:
1342{ 1645{
1343 int x, y, x1, y1; 1646 int x, y, x1, y1;
1344 SV *data_sv = newSV (w * h * 7 + 5); 1647 SV *data_sv = newSV (w * h * 7 + 5);
1345 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1648 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1407} 1710}
1408 OUTPUT: 1711 OUTPUT:
1409 RETVAL 1712 RETVAL
1410 1713
1411void 1714void
1412set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1715set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413 PPCODE: 1716 PPCODE:
1414{ 1717{
1415 int x, y, z; 1718 int x, y, z;
1416 int w, h; 1719 int w, h;
1417 int x1, y1; 1720 int x1, y1;
1449 1752
1450 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1451 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1452 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1453 1756
1454 if (cell->darkness <= 0) 1757 if (cell->darkness == 0)
1455 { 1758 {
1456 cell->darkness = -1; 1759 cell->darkness = 0;
1457 1760
1458 for (z = 0; z <= 2; z++) 1761 for (z = 0; z <= 2; z++)
1459 { 1762 {
1460 cell->face[z] = face[z]; 1763 cell->face[z] = face[z];
1461 1764
1466 } 1769 }
1467 } 1770 }
1468 } 1771 }
1469} 1772}
1470 1773
1471MODULE = CFClient PACKAGE = CFClient::MixChunk 1774MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472 1775
1473CFClient::MixChunk 1776CFPlus::MixChunk
1474new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1475 CODE: 1778 CODE:
1476 RETVAL = Mix_LoadWAV (path); 1779 RETVAL = Mix_LoadWAV (path);
1477 OUTPUT: 1780 OUTPUT:
1478 RETVAL 1781 RETVAL
1479 1782
1480void 1783void
1481DESTROY (CFClient::MixChunk self) 1784DESTROY (CFPlus::MixChunk self)
1482 CODE: 1785 CODE:
1483 Mix_FreeChunk (self); 1786 Mix_FreeChunk (self);
1484 1787
1485int 1788int
1486volume (CFClient::MixChunk self, int volume = -1) 1789volume (CFPlus::MixChunk self, int volume = -1)
1487 CODE: 1790 CODE:
1488 RETVAL = Mix_VolumeChunk (self, volume); 1791 RETVAL = Mix_VolumeChunk (self, volume);
1489 OUTPUT: 1792 OUTPUT:
1490 RETVAL 1793 RETVAL
1491 1794
1492int 1795int
1493play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1796play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494 CODE: 1797 CODE:
1495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1798 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496 OUTPUT: 1799 OUTPUT:
1497 RETVAL 1800 RETVAL
1498 1801
1499MODULE = CFClient PACKAGE = CFClient::MixMusic 1802MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500 1803
1501int 1804int
1502volume (int volume = -1) 1805volume (int volume = -1)
1503 CODE: 1806 CODE:
1504 RETVAL = Mix_VolumeMusic (volume); 1807 RETVAL = Mix_VolumeMusic (volume);
1505 OUTPUT: 1808 OUTPUT:
1506 RETVAL 1809 RETVAL
1507 1810
1508CFClient::MixMusic 1811CFPlus::MixMusic
1509new_from_file (SV *class, char *path) 1812new_from_file (SV *class, char *path)
1510 CODE: 1813 CODE:
1511 RETVAL = Mix_LoadMUS (path); 1814 RETVAL = Mix_LoadMUS (path);
1512 OUTPUT: 1815 OUTPUT:
1513 RETVAL 1816 RETVAL
1514 1817
1515void 1818void
1516DESTROY (CFClient::MixMusic self) 1819DESTROY (CFPlus::MixMusic self)
1517 CODE: 1820 CODE:
1518 Mix_FreeMusic (self); 1821 Mix_FreeMusic (self);
1519 1822
1520int 1823int
1521play (CFClient::MixMusic self, int loops = -1) 1824play (CFPlus::MixMusic self, int loops = -1)
1522 CODE: 1825 CODE:
1523 RETVAL = Mix_PlayMusic (self, loops); 1826 RETVAL = Mix_PlayMusic (self, loops);
1524 OUTPUT: 1827 OUTPUT:
1525 RETVAL 1828 RETVAL
1526 1829
1527MODULE = CFClient PACKAGE = CFClient::OpenGL 1830MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528 1831
1529BOOT: 1832BOOT:
1530{ 1833{
1531 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1834 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532 static const struct { 1835 static const struct {
1533 const char *name; 1836 const char *name;
1534 IV iv; 1837 IV iv;
1535 } *civ, const_iv[] = { 1838 } *civ, const_iv[] = {
1536# define const_iv(name) { # name, (IV)name } 1839# define const_iv(name) { # name, (IV)name }
1543 const_iv (GL_SCISSOR_TEST), 1846 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1847 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1848 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1849 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1850 const_iv (GL_RESCALE_NORMAL),
1851 const_iv (GL_FRONT),
1852 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1853 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1854 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1855 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1856 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1857 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1858 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1859 const_iv (GL_ONE_MINUS_DST_ALPHA),
1860 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1861 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1862 const_iv (GL_RGBA),
1863 const_iv (GL_RGBA4),
1864 const_iv (GL_RGBA8),
1865 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1866 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1867 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1868 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1869 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1870 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1879 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1880 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1881 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1882 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1883 const_iv (GL_TEXTURE_WRAP_T),
1884 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1885 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1886 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1887 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1888 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1889 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1890 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1891 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1592 const_iv (GL_SEPARABLE_2D), 1902 const_iv (GL_SEPARABLE_2D),
1593 const_iv (GL_CONVOLUTION_2D), 1903 const_iv (GL_CONVOLUTION_2D),
1594 const_iv (GL_CONVOLUTION_BORDER_MODE), 1904 const_iv (GL_CONVOLUTION_BORDER_MODE),
1595 const_iv (GL_CONSTANT_BORDER), 1905 const_iv (GL_CONSTANT_BORDER),
1596 const_iv (GL_LINES), 1906 const_iv (GL_LINES),
1907 const_iv (GL_LINE_STRIP),
1597 const_iv (GL_LINE_LOOP), 1908 const_iv (GL_LINE_LOOP),
1598 const_iv (GL_QUADS), 1909 const_iv (GL_QUADS),
1599 const_iv (GL_QUAD_STRIP), 1910 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES), 1911 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP), 1912 const_iv (GL_TRIANGLE_STRIP),
1611 1922
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1923 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1924 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1925}
1615 1926
1927char *
1928gl_vendor ()
1929 CODE:
1930 RETVAL = (char *)glGetString (GL_VENDOR);
1931 OUTPUT:
1932 RETVAL
1933
1934char *
1935gl_version ()
1936 CODE:
1937 RETVAL = (char *)glGetString (GL_VERSION);
1938 OUTPUT:
1939 RETVAL
1940
1941char *
1942gl_extensions ()
1943 CODE:
1944 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1945 OUTPUT:
1946 RETVAL
1947
1616int glGetError () 1948int glGetError ()
1949
1950void glFinish ()
1617 1951
1618void glClear (int mask) 1952void glClear (int mask)
1619 1953
1620void glClearColor (float r, float g, float b, float a = 1.0) 1954void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1955 PROTOTYPE: @
1628 1962
1629void glHint (int target, int mode) 1963void glHint (int target, int mode)
1630 1964
1631void glBlendFunc (int sfactor, int dfactor) 1965void glBlendFunc (int sfactor, int dfactor)
1632 1966
1967void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1968 CODE:
1969 gl_BlendFuncSeparate (sa, da, saa, daa);
1970
1633void glDepthMask (int flag) 1971void glDepthMask (int flag)
1634 1972
1635void glLogicOp (int opcode) 1973void glLogicOp (int opcode)
1636 1974
1637void glColorMask (int red, int green, int blue, int alpha) 1975void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1979void glPushMatrix ()
1642 1980
1643void glPopMatrix () 1981void glPopMatrix ()
1644 1982
1645void glLoadIdentity () 1983void glLoadIdentity ()
1984
1985void glDrawBuffer (int buffer)
1986
1987void glReadBuffer (int buffer)
1646 1988
1647# near_ and far_ are due to microsofts buggy "c" compiler 1989# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1990void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1991
1650# near_ and far_ are due to microsofts buggy "c" compiler 1992# near_ and far_ are due to microsofts buggy "c" compiler
1670 2012
1671void glEnd () 2013void glEnd ()
1672 2014
1673void glColor (float r, float g, float b, float a = 1.0) 2015void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 2016 PROTOTYPE: @
2017 ALIAS:
2018 glColor_premultiply = 1
1675 CODE: 2019 CODE:
2020 if (ix)
2021 {
2022 r *= a;
2023 g *= a;
2024 b *= a;
2025 }
1676 // microsoft visual "c" rounds instead of truncating... 2026 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 2027 glColor4f (r, g, b, a);
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681 2028
1682void glInterleavedArrays (int format, int stride, char *data) 2029void glInterleavedArrays (int format, int stride, char *data)
1683 2030
1684void glDrawElements (int mode, int count, int type, char *indices) 2031void glDrawElements (int mode, int count, int type, char *indices)
1685 2032
1708 2055
1709void glBindTexture (int target, int name) 2056void glBindTexture (int target, int name)
1710 2057
1711void glConvolutionParameter (int target, int pname, float params) 2058void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 2059 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2060 if (gl.ConvolutionParameterf)
2061 gl.ConvolutionParameterf (target, pname, params);
1714 2062
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2063void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 2064 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2065 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 2066 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 2067
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2068void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 2069 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2070 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 2071 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 2072
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2073void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 2074
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2075void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 2076
1761 2109
1762void glEndList () 2110void glEndList ()
1763 2111
1764void glCallList (int list) 2112void glCallList (int list)
1765 2113
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines