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.86 by root, Fri May 19 16:43:56 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
441 SDL_Rect **m; 516 SDL_Rect **m;
442 517
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 518 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
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, 16); 521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 522
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 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);
470 549
471 ++m; 550 ++m;
472 } 551 }
473} 552}
474 553
554char *
555SDL_GetError ()
556
475int 557int
476SDL_SetVideoMode (int w, int h, int fullscreen) 558SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 559 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 560 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 562 );
563 if (RETVAL)
564 {
481 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 }
482 OUTPUT: 570 OUTPUT:
483 RETVAL 571 RETVAL
484 572
485void 573void
486SDL_GL_SwapBuffers () 574SDL_GL_SwapBuffers ()
575
576char *
577SDL_GetKeyName (int sym)
487 578
488void 579void
489SDL_PollEvent () 580SDL_PollEvent ()
490 PPCODE: 581 PPCODE:
491{ 582{
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 603 break;
513 604
514 case SDL_MOUSEMOTION: 605 case SDL_MOUSEMOTION:
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 613 break;
521 614
522 case SDL_MOUSEBUTTONDOWN: 615 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 616 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
618
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 619 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 620 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 621 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 622 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 623 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 627 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 628 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 629 break;
535 } 630 }
536 631
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 632 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538 } 633 }
539} 634}
540 635
541int 636int
542Mix_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)
555 CODE: 650 CODE:
556#ifndef _WIN32 651#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 653#endif
559 654
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573
574void 655void
575add_font (char *file) 656add_font (char *file)
576 CODE: 657 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 658 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 659
583void 660void
584load_image_inline (SV *image_) 661load_image_inline (SV *image_)
585 ALIAS: 662 ALIAS:
586 load_image_file = 1 663 load_image_file = 1
628 705
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 706 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 707
631 assert (surface2->pitch == surface2->w * 4); 708 assert (surface2->pitch == surface2->w * 4);
632 709
710 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 711 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 712 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 713 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 714 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 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)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 716 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 717 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
718 SDL_UnlockSurface (surface2);
642 719
643 SDL_FreeSurface (surface); 720 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 721 SDL_FreeSurface (surface2);
645} 722}
646 723
682 CODE: 759 CODE:
683 fprintf (stderr, "FATAL: %s\n", message); 760 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 761#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#endif 763#endif
687 exit (1); 764 _exit (1);
688 765
766void
767_exit (int retval)
768 CODE:
769 _exit (retval);
770
689MODULE = CFClient PACKAGE = CFClient::Font 771MODULE = CFPlus PACKAGE = CFPlus::Font
690 772
691CFClient::Font 773CFPlus::Font
692new_from_file (SV *class, char *path, int id = 0) 774new_from_file (SV *class, char *path, int id = 0)
693 CODE: 775 CODE:
694{ 776{
695 int count; 777 int count;
696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
699} 781}
700 OUTPUT: 782 OUTPUT:
701 RETVAL 783 RETVAL
702 784
703void 785void
704DESTROY (CFClient::Font self) 786DESTROY (CFPlus::Font self)
705 CODE: 787 CODE:
706 pango_font_description_free (self); 788 pango_font_description_free (self);
707 789
708void 790void
709make_default (CFClient::Font self) 791make_default (CFPlus::Font self)
710 CODE: 792 CODE:
711 default_font = self; 793 default_font = self;
712 794
713MODULE = CFClient PACKAGE = CFClient::Layout 795MODULE = CFPlus PACKAGE = CFPlus::Layout
714 796
715CFClient::Layout 797void
716new (SV *class, int rgba = 0) 798reset_glyph_cache ()
799 CODE:
800 tc_clear ();
801
802CFPlus::Layout
803new (SV *class)
717 CODE: 804 CODE:
718 New (0, RETVAL, 1, struct cf_layout); 805 New (0, RETVAL, 1, struct cf_layout);
719 806
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 807 RETVAL->pl = pango_layout_new (opengl_context);
721 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 808 RETVAL->r = 1.;
723 RETVAL->g = 1.; 809 RETVAL->g = 1.;
724 RETVAL->b = 1.; 810 RETVAL->b = 1.;
725 RETVAL->a = 1.; 811 RETVAL->a = 1.;
726 RETVAL->base_height = MIN_FONT_HEIGHT; 812 RETVAL->base_height = MIN_FONT_HEIGHT;
730 layout_update_font (RETVAL); 816 layout_update_font (RETVAL);
731 OUTPUT: 817 OUTPUT:
732 RETVAL 818 RETVAL
733 819
734void 820void
735DESTROY (CFClient::Layout self) 821DESTROY (CFPlus::Layout self)
736 CODE: 822 CODE:
737 g_object_unref (self->pl); 823 g_object_unref (self->pl);
738 Safefree (self); 824 Safefree (self);
739 825
740int
741is_rgba (CFClient::Layout self)
742 CODE:
743 RETVAL = self->rgba;
744 OUTPUT:
745 RETVAL
746
747void 826void
748set_text (CFClient::Layout self, SV *text_) 827set_text (CFPlus::Layout self, SV *text_)
749 CODE: 828 CODE:
750{ 829{
751 STRLEN textlen; 830 STRLEN textlen;
752 char *text = SvPVutf8 (text_, textlen); 831 char *text = SvPVutf8 (text_, textlen);
753 832
754 pango_layout_set_text (self->pl, text, textlen); 833 pango_layout_set_text (self->pl, text, textlen);
755} 834}
756 835
757void 836void
758set_markup (CFClient::Layout self, SV *text_) 837set_markup (CFPlus::Layout self, SV *text_)
759 CODE: 838 CODE:
760{ 839{
761 STRLEN textlen; 840 STRLEN textlen;
762 char *text = SvPVutf8 (text_, textlen); 841 char *text = SvPVutf8 (text_, textlen);
763 842
764 pango_layout_set_markup (self->pl, text, textlen); 843 pango_layout_set_markup (self->pl, text, textlen);
765} 844}
766 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
767SV * 931SV *
768get_text (CFClient::Layout self) 932get_text (CFPlus::Layout self)
769 CODE: 933 CODE:
770 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771 SvUTF8_on (RETVAL); 935 sv_utf8_decode (RETVAL);
772 OUTPUT: 936 OUTPUT:
773 RETVAL 937 RETVAL
774 938
775void 939void
776set_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.)
777 CODE: 941 CODE:
778 self->r = r; 942 self->r = r;
779 self->g = g; 943 self->g = g;
780 self->b = b; 944 self->b = b;
781 self->a = a; 945 self->a = a;
782 946
783void 947void
784set_font (CFClient::Layout self, CFClient::Font font = 0) 948set_font (CFPlus::Layout self, CFPlus::Font font = 0)
785 CODE: 949 CODE:
786 if (self->font != font) 950 if (self->font != font)
787 { 951 {
788 self->font = font; 952 self->font = font;
789 layout_update_font (self); 953 layout_update_font (self);
790 } 954 }
791 955
792void 956void
793set_height (CFClient::Layout self, int base_height) 957set_height (CFPlus::Layout self, int base_height)
794 CODE: 958 CODE:
795 if (self->base_height != base_height) 959 if (self->base_height != base_height)
796 { 960 {
797 self->base_height = base_height; 961 self->base_height = base_height;
798 layout_update_font (self); 962 layout_update_font (self);
799 } 963 }
800 964
801void 965void
802set_width (CFClient::Layout self, int max_width = -1) 966set_width (CFPlus::Layout self, int max_width = -1)
803 CODE: 967 CODE:
804 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);
805 969
806void 970void
807set_indent (CFClient::Layout self, int indent) 971set_indent (CFPlus::Layout self, int indent)
808 CODE: 972 CODE:
809 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 973 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810 974
811void 975void
812set_spacing (CFClient::Layout self, int spacing) 976set_spacing (CFPlus::Layout self, int spacing)
813 CODE: 977 CODE:
814 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 978 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815 979
816void 980void
817set_ellipsise (CFClient::Layout self, int ellipsise) 981set_ellipsise (CFPlus::Layout self, int ellipsise)
818 CODE: 982 CODE:
819 pango_layout_set_ellipsize (self->pl, 983 pango_layout_set_ellipsize (self->pl,
820 ellipsise == 1 ? PANGO_ELLIPSIZE_START 984 ellipsise == 1 ? PANGO_ELLIPSIZE_START
821 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 985 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 986 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
823 : PANGO_ELLIPSIZE_NONE 987 : PANGO_ELLIPSIZE_NONE
824 ); 988 );
825 989
826void 990void
827set_single_paragraph_mode (CFClient::Layout self, int spm) 991set_single_paragraph_mode (CFPlus::Layout self, int spm)
828 CODE: 992 CODE:
829 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 993 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
830 994
831void 995void
832size (CFClient::Layout self) 996size (CFPlus::Layout self)
833 PPCODE: 997 PPCODE:
834{ 998{
835 int w, h; 999 int w, h;
836 1000
837 layout_get_pixel_size (self, &w, &h); 1001 layout_get_pixel_size (self, &w, &h);
840 PUSHs (sv_2mortal (newSViv (w))); 1004 PUSHs (sv_2mortal (newSViv (w)));
841 PUSHs (sv_2mortal (newSViv (h))); 1005 PUSHs (sv_2mortal (newSViv (h)));
842} 1006}
843 1007
844int 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
845xy_to_index (CFClient::Layout self, int x, int y) 1021xy_to_index (CFPlus::Layout self, int x, int y)
846 CODE: 1022 CODE:
847{ 1023{
848 int index, trailing; 1024 int index, trailing;
849 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);
850 RETVAL = index; 1026 RETVAL = index;
851} 1027}
852 OUTPUT: 1028 OUTPUT:
853 RETVAL 1029 RETVAL
854 1030
855void 1031void
856cursor_pos (CFClient::Layout self, int index) 1032cursor_pos (CFPlus::Layout self, int index)
857 PPCODE: 1033 PPCODE:
858{ 1034{
859 PangoRectangle strong_pos; 1035 PangoRectangle strong_pos;
860 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
861 1037
864 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
865 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
866} 1042}
867 1043
868void 1044void
869render (CFClient::Layout self) 1045render (CFPlus::Layout self, float x, float y, int flags = 0)
870 PPCODE: 1046 PPCODE:
871{ 1047 pango_opengl_render_layout_subpixel (
872 SV *retval; 1048 self->pl,
873 int w, h; 1049 x * PANGO_SCALE, y * PANGO_SCALE,
1050 self->r, self->g, self->b, self->a,
1051 flags
1052 );
874 1053
875 layout_get_pixel_size (self, &w, &h); 1054MODULE = CFPlus PACKAGE = CFPlus::Texture
876 1055
877 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)
878 { 1064 {
879 cairo_surface_t *surface; 1065 int nw = minpot (ow);
880 cairo_t *cairo; 1066 int nh = minpot (oh);
881 1067
882 retval = newSV (w * h * 4); 1068 if (nw != ow || nh != oh)
883 SvPOK_only (retval);
884 SvCUR_set (retval, w * h * 4);
885
886 memset (SvPVX (retval), 0, w * h * 4);
887
888 surface = cairo_image_surface_create_for_data (
889 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
890 cairo = cairo_create (surface);
891 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893 pango_cairo_show_layout (cairo, self->pl);
894
895 cairo_destroy (cairo);
896 cairo_surface_destroy (surface);
897
898 // what a mess, and its premultiplied, too :(
899 { 1069 {
900 uint32_t *p = (uint32_t *)SvPVX (retval); 1070 if (SvOK (data_))
901 uint32_t *e = p + w * h;
902
903 while (p < e)
904 { 1071 {
905 uint32_t rgba = *p; 1072 STRLEN datalen;
906 rgba = (rgba >> 24) | (rgba << 8); 1073 char *data = SvPVbyte (data_, datalen);
907 rgba = SDL_SwapBE32 (rgba); 1074 int bpp = datalen / (ow * oh);
908 *p++ = rgba; 1075 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1076
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_);
909 } 1085 }
1086
1087 sv_setiv (w_, nw);
1088 sv_setiv (h_, nh);
910 } 1089 }
911
912 EXTEND (SP, 5);
913 PUSHs (sv_2mortal (newSViv (w)));
914 PUSHs (sv_2mortal (newSViv (h)));
915 PUSHs (sv_2mortal (retval));
916 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 } 1090 }
919 else
920 {
921 FT_Bitmap bitmap;
922
923 retval = newSV (w * h);
924 SvPOK_only (retval);
925 SvCUR_set (retval, w * h);
926
927 bitmap.rows = h;
928 bitmap.width = w;
929 bitmap.pitch = w;
930 bitmap.buffer = (unsigned char*)SvPVX (retval);
931 bitmap.num_grays = 256;
932 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
933
934 memset (bitmap.buffer, 0, w * h);
935
936 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
937
938 EXTEND (SP, 5);
939 PUSHs (sv_2mortal (newSViv (w)));
940 PUSHs (sv_2mortal (newSViv (h)));
941 PUSHs (sv_2mortal (retval));
942 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 }
945} 1091}
946 1092
947MODULE = CFClient PACKAGE = CFClient::Texture
948
949void 1093void
950draw_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.)
951 PROTOTYPE: $$$;$$ 1095 PROTOTYPE: $$$;$$
952 ALIAS: 1096 ALIAS:
953 draw_quad_alpha = 1 1097 draw_quad_alpha = 1
954 draw_quad_alpha_premultiplied = 2 1098 draw_quad_alpha_premultiplied = 2
955 CODE: 1099 CODE:
956{ 1100{
957 HV *hv = (HV *)SvRV (self); 1101 HV *hv = (HV *)SvRV (self);
958 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1102 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1103 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1104 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962 1105
963 if (items < 5) 1106 if (items < 5)
964 { 1107 {
965 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1108 w = SvNV (*hv_fetch (hv, "w", 1, 1));
966 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1109 h = SvNV (*hv_fetch (hv, "h", 1, 1));
967 } 1110 }
968 1111
969 if (ix) 1112 if (ix)
970 { 1113 {
971 glEnable (GL_BLEND); 1114 glEnable (GL_BLEND);
1115
1116 if (ix == 2)
972 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
973 glEnable (GL_ALPHA_TEST); 1122 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f); 1123 glAlphaFunc (GL_GREATER, 0.01f);
975 } 1124 }
976 1125
977 glBindTexture (GL_TEXTURE_2D, name); 1126 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1127
985 glBegin (GL_QUADS); 1128 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1129 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1130 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1131 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
994 glDisable (GL_ALPHA_TEST); 1137 glDisable (GL_ALPHA_TEST);
995 glDisable (GL_BLEND); 1138 glDisable (GL_BLEND);
996 } 1139 }
997} 1140}
998 1141
999MODULE = CFClient PACKAGE = CFClient::Map 1142MODULE = CFPlus PACKAGE = CFPlus::Map
1000 1143
1001CFClient::Map 1144CFPlus::Map
1002new (SV *class, int map_width, int map_height) 1145new (SV *class, int map_width, int map_height)
1003 CODE: 1146 CODE:
1004 New (0, RETVAL, 1, struct map); 1147 New (0, RETVAL, 1, struct map);
1005 RETVAL->x = 0; 1148 RETVAL->x = 0;
1006 RETVAL->y = 0; 1149 RETVAL->y = 0;
1016 RETVAL->row = 0; 1159 RETVAL->row = 0;
1017 OUTPUT: 1160 OUTPUT:
1018 RETVAL 1161 RETVAL
1019 1162
1020void 1163void
1021DESTROY (CFClient::Map self) 1164DESTROY (CFPlus::Map self)
1022 CODE: 1165 CODE:
1023{ 1166{
1024 map_clear (self); 1167 map_clear (self);
1025 Safefree (self->face); 1168 Safefree (self->face);
1169 Safefree (self->tex);
1026 Safefree (self); 1170 Safefree (self);
1027} 1171}
1028 1172
1029void 1173void
1030clear (CFClient::Map self) 1174clear (CFPlus::Map self)
1031 CODE: 1175 CODE:
1032 map_clear (self); 1176 map_clear (self);
1033 1177
1034void 1178void
1035set_face (CFClient::Map self, int face, int texid) 1179set_face (CFPlus::Map self, int face, int texid)
1036 CODE: 1180 CODE:
1037{ 1181{
1038 while (self->faces <= face) 1182 while (self->faces <= face)
1039 { 1183 {
1040 Append (mapface, self->face, self->faces, self->faces); 1184 Append (mapface, self->face, self->faces, self->faces);
1043 1187
1044 self->face [face] = texid; 1188 self->face [face] = texid;
1045} 1189}
1046 1190
1047void 1191void
1048set_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)
1049 CODE: 1193 CODE:
1050{ 1194{
1051 while (self->texs <= texid) 1195 while (self->texs <= texid)
1052 { 1196 {
1053 Append (maptex, self->tex, self->texs, self->texs); 1197 Append (maptex, self->tex, self->texs, self->texs);
1065 tex->r = r; 1209 tex->r = r;
1066 tex->g = g; 1210 tex->g = g;
1067 tex->b = b; 1211 tex->b = b;
1068 tex->a = a; 1212 tex->a = a;
1069 } 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);
1070} 1223}
1071 1224
1072int 1225int
1073ox (CFClient::Map self) 1226ox (CFPlus::Map self)
1074 ALIAS: 1227 ALIAS:
1075 oy = 1 1228 oy = 1
1229 x = 2
1230 y = 3
1231 w = 4
1232 h = 5
1076 CODE: 1233 CODE:
1077 switch (ix) 1234 switch (ix)
1078 { 1235 {
1079 case 0: RETVAL = self->ox; break; 1236 case 0: RETVAL = self->ox; break;
1080 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;
1081 } 1242 }
1082 OUTPUT: 1243 OUTPUT:
1083 RETVAL 1244 RETVAL
1084 1245
1085void 1246void
1086scroll (CFClient::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1087 CODE: 1248 CODE:
1088{ 1249{
1089 if (dx > 0) 1250 if (dx > 0)
1090 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1091 else if (dx < 0) 1252 else if (dx < 0)
1092 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);
1093 1254
1094 if (dy > 0) 1255 if (dy > 0)
1095 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1096 else if (dy < 0) 1257 else if (dy < 0)
1097 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);
1098 1259
1099 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1100 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1101 1262
1102 while (self->y < 0) 1263 while (self->y < 0)
1107 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1108 } 1269 }
1109} 1270}
1110 1271
1111void 1272void
1112map1a_update (CFClient::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1113 CODE: 1274 CODE:
1114{ 1275{
1115 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1116 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1117 mapcell *cell; 1278 mapcell *cell;
1118 int x, y, flags; 1279 int x, y, flags;
1119 1280
1120 while (data < data_end) 1281 while (data < data_end - 1)
1121 { 1282 {
1122 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1123 1284
1124 x = ((flags >> 10) & 63) + self->x; 1285 x = self->x + ((flags >> 10) & 63);
1125 y = ((flags >> 4) & 63) + self->y; 1286 y = self->y + ((flags >> 4) & 63);
1126 1287
1127 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1128 1289
1129 if (flags & 15) 1290 if (flags & 15)
1130 { 1291 {
1131 if (cell->darkness < 0) 1292 if (!cell->darkness)
1132 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1133 cell->darkness = 0; 1295 cell->darkness = 256;
1134 cell->face [0] = 0;
1135 cell->face [1] = 0;
1136 cell->face [2] = 0;
1137 } 1296 }
1138 1297
1139 cell->darkness = flags & 8 ? *data++ : 255;
1140
1141 //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 }
1142 1339
1143 if (flags & 4) 1340 if (flags & 4)
1144 { 1341 {
1145 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;
1146 } 1343 }
1154 { 1351 {
1155 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;
1156 } 1353 }
1157 } 1354 }
1158 else 1355 else
1159 cell->darkness = -1; 1356 cell->darkness = 0;
1160 } 1357 }
1161} 1358}
1162 1359
1163SV * 1360SV *
1164mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1361mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1165 CODE: 1362 CODE:
1166{ 1363{
1167 int x1, x; 1364 int x1, x;
1168 int y1, y; 1365 int y1, y;
1169 int z; 1366 int z;
1219} 1416}
1220 OUTPUT: 1417 OUTPUT:
1221 RETVAL 1418 RETVAL
1222 1419
1223void 1420void
1224draw (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)
1225 PPCODE: 1422 CODE:
1226{ 1423{
1227 int vx, vy; 1424 int vx, vy;
1228 int x, y, z; 1425 int x, y, z;
1229 int last_name; 1426 int last_name;
1230 mapface face; 1427 mapface face;
1231 int sw4 = (sw + 3) & ~3;
1232 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1233 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1234 1428
1235 memset (darkness, 255, sw4 * sh);
1236 SvPOK_only (darkness_sv);
1237 SvCUR_set (darkness_sv, sw4 * sh);
1238
1239 vx = self->x + (self->w - sw) / 2 - shift_x; 1429 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1240 vy = self->y + (self->h - sh) / 2 - shift_y; 1430 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1241 1431
1242 /* 1432 /*
1243 int vx = self->vx = self->w >= sw 1433 int vx = self->vx = self->w >= sw
1244 ? self->x + (self->w - sw) / 2 1434 ? self->x + (self->w - sw) / 2
1245 : 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));
1249 : 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));
1250 */ 1440 */
1251 1441
1252 glColor4ub (255, 255, 255, 255); 1442 glColor4ub (255, 255, 255, 255);
1253 1443
1444 glEnable (GL_BLEND);
1254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1445 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1255 glEnable (GL_BLEND);
1256 glEnable (GL_TEXTURE_2D); 1446 glEnable (GL_TEXTURE_2D);
1257 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1447 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1258 1448
1259 glBegin (GL_QUADS); 1449 glBegin (GL_QUADS);
1260 1450
1269 for (x = 0; x < sw; x++) 1459 for (x = 0; x < sw; x++)
1270 if (row->c0 <= x + vx && x + vx < row->c1) 1460 if (row->c0 <= x + vx && x + vx < row->c1)
1271 { 1461 {
1272 mapcell *cell = row->col + (x + vx - row->c0); 1462 mapcell *cell = row->col + (x + vx - row->c0);
1273 1463
1274 darkness[y * sw4 + x] = cell->darkness < 0
1275 ? 255 - FOW_DARKNESS
1276 : 255 - cell->darkness;
1277
1278 face = cell->face [z]; 1464 face = cell->face [z];
1279 1465
1280 if (face) 1466 if (face && face < self->texs)
1281 { 1467 {
1282 maptex tex = self->tex [face]; 1468 maptex tex = self->tex [face];
1283
1284 int px = (x + 1) * 32 - tex.w; 1469 int px = (x + 1) * 32 - tex.w;
1285 int py = (y + 1) * 32 - tex.h; 1470 int py = (y + 1) * 32 - tex.h;
1286 1471
1287 if (last_name != tex.name) 1472 if (last_name != tex.name)
1288 { 1473 {
1289 glEnd (); 1474 glEnd ();
1290 last_name = tex.name;
1291 glBindTexture (GL_TEXTURE_2D, last_name); 1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1292 glBegin (GL_QUADS); 1476 glBegin (GL_QUADS);
1293 } 1477 }
1294 1478
1295 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1296 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1297 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);
1298 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1299 } 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 }
1300 } 1503 }
1301 } 1504 }
1302 1505
1303 glEnd (); 1506 glEnd ();
1304 1507
1305 glDisable (GL_TEXTURE_2D); 1508 glDisable (GL_TEXTURE_2D);
1306 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 }
1307 1635
1308 EXTEND (SP, 3); 1636 EXTEND (SP, 3);
1309 PUSHs (sv_2mortal (newSViv (sw4))); 1637 PUSHs (sv_2mortal (newSViv (sw4)));
1310 PUSHs (sv_2mortal (newSViv (sh))); 1638 PUSHs (sv_2mortal (newSViv (sh)));
1311 PUSHs (darkness_sv); 1639 PUSHs (darkness_sv);
1312} 1640}
1313 1641
1314SV * 1642SV *
1315get_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)
1316 CODE: 1644 CODE:
1317{ 1645{
1318 int x, y, x1, y1; 1646 int x, y, x1, y1;
1319 SV *data_sv = newSV (w * h * 7 + 5); 1647 SV *data_sv = newSV (w * h * 7 + 5);
1320 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1648 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1382} 1710}
1383 OUTPUT: 1711 OUTPUT:
1384 RETVAL 1712 RETVAL
1385 1713
1386void 1714void
1387set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1715set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1388 PPCODE: 1716 PPCODE:
1389{ 1717{
1390 int x, y, z; 1718 int x, y, z;
1391 int w, h; 1719 int w, h;
1392 int x1, y1; 1720 int x1, y1;
1424 1752
1425 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1426 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1427 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1428 1756
1429 if (cell->darkness <= 0) 1757 if (cell->darkness == 0)
1430 { 1758 {
1431 cell->darkness = -1; 1759 cell->darkness = 0;
1432 1760
1433 for (z = 0; z <= 2; z++) 1761 for (z = 0; z <= 2; z++)
1434 { 1762 {
1435 cell->face[z] = face[z]; 1763 cell->face[z] = face[z];
1436 1764
1441 } 1769 }
1442 } 1770 }
1443 } 1771 }
1444} 1772}
1445 1773
1446MODULE = CFClient PACKAGE = CFClient::MixChunk 1774MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1447 1775
1448CFClient::MixChunk 1776CFPlus::MixChunk
1449new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1450 CODE: 1778 CODE:
1451 RETVAL = Mix_LoadWAV (path); 1779 RETVAL = Mix_LoadWAV (path);
1452 OUTPUT: 1780 OUTPUT:
1453 RETVAL 1781 RETVAL
1454 1782
1455void 1783void
1456DESTROY (CFClient::MixChunk self) 1784DESTROY (CFPlus::MixChunk self)
1457 CODE: 1785 CODE:
1458 Mix_FreeChunk (self); 1786 Mix_FreeChunk (self);
1459 1787
1460int 1788int
1461volume (CFClient::MixChunk self, int volume = -1) 1789volume (CFPlus::MixChunk self, int volume = -1)
1462 CODE: 1790 CODE:
1463 RETVAL = Mix_VolumeChunk (self, volume); 1791 RETVAL = Mix_VolumeChunk (self, volume);
1464 OUTPUT: 1792 OUTPUT:
1465 RETVAL 1793 RETVAL
1466 1794
1467int 1795int
1468play (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)
1469 CODE: 1797 CODE:
1470 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1798 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1471 OUTPUT: 1799 OUTPUT:
1472 RETVAL 1800 RETVAL
1473 1801
1474MODULE = CFClient PACKAGE = CFClient::MixMusic 1802MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1475 1803
1476int 1804int
1477volume (int volume = -1) 1805volume (int volume = -1)
1478 CODE: 1806 CODE:
1479 RETVAL = Mix_VolumeMusic (volume); 1807 RETVAL = Mix_VolumeMusic (volume);
1480 OUTPUT: 1808 OUTPUT:
1481 RETVAL 1809 RETVAL
1482 1810
1483CFClient::MixMusic 1811CFPlus::MixMusic
1484new_from_file (SV *class, char *path) 1812new_from_file (SV *class, char *path)
1485 CODE: 1813 CODE:
1486 RETVAL = Mix_LoadMUS (path); 1814 RETVAL = Mix_LoadMUS (path);
1487 OUTPUT: 1815 OUTPUT:
1488 RETVAL 1816 RETVAL
1489 1817
1490void 1818void
1491DESTROY (CFClient::MixMusic self) 1819DESTROY (CFPlus::MixMusic self)
1492 CODE: 1820 CODE:
1493 Mix_FreeMusic (self); 1821 Mix_FreeMusic (self);
1494 1822
1495int 1823int
1496play (CFClient::MixMusic self, int loops = -1) 1824play (CFPlus::MixMusic self, int loops = -1)
1497 CODE: 1825 CODE:
1498 RETVAL = Mix_PlayMusic (self, loops); 1826 RETVAL = Mix_PlayMusic (self, loops);
1499 OUTPUT: 1827 OUTPUT:
1500 RETVAL 1828 RETVAL
1501 1829
1502MODULE = CFClient PACKAGE = CFClient::OpenGL 1830MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1503 1831
1504BOOT: 1832BOOT:
1505{ 1833{
1506 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1834 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1507 static const struct { 1835 static const struct {
1508 const char *name; 1836 const char *name;
1509 IV iv; 1837 IV iv;
1510 } *civ, const_iv[] = { 1838 } *civ, const_iv[] = {
1511# define const_iv(name) { # name, (IV)name } 1839# define const_iv(name) { # name, (IV)name }
1512 const_iv (GL_COLOR_MATERIAL), 1840 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1841 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1842 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1843 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1844 const_iv (GL_BLEND),
1845 const_iv (GL_CULL_FACE),
1517 const_iv (GL_SCISSOR_TEST), 1846 const_iv (GL_SCISSOR_TEST),
1847 const_iv (GL_DEPTH_TEST),
1848 const_iv (GL_ALPHA_TEST),
1849 const_iv (GL_NORMALIZE),
1850 const_iv (GL_RESCALE_NORMAL),
1851 const_iv (GL_FRONT),
1852 const_iv (GL_BACK),
1518 const_iv (GL_AND), 1853 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1854 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1855 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1856 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1857 const_iv (GL_DST_ALPHA),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1858 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1859 const_iv (GL_ONE_MINUS_DST_ALPHA),
1860 const_iv (GL_SRC_ALPHA_SATURATE),
1525 const_iv (GL_RGB), 1861 const_iv (GL_RGB),
1526 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),
1527 const_iv (GL_UNSIGNED_BYTE), 1866 const_iv (GL_UNSIGNED_BYTE),
1867 const_iv (GL_UNSIGNED_SHORT),
1868 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1869 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1870 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1871 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1872 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1873 const_iv (GL_FLOAT),
1538 const_iv (GL_TEXTURE_MAG_FILTER), 1879 const_iv (GL_TEXTURE_MAG_FILTER),
1539 const_iv (GL_TEXTURE_MIN_FILTER), 1880 const_iv (GL_TEXTURE_MIN_FILTER),
1540 const_iv (GL_TEXTURE_ENV_MODE), 1881 const_iv (GL_TEXTURE_ENV_MODE),
1541 const_iv (GL_TEXTURE_WRAP_S), 1882 const_iv (GL_TEXTURE_WRAP_S),
1542 const_iv (GL_TEXTURE_WRAP_T), 1883 const_iv (GL_TEXTURE_WRAP_T),
1884 const_iv (GL_REPEAT),
1543 const_iv (GL_CLAMP), 1885 const_iv (GL_CLAMP),
1544 const_iv (GL_REPEAT), 1886 const_iv (GL_CLAMP_TO_EDGE),
1545 const_iv (GL_NEAREST), 1887 const_iv (GL_NEAREST),
1546 const_iv (GL_LINEAR), 1888 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1889 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1890 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1891 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1892 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1893 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1894 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1895 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1896 const_iv (GL_REPLACE),
1897 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1898 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1899 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1900 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1901 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1902 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1903 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1904 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1905 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1906 const_iv (GL_LINES),
1907 const_iv (GL_LINE_STRIP),
1908 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1909 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP), 1910 const_iv (GL_QUAD_STRIP),
1911 const_iv (GL_TRIANGLES),
1912 const_iv (GL_TRIANGLE_STRIP),
1913 const_iv (GL_TRIANGLE_FAN),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1914 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 const_iv (GL_FASTEST), 1915 const_iv (GL_FASTEST),
1916 const_iv (GL_V2F),
1917 const_iv (GL_V3F),
1918 const_iv (GL_T2F_V3F),
1919 const_iv (GL_T2F_N3F_V3F),
1568# undef const_iv 1920# undef const_iv
1569 }; 1921 };
1570 1922
1571 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; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1924 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573} 1925}
1574 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
1575int glGetError () 1948int glGetError ()
1949
1950void glFinish ()
1576 1951
1577void glClear (int mask) 1952void glClear (int mask)
1578 1953
1579void glClearColor (float r, float g, float b, float a = 1.0) 1954void glClearColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1955 PROTOTYPE: @
1587 1962
1588void glHint (int target, int mode) 1963void glHint (int target, int mode)
1589 1964
1590void glBlendFunc (int sfactor, int dfactor) 1965void glBlendFunc (int sfactor, int dfactor)
1591 1966
1967void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1968 CODE:
1969 gl_BlendFuncSeparate (sa, da, saa, daa);
1970
1971void glDepthMask (int flag)
1972
1592void glLogicOp (int opcode) 1973void glLogicOp (int opcode)
1593 1974
1594void glColorMask (int red, int green, int blue, int alpha) 1975void glColorMask (int red, int green, int blue, int alpha)
1595 1976
1596void glMatrixMode (int mode) 1977void glMatrixMode (int mode)
1599 1980
1600void glPopMatrix () 1981void glPopMatrix ()
1601 1982
1602void glLoadIdentity () 1983void glLoadIdentity ()
1603 1984
1985void glDrawBuffer (int buffer)
1986
1987void glReadBuffer (int buffer)
1988
1604# near and far are due to microsofts buggy c compiler 1989# near_ and far_ are due to microsofts buggy "c" compiler
1990void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1991
1992# near_ and far_ are due to microsofts buggy "c" compiler
1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1993void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606 1994
1607void glViewport (int x, int y, int width, int height) 1995void glViewport (int x, int y, int width, int height)
1608 1996
1609void glScissor (int x, int y, int width, int height) 1997void glScissor (int x, int y, int width, int height)
1624 2012
1625void glEnd () 2013void glEnd ()
1626 2014
1627void glColor (float r, float g, float b, float a = 1.0) 2015void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 2016 PROTOTYPE: @
2017 ALIAS:
2018 glColor_premultiply = 1
1629 CODE: 2019 CODE:
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 2020 if (ix)
1631 MIN ((int)(g * 255.f), 255), 2021 {
1632 MIN ((int)(b * 255.f), 255), 2022 r *= a;
1633 MIN ((int)(a * 255.f), 255)); 2023 g *= a;
2024 b *= a;
2025 }
2026 // microsoft visual "c" rounds instead of truncating...
2027 glColor4f (r, g, b, a);
2028
2029void glInterleavedArrays (int format, int stride, char *data)
2030
2031void glDrawElements (int mode, int count, int type, char *indices)
2032
2033# 1.2 void glDrawRangeElements (int mode, int start, int end
2034
2035void glRasterPos (float x, float y, float z = 0.)
2036 CODE:
2037 glRasterPos3f (0, 0, z);
2038 glBitmap (0, 0, 0, 0, x, y, 0);
1634 2039
1635void glVertex (float x, float y, float z = 0.) 2040void glVertex (float x, float y, float z = 0.)
1636 CODE: 2041 CODE:
1637 glVertex3f (x, y, z); 2042 glVertex3f (x, y, z);
1638 2043
1650 2055
1651void glBindTexture (int target, int name) 2056void glBindTexture (int target, int name)
1652 2057
1653void glConvolutionParameter (int target, int pname, float params) 2058void glConvolutionParameter (int target, int pname, float params)
1654 CODE: 2059 CODE:
1655 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2060 if (gl.ConvolutionParameterf)
2061 gl.ConvolutionParameterf (target, pname, params);
1656 2062
1657void 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)
1658 CODE: 2064 CODE:
1659 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2065 if (gl.ConvolutionFilter2D)
1660 (target, internalformat, width, height, format, type, data)); 2066 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661 2067
1662void 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)
1663 CODE: 2069 CODE:
1664 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2070 if (gl.SeparableFilter2D)
1665 (target, internalformat, width, height, format, type, row, column)); 2071 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666 2072
1667void 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)
1668 2074
1669void 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)
1670 2076
1671void glRasterPos (int x, int y) 2077void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 2078
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2079void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676 2080
1677int glGenTexture () 2081int glGenTexture ()
1678 CODE: 2082 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines