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.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 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_version ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VERSION);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_extensions ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_EXTENSIONS);
574 OUTPUT:
575 RETVAL
576
577void 655void
578add_font (char *file) 656add_font (char *file)
579 CODE: 657 CODE:
580 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 658 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581#ifdef _WIN32
582 // cairo... sigh... requires win2000
583 AddFontResourceEx (file, FR_PRIVATE, 0);
584#endif
585 659
586void 660void
587load_image_inline (SV *image_) 661load_image_inline (SV *image_)
588 ALIAS: 662 ALIAS:
589 load_image_file = 1 663 load_image_file = 1
631 705
632 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 706 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633 707
634 assert (surface2->pitch == surface2->w * 4); 708 assert (surface2->pitch == surface2->w * 4);
635 709
710 SDL_LockSurface (surface2);
636 EXTEND (SP, 5); 711 EXTEND (SP, 6);
637 PUSHs (sv_2mortal (newSViv (surface2->w))); 712 PUSHs (sv_2mortal (newSViv (surface2->w)));
638 PUSHs (sv_2mortal (newSViv (surface2->h))); 713 PUSHs (sv_2mortal (newSViv (surface2->h)));
639 SDL_LockSurface (surface2);
640 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 714 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641 SDL_UnlockSurface (surface2);
642 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)));
643 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 716 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 717 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
718 SDL_UnlockSurface (surface2);
645 719
646 SDL_FreeSurface (surface); 720 SDL_FreeSurface (surface);
647 SDL_FreeSurface (surface2); 721 SDL_FreeSurface (surface2);
648} 722}
649 723
685 CODE: 759 CODE:
686 fprintf (stderr, "FATAL: %s\n", message); 760 fprintf (stderr, "FATAL: %s\n", message);
687#ifdef _WIN32 761#ifdef _WIN32
688 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
689#endif 763#endif
690 exit (1); 764 _exit (1);
691 765
766void
767_exit (int retval)
768 CODE:
769 _exit (retval);
770
692MODULE = CFClient PACKAGE = CFClient::Font 771MODULE = CFPlus PACKAGE = CFPlus::Font
693 772
694CFClient::Font 773CFPlus::Font
695new_from_file (SV *class, char *path, int id = 0) 774new_from_file (SV *class, char *path, int id = 0)
696 CODE: 775 CODE:
697{ 776{
698 int count; 777 int count;
699 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
702} 781}
703 OUTPUT: 782 OUTPUT:
704 RETVAL 783 RETVAL
705 784
706void 785void
707DESTROY (CFClient::Font self) 786DESTROY (CFPlus::Font self)
708 CODE: 787 CODE:
709 pango_font_description_free (self); 788 pango_font_description_free (self);
710 789
711void 790void
712make_default (CFClient::Font self) 791make_default (CFPlus::Font self)
713 CODE: 792 CODE:
714 default_font = self; 793 default_font = self;
715 794
716MODULE = CFClient PACKAGE = CFClient::Layout 795MODULE = CFPlus PACKAGE = CFPlus::Layout
717 796
718CFClient::Layout 797void
719new (SV *class, int rgba = 0) 798reset_glyph_cache ()
720 CODE: 799 CODE:
721#if _WIN32 800 tc_clear ();
722 rgba = 0;//D 801
723#endif 802CFPlus::Layout
803new (SV *class)
804 CODE:
724 New (0, RETVAL, 1, struct cf_layout); 805 New (0, RETVAL, 1, struct cf_layout);
725 806
726 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 807 RETVAL->pl = pango_layout_new (opengl_context);
727 RETVAL->rgba = rgba;
728 RETVAL->r = 1.; 808 RETVAL->r = 1.;
729 RETVAL->g = 1.; 809 RETVAL->g = 1.;
730 RETVAL->b = 1.; 810 RETVAL->b = 1.;
731 RETVAL->a = 1.; 811 RETVAL->a = 1.;
732 RETVAL->base_height = MIN_FONT_HEIGHT; 812 RETVAL->base_height = MIN_FONT_HEIGHT;
736 layout_update_font (RETVAL); 816 layout_update_font (RETVAL);
737 OUTPUT: 817 OUTPUT:
738 RETVAL 818 RETVAL
739 819
740void 820void
741DESTROY (CFClient::Layout self) 821DESTROY (CFPlus::Layout self)
742 CODE: 822 CODE:
743 g_object_unref (self->pl); 823 g_object_unref (self->pl);
744 Safefree (self); 824 Safefree (self);
745 825
746int
747is_rgba (CFClient::Layout self)
748 CODE:
749 RETVAL = self->rgba;
750 OUTPUT:
751 RETVAL
752
753void 826void
754set_text (CFClient::Layout self, SV *text_) 827set_text (CFPlus::Layout self, SV *text_)
755 CODE: 828 CODE:
756{ 829{
757 STRLEN textlen; 830 STRLEN textlen;
758 char *text = SvPVutf8 (text_, textlen); 831 char *text = SvPVutf8 (text_, textlen);
759 832
760 pango_layout_set_text (self->pl, text, textlen); 833 pango_layout_set_text (self->pl, text, textlen);
761} 834}
762 835
763void 836void
764set_markup (CFClient::Layout self, SV *text_) 837set_markup (CFPlus::Layout self, SV *text_)
765 CODE: 838 CODE:
766{ 839{
767 STRLEN textlen; 840 STRLEN textlen;
768 char *text = SvPVutf8 (text_, textlen); 841 char *text = SvPVutf8 (text_, textlen);
769 842
770 pango_layout_set_markup (self->pl, text, textlen); 843 pango_layout_set_markup (self->pl, text, textlen);
771} 844}
772 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
773SV * 931SV *
774get_text (CFClient::Layout self) 932get_text (CFPlus::Layout self)
775 CODE: 933 CODE:
776 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777 SvUTF8_on (RETVAL); 935 sv_utf8_decode (RETVAL);
778 OUTPUT: 936 OUTPUT:
779 RETVAL 937 RETVAL
780 938
781void 939void
782set_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.)
783 CODE: 941 CODE:
784 self->r = r; 942 self->r = r;
785 self->g = g; 943 self->g = g;
786 self->b = b; 944 self->b = b;
787 self->a = a; 945 self->a = a;
788 946
789void 947void
790set_font (CFClient::Layout self, CFClient::Font font = 0) 948set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791 CODE: 949 CODE:
792 if (self->font != font) 950 if (self->font != font)
793 { 951 {
794 self->font = font; 952 self->font = font;
795 layout_update_font (self); 953 layout_update_font (self);
796 } 954 }
797 955
798void 956void
799set_height (CFClient::Layout self, int base_height) 957set_height (CFPlus::Layout self, int base_height)
800 CODE: 958 CODE:
801 if (self->base_height != base_height) 959 if (self->base_height != base_height)
802 { 960 {
803 self->base_height = base_height; 961 self->base_height = base_height;
804 layout_update_font (self); 962 layout_update_font (self);
805 } 963 }
806 964
807void 965void
808set_width (CFClient::Layout self, int max_width = -1) 966set_width (CFPlus::Layout self, int max_width = -1)
809 CODE: 967 CODE:
810 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);
811 969
812void 970void
813set_indent (CFClient::Layout self, int indent) 971set_indent (CFPlus::Layout self, int indent)
814 CODE: 972 CODE:
815 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 973 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816 974
817void 975void
818set_spacing (CFClient::Layout self, int spacing) 976set_spacing (CFPlus::Layout self, int spacing)
819 CODE: 977 CODE:
820 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 978 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821 979
822void 980void
823set_ellipsise (CFClient::Layout self, int ellipsise) 981set_ellipsise (CFPlus::Layout self, int ellipsise)
824 CODE: 982 CODE:
825 pango_layout_set_ellipsize (self->pl, 983 pango_layout_set_ellipsize (self->pl,
826 ellipsise == 1 ? PANGO_ELLIPSIZE_START 984 ellipsise == 1 ? PANGO_ELLIPSIZE_START
827 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 985 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 986 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
829 : PANGO_ELLIPSIZE_NONE 987 : PANGO_ELLIPSIZE_NONE
830 ); 988 );
831 989
832void 990void
833set_single_paragraph_mode (CFClient::Layout self, int spm) 991set_single_paragraph_mode (CFPlus::Layout self, int spm)
834 CODE: 992 CODE:
835 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 993 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836 994
837void 995void
838size (CFClient::Layout self) 996size (CFPlus::Layout self)
839 PPCODE: 997 PPCODE:
840{ 998{
841 int w, h; 999 int w, h;
842 1000
843 layout_get_pixel_size (self, &w, &h); 1001 layout_get_pixel_size (self, &w, &h);
846 PUSHs (sv_2mortal (newSViv (w))); 1004 PUSHs (sv_2mortal (newSViv (w)));
847 PUSHs (sv_2mortal (newSViv (h))); 1005 PUSHs (sv_2mortal (newSViv (h)));
848} 1006}
849 1007
850int 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
851xy_to_index (CFClient::Layout self, int x, int y) 1021xy_to_index (CFPlus::Layout self, int x, int y)
852 CODE: 1022 CODE:
853{ 1023{
854 int index, trailing; 1024 int index, trailing;
855 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);
856 RETVAL = index; 1026 RETVAL = index;
857} 1027}
858 OUTPUT: 1028 OUTPUT:
859 RETVAL 1029 RETVAL
860 1030
861void 1031void
862cursor_pos (CFClient::Layout self, int index) 1032cursor_pos (CFPlus::Layout self, int index)
863 PPCODE: 1033 PPCODE:
864{ 1034{
865 PangoRectangle strong_pos; 1035 PangoRectangle strong_pos;
866 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867 1037
870 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872} 1042}
873 1043
874void 1044void
875render (CFClient::Layout self) 1045render (CFPlus::Layout self, float x, float y, int flags = 0)
876 PPCODE: 1046 PPCODE:
877{ 1047 pango_opengl_render_layout_subpixel (
878 SV *retval; 1048 self->pl,
879 int w, h; 1049 x * PANGO_SCALE, y * PANGO_SCALE,
1050 self->r, self->g, self->b, self->a,
1051 flags
1052 );
880 1053
881 layout_get_pixel_size (self, &w, &h); 1054MODULE = CFPlus PACKAGE = CFPlus::Texture
882 1055
883 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)
884 { 1064 {
885 cairo_surface_t *surface; 1065 int nw = minpot (ow);
886 cairo_t *cairo; 1066 int nh = minpot (oh);
887 1067
888 retval = newSV (w * h * 4); 1068 if (nw != ow || nh != oh)
889 SvPOK_only (retval);
890 SvCUR_set (retval, w * h * 4);
891
892 memset (SvPVX (retval), 0, w * h * 4);
893
894 surface = cairo_image_surface_create_for_data (
895 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
896 cairo = cairo_create (surface);
897 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899 pango_cairo_show_layout (cairo, self->pl);
900
901 cairo_destroy (cairo);
902 cairo_surface_destroy (surface);
903
904 // what a mess, and its premultiplied, too :(
905 { 1069 {
906 uint32_t *p = (uint32_t *)SvPVX (retval); 1070 if (SvOK (data_))
907 uint32_t *e = p + w * h;
908
909 while (p < e)
910 { 1071 {
911 uint32_t rgba = *p; 1072 STRLEN datalen;
912 rgba = (rgba >> 24) | (rgba << 8); 1073 char *data = SvPVbyte (data_, datalen);
913#if 0 1074 int bpp = datalen / (ow * oh);
914#ifdef _WIN32 1075 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
915 {//D
916 uint8_t r = rgba >> 24;
917 uint8_t g = rgba >> 16;
918 uint8_t b = rgba >> 8;
919 uint8_t a = rgba >> 0;
920 1076
921 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_);
922 } 1085 }
923#endif 1086
924#endif 1087 sv_setiv (w_, nw);
925 rgba = SDL_SwapBE32 (rgba); 1088 sv_setiv (h_, nh);
926 *p++ = rgba;
927 } 1089 }
928 }
929
930 EXTEND (SP, 5);
931 PUSHs (sv_2mortal (newSViv (w)));
932 PUSHs (sv_2mortal (newSViv (h)));
933 PUSHs (sv_2mortal (retval));
934 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936 } 1090 }
937 else
938 {
939 FT_Bitmap bitmap;
940
941 retval = newSV (w * h);
942 SvPOK_only (retval);
943 SvCUR_set (retval, w * h);
944
945 bitmap.rows = h;
946 bitmap.width = w;
947 bitmap.pitch = w;
948 bitmap.buffer = (unsigned char*)SvPVX (retval);
949 bitmap.num_grays = 256;
950 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952 memset (bitmap.buffer, 0, w * h);
953
954 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956 EXTEND (SP, 5);
957 PUSHs (sv_2mortal (newSViv (w)));
958 PUSHs (sv_2mortal (newSViv (h)));
959 PUSHs (sv_2mortal (retval));
960 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962 }
963} 1091}
964 1092
965MODULE = CFClient PACKAGE = CFClient::Texture
966
967void 1093void
968draw_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.)
969 PROTOTYPE: $$$;$$ 1095 PROTOTYPE: $$$;$$
970 ALIAS: 1096 ALIAS:
971 draw_quad_alpha = 1 1097 draw_quad_alpha = 1
972 draw_quad_alpha_premultiplied = 2 1098 draw_quad_alpha_premultiplied = 2
973 CODE: 1099 CODE:
974{ 1100{
975 HV *hv = (HV *)SvRV (self); 1101 HV *hv = (HV *)SvRV (self);
976 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1102 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1103 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1104 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980 1105
981 if (items < 5) 1106 if (items < 5)
982 { 1107 {
983 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1108 w = SvNV (*hv_fetch (hv, "w", 1, 1));
984 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1109 h = SvNV (*hv_fetch (hv, "h", 1, 1));
985 } 1110 }
986 1111
987 if (ix) 1112 if (ix)
988 { 1113 {
989 glEnable (GL_BLEND); 1114 glEnable (GL_BLEND);
1115
1116 if (ix == 2)
990 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
991 glEnable (GL_ALPHA_TEST); 1122 glEnable (GL_ALPHA_TEST);
992 glAlphaFunc (GL_GREATER, 0.01f); 1123 glAlphaFunc (GL_GREATER, 0.01f);
993 } 1124 }
994 1125
995 glBindTexture (GL_TEXTURE_2D, name); 1126 glBindTexture (GL_TEXTURE_2D, name);
996
997 if (wrap_mode)
998 {
999 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001 }
1002 1127
1003 glBegin (GL_QUADS); 1128 glBegin (GL_QUADS);
1004 glTexCoord2f (0, 0); glVertex2f (x , y ); 1129 glTexCoord2f (0, 0); glVertex2f (x , y );
1005 glTexCoord2f (0, t); glVertex2f (x , y + h); 1130 glTexCoord2f (0, t); glVertex2f (x , y + h);
1006 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1131 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1012 glDisable (GL_ALPHA_TEST); 1137 glDisable (GL_ALPHA_TEST);
1013 glDisable (GL_BLEND); 1138 glDisable (GL_BLEND);
1014 } 1139 }
1015} 1140}
1016 1141
1017MODULE = CFClient PACKAGE = CFClient::Map 1142MODULE = CFPlus PACKAGE = CFPlus::Map
1018 1143
1019CFClient::Map 1144CFPlus::Map
1020new (SV *class, int map_width, int map_height) 1145new (SV *class, int map_width, int map_height)
1021 CODE: 1146 CODE:
1022 New (0, RETVAL, 1, struct map); 1147 New (0, RETVAL, 1, struct map);
1023 RETVAL->x = 0; 1148 RETVAL->x = 0;
1024 RETVAL->y = 0; 1149 RETVAL->y = 0;
1034 RETVAL->row = 0; 1159 RETVAL->row = 0;
1035 OUTPUT: 1160 OUTPUT:
1036 RETVAL 1161 RETVAL
1037 1162
1038void 1163void
1039DESTROY (CFClient::Map self) 1164DESTROY (CFPlus::Map self)
1040 CODE: 1165 CODE:
1041{ 1166{
1042 map_clear (self); 1167 map_clear (self);
1043 Safefree (self->face); 1168 Safefree (self->face);
1169 Safefree (self->tex);
1044 Safefree (self); 1170 Safefree (self);
1045} 1171}
1046 1172
1047void 1173void
1048clear (CFClient::Map self) 1174clear (CFPlus::Map self)
1049 CODE: 1175 CODE:
1050 map_clear (self); 1176 map_clear (self);
1051 1177
1052void 1178void
1053set_face (CFClient::Map self, int face, int texid) 1179set_face (CFPlus::Map self, int face, int texid)
1054 CODE: 1180 CODE:
1055{ 1181{
1056 while (self->faces <= face) 1182 while (self->faces <= face)
1057 { 1183 {
1058 Append (mapface, self->face, self->faces, self->faces); 1184 Append (mapface, self->face, self->faces, self->faces);
1061 1187
1062 self->face [face] = texid; 1188 self->face [face] = texid;
1063} 1189}
1064 1190
1065void 1191void
1066set_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)
1067 CODE: 1193 CODE:
1068{ 1194{
1069 while (self->texs <= texid) 1195 while (self->texs <= texid)
1070 { 1196 {
1071 Append (maptex, self->tex, self->texs, self->texs); 1197 Append (maptex, self->tex, self->texs, self->texs);
1083 tex->r = r; 1209 tex->r = r;
1084 tex->g = g; 1210 tex->g = g;
1085 tex->b = b; 1211 tex->b = b;
1086 tex->a = a; 1212 tex->a = a;
1087 } 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);
1088} 1223}
1089 1224
1090int 1225int
1091ox (CFClient::Map self) 1226ox (CFPlus::Map self)
1092 ALIAS: 1227 ALIAS:
1093 oy = 1 1228 oy = 1
1229 x = 2
1230 y = 3
1231 w = 4
1232 h = 5
1094 CODE: 1233 CODE:
1095 switch (ix) 1234 switch (ix)
1096 { 1235 {
1097 case 0: RETVAL = self->ox; break; 1236 case 0: RETVAL = self->ox; break;
1098 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;
1099 } 1242 }
1100 OUTPUT: 1243 OUTPUT:
1101 RETVAL 1244 RETVAL
1102 1245
1103void 1246void
1104scroll (CFClient::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1105 CODE: 1248 CODE:
1106{ 1249{
1107 if (dx > 0) 1250 if (dx > 0)
1108 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1109 else if (dx < 0) 1252 else if (dx < 0)
1110 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);
1111 1254
1112 if (dy > 0) 1255 if (dy > 0)
1113 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1114 else if (dy < 0) 1257 else if (dy < 0)
1115 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);
1116 1259
1117 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1118 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1119 1262
1120 while (self->y < 0) 1263 while (self->y < 0)
1125 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1126 } 1269 }
1127} 1270}
1128 1271
1129void 1272void
1130map1a_update (CFClient::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1131 CODE: 1274 CODE:
1132{ 1275{
1133 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1134 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1135 mapcell *cell; 1278 mapcell *cell;
1136 int x, y, flags; 1279 int x, y, flags;
1137 1280
1138 while (data < data_end) 1281 while (data < data_end - 1)
1139 { 1282 {
1140 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1141 1284
1142 x = ((flags >> 10) & 63) + self->x; 1285 x = self->x + ((flags >> 10) & 63);
1143 y = ((flags >> 4) & 63) + self->y; 1286 y = self->y + ((flags >> 4) & 63);
1144 1287
1145 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1146 1289
1147 if (flags & 15) 1290 if (flags & 15)
1148 { 1291 {
1149 if (cell->darkness < 0) 1292 if (!cell->darkness)
1150 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1151 cell->darkness = 0; 1295 cell->darkness = 256;
1152 cell->face [0] = 0;
1153 cell->face [1] = 0;
1154 cell->face [2] = 0;
1155 } 1296 }
1156 1297
1157 cell->darkness = flags & 8 ? *data++ : 255;
1158
1159 //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
1339 }
1160 1340
1161 if (flags & 4) 1341 if (flags & 4)
1162 { 1342 {
1163 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1164 } 1344 }
1172 { 1352 {
1173 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1174 } 1354 }
1175 } 1355 }
1176 else 1356 else
1357 {
1177 cell->darkness = -1; 1358 cell->darkness = 0;
1359 cell->stat_hp = 0;
1360 cell->flags = 0;
1361 cell->player = 0;
1362 }
1178 } 1363 }
1179} 1364}
1180 1365
1181SV * 1366SV *
1182mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1367mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183 CODE: 1368 CODE:
1184{ 1369{
1185 int x1, x; 1370 int x1, x;
1186 int y1, y; 1371 int y1, y;
1187 int z; 1372 int z;
1237} 1422}
1238 OUTPUT: 1423 OUTPUT:
1239 RETVAL 1424 RETVAL
1240 1425
1241void 1426void
1242draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1427draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1243 PPCODE: 1428 CODE:
1244{ 1429{
1245 int vx, vy; 1430 int vx, vy;
1246 int x, y, z; 1431 int x, y, z;
1247 int last_name; 1432 int last_name;
1248 mapface face; 1433 mapface face;
1249 int sw4 = (sw + 3) & ~3;
1250 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1251 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1252 1434
1253 memset (darkness, 255, sw4 * sh);
1254 SvPOK_only (darkness_sv);
1255 SvCUR_set (darkness_sv, sw4 * sh);
1256
1257 vx = self->x + (self->w - sw) / 2 - shift_x; 1435 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1258 vy = self->y + (self->h - sh) / 2 - shift_y; 1436 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1259 1437
1260 /* 1438 /*
1261 int vx = self->vx = self->w >= sw 1439 int vx = self->vx = self->w >= sw
1262 ? self->x + (self->w - sw) / 2 1440 ? self->x + (self->w - sw) / 2
1263 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1441 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1267 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1445 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268 */ 1446 */
1269 1447
1270 glColor4ub (255, 255, 255, 255); 1448 glColor4ub (255, 255, 255, 255);
1271 1449
1450 glEnable (GL_BLEND);
1272 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1451 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273 glEnable (GL_BLEND);
1274 glEnable (GL_TEXTURE_2D); 1452 glEnable (GL_TEXTURE_2D);
1275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1453 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276 1454
1277 glBegin (GL_QUADS); 1455 glBegin (GL_QUADS);
1278 1456
1287 for (x = 0; x < sw; x++) 1465 for (x = 0; x < sw; x++)
1288 if (row->c0 <= x + vx && x + vx < row->c1) 1466 if (row->c0 <= x + vx && x + vx < row->c1)
1289 { 1467 {
1290 mapcell *cell = row->col + (x + vx - row->c0); 1468 mapcell *cell = row->col + (x + vx - row->c0);
1291 1469
1292 darkness[y * sw4 + x] = cell->darkness < 0
1293 ? 255 - FOW_DARKNESS
1294 : 255 - cell->darkness;
1295
1296 face = cell->face [z]; 1470 face = cell->face [z];
1297 1471
1298 if (face) 1472 if (face && face < self->texs)
1299 { 1473 {
1300 maptex tex = self->tex [face]; 1474 maptex tex = self->tex [face];
1301
1302 int px = (x + 1) * 32 - tex.w; 1475 int px = (x + 1) * 32 - tex.w;
1303 int py = (y + 1) * 32 - tex.h; 1476 int py = (y + 1) * 32 - tex.h;
1304 1477
1305 if (last_name != tex.name) 1478 if (last_name != tex.name)
1306 { 1479 {
1307 glEnd (); 1480 glEnd ();
1308 last_name = tex.name;
1309 glBindTexture (GL_TEXTURE_2D, last_name); 1481 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1310 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1311 } 1483 }
1312 1484
1313 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1485 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1314 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1486 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1315 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1487 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1316 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1488 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1317 } 1489 }
1490
1491 if (cell->flags && z == 2)
1492 {
1493 if (cell->flags & 1)
1494 {
1495 maptex tex = self->tex [1];
1496 int px = (x + 1) * 32 - tex.w + 2;
1497 int py = (y + 1) * 32 - tex.h - 6;
1498
1499 glEnd ();
1500 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1501 glBegin (GL_QUADS);
1502
1503 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1504 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1505 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1506 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1507 }
1508 }
1318 } 1509 }
1319 } 1510 }
1320 1511
1321 glEnd (); 1512 glEnd ();
1322 1513
1323 glDisable (GL_TEXTURE_2D); 1514 glDisable (GL_TEXTURE_2D);
1324 glDisable (GL_BLEND); 1515 glDisable (GL_BLEND);
1516
1517 // top layer: overlays such as the health bar
1518 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows)
1520 {
1521 maprow *row = self->row + (y + vy);
1522
1523 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1)
1525 {
1526 mapcell *cell = row->col + (x + vx - row->c0);
1527
1528 int px = x * 32;
1529 int py = y * 32;
1530
1531 if (cell->stat_hp)
1532 {
1533 int width = cell->stat_width * 32;
1534 int thick = sh / 28 + 1 + cell->stat_width;
1535
1536 glColor3ub (0, 0, 0);
1537 glRectf (px + 1, py - thick - 2,
1538 px + width - 1, py);
1539
1540 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1541 glRectf (px + 2,
1542 py - thick - 1,
1543 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1544 }
1545 }
1546 }
1547}
1548
1549void
1550draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1551 CODE:
1552{
1553 static float color[16][3] = {
1554 { 0.00F, 0.00F, 0.00F },
1555 { 1.00F, 1.00F, 1.00F },
1556 { 0.00F, 0.00F, 0.55F },
1557 { 1.00F, 0.00F, 0.00F },
1558
1559 { 1.00F, 0.54F, 0.00F },
1560 { 0.11F, 0.56F, 1.00F },
1561 { 0.93F, 0.46F, 0.00F },
1562 { 0.18F, 0.54F, 0.34F },
1563
1564 { 0.56F, 0.73F, 0.56F },
1565 { 0.80F, 0.80F, 0.80F },
1566 { 0.55F, 0.41F, 0.13F },
1567 { 0.99F, 0.77F, 0.26F },
1568
1569 { 0.74F, 0.65F, 0.41F },
1570
1571 { 0.00F, 1.00F, 1.00F },
1572 { 1.00F, 0.00F, 1.00F },
1573 { 1.00F, 1.00F, 0.00F },
1574 };
1575
1576 int x, y;
1577
1578 glEnable (GL_TEXTURE_2D);
1579 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1580 glEnable (GL_BLEND);
1581 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1582 glBegin (GL_QUADS);
1583
1584 for (y = 0; y < h; y++)
1585 for (x = 0; x < w; x++)
1586 {
1587 unsigned char m = data [x + y * w];
1588
1589 if (m)
1590 {
1591 float *c = color [m & 15];
1592
1593 float tx1 = m & 0x40 ? 0.5 : 0.;
1594 float tx2 = tx1 + 0.5;
1595
1596 glColor4f (c[0], c[1], c[2], 0.75);
1597 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1598 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1599 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1600 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1601 }
1602 }
1603
1604 glEnd ();
1605 glDisable (GL_BLEND);
1606 glDisable (GL_TEXTURE_2D);
1607}
1608
1609void
1610fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1611 PPCODE:
1612{
1613 int vx, vy;
1614 int x, y;
1615 int sw4 = (sw + 3) & ~3;
1616 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1617 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1618
1619 memset (darkness, 255, sw4 * sh);
1620 SvPOK_only (darkness_sv);
1621 SvCUR_set (darkness_sv, sw4 * sh);
1622
1623 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1624 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1625
1626 for (y = 0; y < sh; y++)
1627 if (0 <= y + vy && y + vy < self->rows)
1628 {
1629 maprow *row = self->row + (y + vy);
1630
1631 for (x = 0; x < sw; x++)
1632 if (row->c0 <= x + vx && x + vx < row->c1)
1633 {
1634 mapcell *cell = row->col + (x + vx - row->c0);
1635
1636 darkness[y * sw4 + x] = cell->darkness
1637 ? 255 - (cell->darkness - 1)
1638 : 255 - FOW_DARKNESS;
1639 }
1640 }
1325 1641
1326 EXTEND (SP, 3); 1642 EXTEND (SP, 3);
1327 PUSHs (sv_2mortal (newSViv (sw4))); 1643 PUSHs (sv_2mortal (newSViv (sw4)));
1328 PUSHs (sv_2mortal (newSViv (sh))); 1644 PUSHs (sv_2mortal (newSViv (sh)));
1329 PUSHs (darkness_sv); 1645 PUSHs (darkness_sv);
1330} 1646}
1331 1647
1332SV * 1648SV *
1333get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1649get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1334 CODE: 1650 CODE:
1335{ 1651{
1336 int x, y, x1, y1; 1652 int x, y, x1, y1;
1337 SV *data_sv = newSV (w * h * 7 + 5); 1653 SV *data_sv = newSV (w * h * 7 + 5);
1338 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1654 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1400} 1716}
1401 OUTPUT: 1717 OUTPUT:
1402 RETVAL 1718 RETVAL
1403 1719
1404void 1720void
1405set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1721set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406 PPCODE: 1722 PPCODE:
1407{ 1723{
1408 int x, y, z; 1724 int x, y, z;
1409 int w, h; 1725 int w, h;
1410 int x1, y1; 1726 int x1, y1;
1442 1758
1443 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1759 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1444 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1760 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1445 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1761 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1446 1762
1447 if (cell->darkness <= 0) 1763 if (cell->darkness == 0)
1448 { 1764 {
1449 cell->darkness = -1; 1765 cell->darkness = 0;
1450 1766
1451 for (z = 0; z <= 2; z++) 1767 for (z = 0; z <= 2; z++)
1452 { 1768 {
1453 cell->face[z] = face[z]; 1769 cell->face[z] = face[z];
1454 1770
1459 } 1775 }
1460 } 1776 }
1461 } 1777 }
1462} 1778}
1463 1779
1464MODULE = CFClient PACKAGE = CFClient::MixChunk 1780MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465 1781
1466CFClient::MixChunk 1782CFPlus::MixChunk
1467new_from_file (SV *class, char *path) 1783new_from_file (SV *class, char *path)
1468 CODE: 1784 CODE:
1469 RETVAL = Mix_LoadWAV (path); 1785 RETVAL = Mix_LoadWAV (path);
1470 OUTPUT: 1786 OUTPUT:
1471 RETVAL 1787 RETVAL
1472 1788
1473void 1789void
1474DESTROY (CFClient::MixChunk self) 1790DESTROY (CFPlus::MixChunk self)
1475 CODE: 1791 CODE:
1476 Mix_FreeChunk (self); 1792 Mix_FreeChunk (self);
1477 1793
1478int 1794int
1479volume (CFClient::MixChunk self, int volume = -1) 1795volume (CFPlus::MixChunk self, int volume = -1)
1480 CODE: 1796 CODE:
1481 RETVAL = Mix_VolumeChunk (self, volume); 1797 RETVAL = Mix_VolumeChunk (self, volume);
1482 OUTPUT: 1798 OUTPUT:
1483 RETVAL 1799 RETVAL
1484 1800
1485int 1801int
1486play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1802play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1487 CODE: 1803 CODE:
1488 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1804 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489 OUTPUT: 1805 OUTPUT:
1490 RETVAL 1806 RETVAL
1491 1807
1492MODULE = CFClient PACKAGE = CFClient::MixMusic 1808MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493 1809
1494int 1810int
1495volume (int volume = -1) 1811volume (int volume = -1)
1496 CODE: 1812 CODE:
1497 RETVAL = Mix_VolumeMusic (volume); 1813 RETVAL = Mix_VolumeMusic (volume);
1498 OUTPUT: 1814 OUTPUT:
1499 RETVAL 1815 RETVAL
1500 1816
1501CFClient::MixMusic 1817CFPlus::MixMusic
1502new_from_file (SV *class, char *path) 1818new_from_file (SV *class, char *path)
1503 CODE: 1819 CODE:
1504 RETVAL = Mix_LoadMUS (path); 1820 RETVAL = Mix_LoadMUS (path);
1505 OUTPUT: 1821 OUTPUT:
1506 RETVAL 1822 RETVAL
1507 1823
1508void 1824void
1509DESTROY (CFClient::MixMusic self) 1825DESTROY (CFPlus::MixMusic self)
1510 CODE: 1826 CODE:
1511 Mix_FreeMusic (self); 1827 Mix_FreeMusic (self);
1512 1828
1513int 1829int
1514play (CFClient::MixMusic self, int loops = -1) 1830play (CFPlus::MixMusic self, int loops = -1)
1515 CODE: 1831 CODE:
1516 RETVAL = Mix_PlayMusic (self, loops); 1832 RETVAL = Mix_PlayMusic (self, loops);
1517 OUTPUT: 1833 OUTPUT:
1518 RETVAL 1834 RETVAL
1519 1835
1520MODULE = CFClient PACKAGE = CFClient::OpenGL 1836MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521 1837
1522BOOT: 1838BOOT:
1523{ 1839{
1524 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1840 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525 static const struct { 1841 static const struct {
1526 const char *name; 1842 const char *name;
1527 IV iv; 1843 IV iv;
1528 } *civ, const_iv[] = { 1844 } *civ, const_iv[] = {
1529# define const_iv(name) { # name, (IV)name } 1845# define const_iv(name) { # name, (IV)name }
1536 const_iv (GL_SCISSOR_TEST), 1852 const_iv (GL_SCISSOR_TEST),
1537 const_iv (GL_DEPTH_TEST), 1853 const_iv (GL_DEPTH_TEST),
1538 const_iv (GL_ALPHA_TEST), 1854 const_iv (GL_ALPHA_TEST),
1539 const_iv (GL_NORMALIZE), 1855 const_iv (GL_NORMALIZE),
1540 const_iv (GL_RESCALE_NORMAL), 1856 const_iv (GL_RESCALE_NORMAL),
1857 const_iv (GL_FRONT),
1858 const_iv (GL_BACK),
1541 const_iv (GL_AND), 1859 const_iv (GL_AND),
1542 const_iv (GL_ONE), 1860 const_iv (GL_ONE),
1543 const_iv (GL_ZERO), 1861 const_iv (GL_ZERO),
1544 const_iv (GL_SRC_ALPHA), 1862 const_iv (GL_SRC_ALPHA),
1545 const_iv (GL_SRC_ALPHA_SATURATE), 1863 const_iv (GL_DST_ALPHA),
1546 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1864 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547 const_iv (GL_ONE_MINUS_DST_ALPHA), 1865 const_iv (GL_ONE_MINUS_DST_ALPHA),
1866 const_iv (GL_SRC_ALPHA_SATURATE),
1548 const_iv (GL_RGB), 1867 const_iv (GL_RGB),
1549 const_iv (GL_RGBA), 1868 const_iv (GL_RGBA),
1869 const_iv (GL_RGBA4),
1870 const_iv (GL_RGBA8),
1871 const_iv (GL_RGB5_A1),
1550 const_iv (GL_UNSIGNED_BYTE), 1872 const_iv (GL_UNSIGNED_BYTE),
1551 const_iv (GL_UNSIGNED_SHORT), 1873 const_iv (GL_UNSIGNED_SHORT),
1552 const_iv (GL_UNSIGNED_INT), 1874 const_iv (GL_UNSIGNED_INT),
1553 const_iv (GL_ALPHA), 1875 const_iv (GL_ALPHA),
1554 const_iv (GL_INTENSITY), 1876 const_iv (GL_INTENSITY),
1563 const_iv (GL_TEXTURE_MAG_FILTER), 1885 const_iv (GL_TEXTURE_MAG_FILTER),
1564 const_iv (GL_TEXTURE_MIN_FILTER), 1886 const_iv (GL_TEXTURE_MIN_FILTER),
1565 const_iv (GL_TEXTURE_ENV_MODE), 1887 const_iv (GL_TEXTURE_ENV_MODE),
1566 const_iv (GL_TEXTURE_WRAP_S), 1888 const_iv (GL_TEXTURE_WRAP_S),
1567 const_iv (GL_TEXTURE_WRAP_T), 1889 const_iv (GL_TEXTURE_WRAP_T),
1890 const_iv (GL_REPEAT),
1568 const_iv (GL_CLAMP), 1891 const_iv (GL_CLAMP),
1569 const_iv (GL_REPEAT), 1892 const_iv (GL_CLAMP_TO_EDGE),
1570 const_iv (GL_NEAREST), 1893 const_iv (GL_NEAREST),
1571 const_iv (GL_LINEAR), 1894 const_iv (GL_LINEAR),
1572 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1895 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1896 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1897 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1585 const_iv (GL_SEPARABLE_2D), 1908 const_iv (GL_SEPARABLE_2D),
1586 const_iv (GL_CONVOLUTION_2D), 1909 const_iv (GL_CONVOLUTION_2D),
1587 const_iv (GL_CONVOLUTION_BORDER_MODE), 1910 const_iv (GL_CONVOLUTION_BORDER_MODE),
1588 const_iv (GL_CONSTANT_BORDER), 1911 const_iv (GL_CONSTANT_BORDER),
1589 const_iv (GL_LINES), 1912 const_iv (GL_LINES),
1913 const_iv (GL_LINE_STRIP),
1590 const_iv (GL_LINE_LOOP), 1914 const_iv (GL_LINE_LOOP),
1591 const_iv (GL_QUADS), 1915 const_iv (GL_QUADS),
1592 const_iv (GL_QUAD_STRIP), 1916 const_iv (GL_QUAD_STRIP),
1593 const_iv (GL_TRIANGLES), 1917 const_iv (GL_TRIANGLES),
1594 const_iv (GL_TRIANGLE_STRIP), 1918 const_iv (GL_TRIANGLE_STRIP),
1604 1928
1605 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1929 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1930 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607} 1931}
1608 1932
1933char *
1934gl_vendor ()
1935 CODE:
1936 RETVAL = (char *)glGetString (GL_VENDOR);
1937 OUTPUT:
1938 RETVAL
1939
1940char *
1941gl_version ()
1942 CODE:
1943 RETVAL = (char *)glGetString (GL_VERSION);
1944 OUTPUT:
1945 RETVAL
1946
1947char *
1948gl_extensions ()
1949 CODE:
1950 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1951 OUTPUT:
1952 RETVAL
1953
1609int glGetError () 1954int glGetError ()
1955
1956void glFinish ()
1610 1957
1611void glClear (int mask) 1958void glClear (int mask)
1612 1959
1613void glClearColor (float r, float g, float b, float a = 1.0) 1960void glClearColor (float r, float g, float b, float a = 1.0)
1614 PROTOTYPE: @ 1961 PROTOTYPE: @
1621 1968
1622void glHint (int target, int mode) 1969void glHint (int target, int mode)
1623 1970
1624void glBlendFunc (int sfactor, int dfactor) 1971void glBlendFunc (int sfactor, int dfactor)
1625 1972
1973void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1974 CODE:
1975 gl_BlendFuncSeparate (sa, da, saa, daa);
1976
1626void glDepthMask (int flag) 1977void glDepthMask (int flag)
1627 1978
1628void glLogicOp (int opcode) 1979void glLogicOp (int opcode)
1629 1980
1630void glColorMask (int red, int green, int blue, int alpha) 1981void glColorMask (int red, int green, int blue, int alpha)
1635 1986
1636void glPopMatrix () 1987void glPopMatrix ()
1637 1988
1638void glLoadIdentity () 1989void glLoadIdentity ()
1639 1990
1991void glDrawBuffer (int buffer)
1992
1993void glReadBuffer (int buffer)
1994
1640# near and far are due to microsofts buggy c compiler 1995# near_ and far_ are due to microsofts buggy "c" compiler
1996void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1997
1998# near_ and far_ are due to microsofts buggy "c" compiler
1641void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1999void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1642 2000
1643void glViewport (int x, int y, int width, int height) 2001void glViewport (int x, int y, int width, int height)
1644 2002
1645void glScissor (int x, int y, int width, int height) 2003void glScissor (int x, int y, int width, int height)
1660 2018
1661void glEnd () 2019void glEnd ()
1662 2020
1663void glColor (float r, float g, float b, float a = 1.0) 2021void glColor (float r, float g, float b, float a = 1.0)
1664 PROTOTYPE: @ 2022 PROTOTYPE: @
2023 ALIAS:
2024 glColor_premultiply = 1
1665 CODE: 2025 CODE:
1666 glColor4ub (MIN ((int)(r * 255.f), 255), 2026 if (ix)
1667 MIN ((int)(g * 255.f), 255), 2027 {
1668 MIN ((int)(b * 255.f), 255), 2028 r *= a;
1669 MIN ((int)(a * 255.f), 255)); 2029 g *= a;
2030 b *= a;
2031 }
2032 // microsoft visual "c" rounds instead of truncating...
2033 glColor4f (r, g, b, a);
1670 2034
1671void glInterleavedArrays (int format, int stride, char *data) 2035void glInterleavedArrays (int format, int stride, char *data)
1672 2036
1673void glDrawElements (int mode, int count, int type, char *indices) 2037void glDrawElements (int mode, int count, int type, char *indices)
1674 2038
1675# 1.2 void glDrawRangeElements (int mode, int start, int end 2039# 1.2 void glDrawRangeElements (int mode, int start, int end
2040
2041void glRasterPos (float x, float y, float z = 0.)
2042 CODE:
2043 glRasterPos3f (0, 0, z);
2044 glBitmap (0, 0, 0, 0, x, y, 0);
1676 2045
1677void glVertex (float x, float y, float z = 0.) 2046void glVertex (float x, float y, float z = 0.)
1678 CODE: 2047 CODE:
1679 glVertex3f (x, y, z); 2048 glVertex3f (x, y, z);
1680 2049
1692 2061
1693void glBindTexture (int target, int name) 2062void glBindTexture (int target, int name)
1694 2063
1695void glConvolutionParameter (int target, int pname, float params) 2064void glConvolutionParameter (int target, int pname, float params)
1696 CODE: 2065 CODE:
1697 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2066 if (gl.ConvolutionParameterf)
2067 gl.ConvolutionParameterf (target, pname, params);
1698 2068
1699void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2069void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1700 CODE: 2070 CODE:
1701 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2071 if (gl.ConvolutionFilter2D)
1702 (target, internalformat, width, height, format, type, data)); 2072 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1703 2073
1704void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2074void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1705 CODE: 2075 CODE:
1706 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2076 if (gl.SeparableFilter2D)
1707 (target, internalformat, width, height, format, type, row, column)); 2077 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1708 2078
1709void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2079void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1710 2080
1711void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2081void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1712 2082
1713void glRasterPos (int x, int y) 2083void glDrawPixels (int width, int height, int format, int type, char *pixels)
1714 CODE:
1715 glRasterPos2i (x, y);
1716 2084
1717void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2085void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1718 2086
1719int glGenTexture () 2087int glGenTexture ()
1720 CODE: 2088 CODE:
1747 2115
1748void glEndList () 2116void glEndList ()
1749 2117
1750void glCallList (int list) 2118void glCallList (int list)
1751 2119
1752

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines