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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 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;
271 } 320 }
272 } 321 }
273} 322}
274 323
275static void 324static void
296 ev.data2 = 0; 345 ev.data2 = 0;
297 346
298 SDL_PushEvent ((SDL_Event *)&ev); 347 SDL_PushEvent ((SDL_Event *)&ev);
299} 348}
300 349
350static unsigned int
351minpot (unsigned int n)
352{
353 if (!n)
354 return 0;
355
356 --n;
357
358 n |= n >> 1;
359 n |= n >> 2;
360 n |= n >> 4;
361 n |= n >> 8;
362 n |= n >> 16;
363
364 return n + 1;
365}
366
301MODULE = CFClient PACKAGE = CFClient 367MODULE = CFPlus PACKAGE = CFPlus
302 368
303PROTOTYPES: ENABLE 369PROTOTYPES: ENABLE
304 370
305BOOT: 371BOOT:
306{ 372{
307 HV *stash = gv_stashpv ("CFClient", 1); 373 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 374 static const struct {
309 const char *name; 375 const char *name;
310 IV iv; 376 IV iv;
311 } *civ, const_iv[] = { 377 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 378# define const_iv(name) { # name, (IV)name }
413 479
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 480 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 481 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 482}
417 483
484int
485in_destruct ()
486 CODE:
487 RETVAL = PL_main_cv == Nullcv;
488 OUTPUT:
489 RETVAL
490
491NV floor (NV x)
492
493NV ceil (NV x)
494
418void 495void
419pango_init () 496pango_init ()
420 CODE: 497 CODE:
421{ 498{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 499 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 500 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); 501 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} 502}
430 503
431int 504int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 505SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 506
434void 507void
435SDL_Quit () 508SDL_Quit ()
436 509
437void 510void
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 518 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 519 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 520
521 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
522 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
523
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452 528
453 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 529 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
530#if SDL_VERSION_ATLEAST(1,2,10)
454 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 531 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
455 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 532 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
533#endif
456 534
457 SDL_EnableUNICODE (1); 535 SDL_EnableUNICODE (1);
458 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 536 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459 537
460 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 538 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
469 547
470 ++m; 548 ++m;
471 } 549 }
472} 550}
473 551
552char *
553SDL_GetError ()
554
474int 555int
475SDL_SetVideoMode (int w, int h, int fullscreen) 556SDL_SetVideoMode (int w, int h, int fullscreen)
476 CODE: 557 CODE:
477 RETVAL = !!SDL_SetVideoMode ( 558 RETVAL = !!SDL_SetVideoMode (
478 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 559 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
479 ); 560 );
561 if (RETVAL)
562 {
480 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 563 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
564# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
565# include "glfunc.h"
566# undef GL_FUNC
567 }
481 OUTPUT: 568 OUTPUT:
482 RETVAL 569 RETVAL
483 570
484void 571void
485SDL_GL_SwapBuffers () 572SDL_GL_SwapBuffers ()
573
574char *
575SDL_GetKeyName (int sym)
486 576
487void 577void
488SDL_PollEvent () 578SDL_PollEvent ()
489 PPCODE: 579 PPCODE:
490{ 580{
509 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 599 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 600 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511 break; 601 break;
512 602
513 case SDL_MOUSEMOTION: 603 case SDL_MOUSEMOTION:
604 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
605
514 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 606 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 607 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 608 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 609 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 610 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519 break; 611 break;
520 612
521 case SDL_MOUSEBUTTONDOWN: 613 case SDL_MOUSEBUTTONDOWN:
522 case SDL_MOUSEBUTTONUP: 614 case SDL_MOUSEBUTTONUP:
615 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
616
523 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 617 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 618 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 619 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 620 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527 break; 621 break;
531 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 625 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
532 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 626 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
533 break; 627 break;
534 } 628 }
535 629
536 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 630 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
537 } 631 }
538} 632}
539 633
540int 634int
541Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 635Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
554 CODE: 648 CODE:
555#ifndef _WIN32 649#ifndef _WIN32
556 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557#endif 651#endif
558 652
559char *
560gl_version ()
561 CODE:
562 RETVAL = (char *)glGetString (GL_VERSION);
563 OUTPUT:
564 RETVAL
565
566char *
567gl_extensions ()
568 CODE:
569 RETVAL = (char *)glGetString (GL_EXTENSIONS);
570 OUTPUT:
571 RETVAL
572
573void 653void
574add_font (char *file) 654add_font (char *file)
575 CODE: 655 CODE:
576 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 656 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577#ifdef _WIN32
578 // cairo... sigh... requires win2000
579 AddFontResourceEx (file, FR_PRIVATE, 0);
580#endif
581 657
582void 658void
583load_image_inline (SV *image_) 659load_image_inline (SV *image_)
584 ALIAS: 660 ALIAS:
585 load_image_file = 1 661 load_image_file = 1
627 703
628 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 704 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629 705
630 assert (surface2->pitch == surface2->w * 4); 706 assert (surface2->pitch == surface2->w * 4);
631 707
708 SDL_LockSurface (surface2);
632 EXTEND (SP, 5); 709 EXTEND (SP, 6);
633 PUSHs (sv_2mortal (newSViv (surface2->w))); 710 PUSHs (sv_2mortal (newSViv (surface2->w)));
634 PUSHs (sv_2mortal (newSViv (surface2->h))); 711 PUSHs (sv_2mortal (newSViv (surface2->h)));
635 SDL_LockSurface (surface2);
636 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 712 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
637 SDL_UnlockSurface (surface2);
638 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 713 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 714 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 715 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
716 SDL_UnlockSurface (surface2);
641 717
642 SDL_FreeSurface (surface); 718 SDL_FreeSurface (surface);
643 SDL_FreeSurface (surface2); 719 SDL_FreeSurface (surface2);
644} 720}
645 721
669} 745}
670 746
671void 747void
672error (char *message) 748error (char *message)
673 CODE: 749 CODE:
750 fprintf (stderr, "ERROR: %s\n", message);
674#ifdef _WIN32 751#ifdef _WIN32
675 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 752 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676#else
677 fprintf (stderr, "ERROR: %s\n", message);
678#endif 753#endif
679 754
680void 755void
681fatal (char *message) 756fatal (char *message)
682 CODE: 757 CODE:
758 fprintf (stderr, "FATAL: %s\n", message);
683#ifdef _WIN32 759#ifdef _WIN32
684 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685#else
686 fprintf (stderr, "FATAL: %s\n", message);
687#endif 761#endif
688 exit (1); 762 _exit (1);
689 763
764void
765_exit (int retval)
766 CODE:
767 _exit (retval);
768
690MODULE = CFClient PACKAGE = CFClient::Font 769MODULE = CFPlus PACKAGE = CFPlus::Font
691 770
692CFClient::Font 771CFPlus::Font
693new_from_file (SV *class, char *path, int id = 0) 772new_from_file (SV *class, char *path, int id = 0)
694 CODE: 773 CODE:
695{ 774{
696 int count; 775 int count;
697 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 776 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
700} 779}
701 OUTPUT: 780 OUTPUT:
702 RETVAL 781 RETVAL
703 782
704void 783void
705DESTROY (CFClient::Font self) 784DESTROY (CFPlus::Font self)
706 CODE: 785 CODE:
707 pango_font_description_free (self); 786 pango_font_description_free (self);
708 787
709void 788void
710make_default (CFClient::Font self) 789make_default (CFPlus::Font self)
711 CODE: 790 CODE:
712 default_font = self; 791 default_font = self;
713 792
714MODULE = CFClient PACKAGE = CFClient::Layout 793MODULE = CFPlus PACKAGE = CFPlus::Layout
715 794
716CFClient::Layout 795void
717new (SV *class, int rgba = 0) 796reset_glyph_cache ()
797 CODE:
798 tc_clear ();
799
800CFPlus::Layout
801new (SV *class)
718 CODE: 802 CODE:
719 New (0, RETVAL, 1, struct cf_layout); 803 New (0, RETVAL, 1, struct cf_layout);
720 804
721 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 805 RETVAL->pl = pango_layout_new (opengl_context);
722 RETVAL->rgba = rgba;
723 RETVAL->r = 1.; 806 RETVAL->r = 1.;
724 RETVAL->g = 1.; 807 RETVAL->g = 1.;
725 RETVAL->b = 1.; 808 RETVAL->b = 1.;
726 RETVAL->a = 1.; 809 RETVAL->a = 1.;
727 RETVAL->base_height = MIN_FONT_HEIGHT; 810 RETVAL->base_height = MIN_FONT_HEIGHT;
731 layout_update_font (RETVAL); 814 layout_update_font (RETVAL);
732 OUTPUT: 815 OUTPUT:
733 RETVAL 816 RETVAL
734 817
735void 818void
736DESTROY (CFClient::Layout self) 819DESTROY (CFPlus::Layout self)
737 CODE: 820 CODE:
738 g_object_unref (self->pl); 821 g_object_unref (self->pl);
739 Safefree (self); 822 Safefree (self);
740 823
741int
742is_rgba (CFClient::Layout self)
743 CODE:
744 RETVAL = self->rgba;
745 OUTPUT:
746 RETVAL
747
748void 824void
749set_text (CFClient::Layout self, SV *text_) 825set_text (CFPlus::Layout self, SV *text_)
750 CODE: 826 CODE:
751{ 827{
752 STRLEN textlen; 828 STRLEN textlen;
753 char *text = SvPVutf8 (text_, textlen); 829 char *text = SvPVutf8 (text_, textlen);
754 830
755 pango_layout_set_text (self->pl, text, textlen); 831 pango_layout_set_text (self->pl, text, textlen);
756} 832}
757 833
758void 834void
759set_markup (CFClient::Layout self, SV *text_) 835set_markup (CFPlus::Layout self, SV *text_)
760 CODE: 836 CODE:
761{ 837{
762 STRLEN textlen; 838 STRLEN textlen;
763 char *text = SvPVutf8 (text_, textlen); 839 char *text = SvPVutf8 (text_, textlen);
764 840
765 pango_layout_set_markup (self->pl, text, textlen); 841 pango_layout_set_markup (self->pl, text, textlen);
766} 842}
767 843
844void
845set_shapes (CFPlus::Layout self, ...)
846 CODE:
847{
848 PangoAttrList *attrs = 0;
849 const char *text = pango_layout_get_text (self->pl);
850 const char *pos = text;
851 int arg = 4;
852
853 while (arg < items && (pos = strstr (pos, OBJ_STR)))
854 {
855 PangoRectangle inkrect, rect;
856 PangoAttribute *attr;
857
858 int x = SvIV (ST (arg - 3));
859 int y = SvIV (ST (arg - 2));
860 int w = SvIV (ST (arg - 1));
861 int h = SvIV (ST (arg ));
862
863 inkrect.x = 0;
864 inkrect.y = 0;
865 inkrect.width = 0;
866 inkrect.height = 0;
867
868 rect.x = x * PANGO_SCALE;
869 rect.y = y * PANGO_SCALE;
870 rect.width = w * PANGO_SCALE;
871 rect.height = h * PANGO_SCALE;
872
873 if (!attrs)
874 attrs = pango_layout_get_attributes (self->pl);
875
876 attr = pango_attr_shape_new (&inkrect, &rect);
877 attr->start_index = pos - text;
878 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
879 pango_attr_list_insert (attrs, attr);
880
881 arg += 4;
882 pos += sizeof (OBJ_STR) - 1;
883 }
884
885 if (attrs)
886 pango_layout_set_attributes (self->pl, attrs);
887}
888
889void
890get_shapes (CFPlus::Layout self)
891 PPCODE:
892{
893 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
894
895 do
896 {
897 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
898
899 if (run && shape_attr_p (run))
900 {
901 PangoRectangle extents;
902 pango_layout_iter_get_run_extents (iter, 0, &extents);
903
904 EXTEND (SP, 2);
905 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
906 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
907 }
908 }
909 while (pango_layout_iter_next_run (iter));
910
911 pango_layout_iter_free (iter);
912}
913
914int
915has_wrapped (CFPlus::Layout self)
916 CODE:
917{
918 int lines = 1;
919 const char *text = pango_layout_get_text (self->pl);
920
921 while (*text)
922 lines += *text++ == '\n';
923
924 RETVAL = lines < pango_layout_get_line_count (self->pl);
925}
926 OUTPUT:
927 RETVAL
928
768SV * 929SV *
769get_text (CFClient::Layout self) 930get_text (CFPlus::Layout self)
770 CODE: 931 CODE:
771 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 932 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772 SvUTF8_on (RETVAL); 933 sv_utf8_decode (RETVAL);
773 OUTPUT: 934 OUTPUT:
774 RETVAL 935 RETVAL
775 936
776void 937void
777set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 938set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
778 CODE: 939 CODE:
779 self->r = r; 940 self->r = r;
780 self->g = g; 941 self->g = g;
781 self->b = b; 942 self->b = b;
782 self->a = a; 943 self->a = a;
783 944
784void 945void
785set_font (CFClient::Layout self, CFClient::Font font = 0) 946set_font (CFPlus::Layout self, CFPlus::Font font = 0)
786 CODE: 947 CODE:
787 if (self->font != font) 948 if (self->font != font)
788 { 949 {
789 self->font = font; 950 self->font = font;
790 layout_update_font (self); 951 layout_update_font (self);
791 } 952 }
792 953
793void 954void
794set_height (CFClient::Layout self, int base_height) 955set_height (CFPlus::Layout self, int base_height)
795 CODE: 956 CODE:
796 if (self->base_height != base_height) 957 if (self->base_height != base_height)
797 { 958 {
798 self->base_height = base_height; 959 self->base_height = base_height;
799 layout_update_font (self); 960 layout_update_font (self);
800 } 961 }
801 962
802void 963void
803set_width (CFClient::Layout self, int max_width = -1) 964set_width (CFPlus::Layout self, int max_width = -1)
804 CODE: 965 CODE:
805 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 966 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806 967
807void 968void
808set_indent (CFClient::Layout self, int indent) 969set_indent (CFPlus::Layout self, int indent)
809 CODE: 970 CODE:
810 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 971 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
811 972
812void 973void
813set_spacing (CFClient::Layout self, int spacing) 974set_spacing (CFPlus::Layout self, int spacing)
814 CODE: 975 CODE:
815 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 976 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
816 977
817void 978void
818set_ellipsise (CFClient::Layout self, int ellipsise) 979set_ellipsise (CFPlus::Layout self, int ellipsise)
819 CODE: 980 CODE:
820 pango_layout_set_ellipsize (self->pl, 981 pango_layout_set_ellipsize (self->pl,
821 ellipsise == 1 ? PANGO_ELLIPSIZE_START 982 ellipsise == 1 ? PANGO_ELLIPSIZE_START
822 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 983 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
823 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 984 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
824 : PANGO_ELLIPSIZE_NONE 985 : PANGO_ELLIPSIZE_NONE
825 ); 986 );
826 987
827void 988void
828set_single_paragraph_mode (CFClient::Layout self, int spm) 989set_single_paragraph_mode (CFPlus::Layout self, int spm)
829 CODE: 990 CODE:
830 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 991 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
831 992
832void 993void
833size (CFClient::Layout self) 994size (CFPlus::Layout self)
834 PPCODE: 995 PPCODE:
835{ 996{
836 int w, h; 997 int w, h;
837 998
838 layout_get_pixel_size (self, &w, &h); 999 layout_get_pixel_size (self, &w, &h);
841 PUSHs (sv_2mortal (newSViv (w))); 1002 PUSHs (sv_2mortal (newSViv (w)));
842 PUSHs (sv_2mortal (newSViv (h))); 1003 PUSHs (sv_2mortal (newSViv (h)));
843} 1004}
844 1005
845int 1006int
1007descent (CFPlus::Layout self)
1008 CODE:
1009{
1010 PangoRectangle rect;
1011 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1012 pango_layout_line_get_pixel_extents (line, 0, &rect);
1013 RETVAL = PANGO_DESCENT (rect);
1014}
1015 OUTPUT:
1016 RETVAL
1017
1018int
846xy_to_index (CFClient::Layout self, int x, int y) 1019xy_to_index (CFPlus::Layout self, int x, int y)
847 CODE: 1020 CODE:
848{ 1021{
849 int index, trailing; 1022 int index, trailing;
850 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1023 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
851 RETVAL = index; 1024 RETVAL = index;
852} 1025}
853 OUTPUT: 1026 OUTPUT:
854 RETVAL 1027 RETVAL
855 1028
856void 1029void
857cursor_pos (CFClient::Layout self, int index) 1030cursor_pos (CFPlus::Layout self, int index)
858 PPCODE: 1031 PPCODE:
859{ 1032{
860 PangoRectangle strong_pos; 1033 PangoRectangle strong_pos;
861 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1034 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
862 1035
865 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
866 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1039 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
867} 1040}
868 1041
869void 1042void
870render (CFClient::Layout self) 1043render (CFPlus::Layout self, float x, float y, int flags = 0)
871 PPCODE: 1044 PPCODE:
872{ 1045 pango_opengl_render_layout_subpixel (
873 SV *retval; 1046 self->pl,
874 int w, h; 1047 x * PANGO_SCALE, y * PANGO_SCALE,
1048 self->r, self->g, self->b, self->a,
1049 flags
1050 );
875 1051
876 layout_get_pixel_size (self, &w, &h); 1052MODULE = CFPlus PACKAGE = CFPlus::Texture
877 1053
878 if (self->rgba) 1054void
1055pad2pot (SV *data_, SV *w_, SV *h_)
1056 CODE:
1057{
1058 int ow = SvIV (w_);
1059 int oh = SvIV (h_);
1060
1061 if (ow && oh)
879 { 1062 {
880 cairo_surface_t *surface; 1063 int nw = minpot (ow);
881 cairo_t *cairo; 1064 int nh = minpot (oh);
882 1065
883 retval = newSV (w * h * 4); 1066 if (nw != ow || nh != oh)
884 SvPOK_only (retval);
885 SvCUR_set (retval, w * h * 4);
886
887 memset (SvPVX (retval), 0, w * h * 4);
888
889 surface = cairo_image_surface_create_for_data (
890 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
891 cairo = cairo_create (surface);
892 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
893
894 pango_cairo_show_layout (cairo, self->pl);
895
896 cairo_destroy (cairo);
897 cairo_surface_destroy (surface);
898
899 // what a mess, and its premultiplied, too :(
900 { 1067 {
901 uint32_t *p = (uint32_t *)SvPVX (retval); 1068 if (SvOK (data_))
902 uint32_t *e = p + w * h;
903
904 while (p < e)
905 { 1069 {
906 uint32_t rgba = *p; 1070 STRLEN datalen;
907 rgba = (rgba >> 24) | (rgba << 8); 1071 char *data = SvPVbyte (data_, datalen);
908 rgba = SDL_SwapBE32 (rgba); 1072 int bpp = datalen / (ow * oh);
909 *p++ = rgba; 1073 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1074
1075 SvPOK_only (result_);
1076 SvCUR_set (result_, nw * nh * bpp);
1077
1078 memset (SvPVX (result_), 0, nw * nh * bpp);
1079 while (oh--)
1080 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1081
1082 sv_setsv (data_, result_);
910 } 1083 }
1084
1085 sv_setiv (w_, nw);
1086 sv_setiv (h_, nh);
911 } 1087 }
912
913 EXTEND (SP, 5);
914 PUSHs (sv_2mortal (newSViv (w)));
915 PUSHs (sv_2mortal (newSViv (h)));
916 PUSHs (sv_2mortal (retval));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919 } 1088 }
920 else
921 {
922 FT_Bitmap bitmap;
923
924 retval = newSV (w * h);
925 SvPOK_only (retval);
926 SvCUR_set (retval, w * h);
927
928 bitmap.rows = h;
929 bitmap.width = w;
930 bitmap.pitch = w;
931 bitmap.buffer = (unsigned char*)SvPVX (retval);
932 bitmap.num_grays = 256;
933 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
934
935 memset (bitmap.buffer, 0, w * h);
936
937 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
938
939 EXTEND (SP, 5);
940 PUSHs (sv_2mortal (newSViv (w)));
941 PUSHs (sv_2mortal (newSViv (h)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 }
946} 1089}
947 1090
948MODULE = CFClient PACKAGE = CFClient::Texture
949
950void 1091void
951draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1092draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
952 PROTOTYPE: $$$;$$ 1093 PROTOTYPE: $$$;$$
953 ALIAS: 1094 ALIAS:
954 draw_quad_alpha = 1 1095 draw_quad_alpha = 1
955 draw_quad_alpha_premultiplied = 2 1096 draw_quad_alpha_premultiplied = 2
956 CODE: 1097 CODE:
957{ 1098{
958 HV *hv = (HV *)SvRV (self); 1099 HV *hv = (HV *)SvRV (self);
959 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1100 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1101 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1102 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963 1103
964 if (items < 5) 1104 if (items < 5)
965 { 1105 {
966 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1106 w = SvNV (*hv_fetch (hv, "w", 1, 1));
967 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1107 h = SvNV (*hv_fetch (hv, "h", 1, 1));
968 } 1108 }
969 1109
970 if (ix) 1110 if (ix)
971 { 1111 {
972 glEnable (GL_BLEND); 1112 glEnable (GL_BLEND);
1113
1114 if (ix == 2)
973 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1115 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1116 else
1117 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1118 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1119
1120 glEnable (GL_ALPHA_TEST);
1121 glAlphaFunc (GL_GREATER, 0.01f);
974 } 1122 }
975 1123
976 glBindTexture (GL_TEXTURE_2D, name); 1124 glBindTexture (GL_TEXTURE_2D, name);
977
978 if (wrap_mode)
979 {
980 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982 }
983 1125
984 glBegin (GL_QUADS); 1126 glBegin (GL_QUADS);
985 glTexCoord2f (0, 0); glVertex2f (x , y ); 1127 glTexCoord2f (0, 0); glVertex2f (x , y );
986 glTexCoord2f (0, t); glVertex2f (x , y + h); 1128 glTexCoord2f (0, t); glVertex2f (x , y + h);
987 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1129 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1130 glTexCoord2f (s, 0); glVertex2f (x + w, y );
989 glEnd (); 1131 glEnd ();
990 1132
991 if (ix) 1133 if (ix)
1134 {
1135 glDisable (GL_ALPHA_TEST);
992 glDisable (GL_BLEND); 1136 glDisable (GL_BLEND);
1137 }
993} 1138}
994 1139
995MODULE = CFClient PACKAGE = CFClient::Map 1140MODULE = CFPlus PACKAGE = CFPlus::Map
996 1141
997CFClient::Map 1142CFPlus::Map
998new (SV *class, int map_width, int map_height) 1143new (SV *class, int map_width, int map_height)
999 CODE: 1144 CODE:
1000 New (0, RETVAL, 1, struct map); 1145 New (0, RETVAL, 1, struct map);
1001 RETVAL->x = 0; 1146 RETVAL->x = 0;
1002 RETVAL->y = 0; 1147 RETVAL->y = 0;
1012 RETVAL->row = 0; 1157 RETVAL->row = 0;
1013 OUTPUT: 1158 OUTPUT:
1014 RETVAL 1159 RETVAL
1015 1160
1016void 1161void
1017DESTROY (CFClient::Map self) 1162DESTROY (CFPlus::Map self)
1018 CODE: 1163 CODE:
1019{ 1164{
1020 map_clear (self); 1165 map_clear (self);
1021 Safefree (self->face); 1166 Safefree (self->face);
1167 Safefree (self->tex);
1022 Safefree (self); 1168 Safefree (self);
1023} 1169}
1024 1170
1025void 1171void
1026clear (CFClient::Map self) 1172clear (CFPlus::Map self)
1027 CODE: 1173 CODE:
1028 map_clear (self); 1174 map_clear (self);
1029 1175
1030void 1176void
1031set_face (CFClient::Map self, int face, int texid) 1177set_face (CFPlus::Map self, int face, int texid)
1032 CODE: 1178 CODE:
1033{ 1179{
1034 while (self->faces <= face) 1180 while (self->faces <= face)
1035 { 1181 {
1036 Append (mapface, self->face, self->faces, self->faces); 1182 Append (mapface, self->face, self->faces, self->faces);
1039 1185
1040 self->face [face] = texid; 1186 self->face [face] = texid;
1041} 1187}
1042 1188
1043void 1189void
1044set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1190set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1045 CODE: 1191 CODE:
1046{ 1192{
1047 while (self->texs <= texid) 1193 while (self->texs <= texid)
1048 { 1194 {
1049 Append (maptex, self->tex, self->texs, self->texs); 1195 Append (maptex, self->tex, self->texs, self->texs);
1061 tex->r = r; 1207 tex->r = r;
1062 tex->g = g; 1208 tex->g = g;
1063 tex->b = b; 1209 tex->b = b;
1064 tex->a = a; 1210 tex->a = a;
1065 } 1211 }
1212
1213 // somewhat hackish, but for textures that require it, it really
1214 // improves the look, and most others don't suffer.
1215 glBindTexture (GL_TEXTURE_2D, name);
1216 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1217 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1218 // use uglier nearest interpolation because linear suffers
1219 // from transparent color bleeding and ugly wrapping effects.
1220 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1066} 1221}
1067 1222
1068int 1223int
1069ox (CFClient::Map self) 1224ox (CFPlus::Map self)
1070 ALIAS: 1225 ALIAS:
1071 oy = 1 1226 oy = 1
1227 x = 2
1228 y = 3
1229 w = 4
1230 h = 5
1072 CODE: 1231 CODE:
1073 switch (ix) 1232 switch (ix)
1074 { 1233 {
1075 case 0: RETVAL = self->ox; break; 1234 case 0: RETVAL = self->ox; break;
1076 case 1: RETVAL = self->oy; break; 1235 case 1: RETVAL = self->oy; break;
1236 case 2: RETVAL = self->x; break;
1237 case 3: RETVAL = self->y; break;
1238 case 4: RETVAL = self->w; break;
1239 case 5: RETVAL = self->h; break;
1077 } 1240 }
1078 OUTPUT: 1241 OUTPUT:
1079 RETVAL 1242 RETVAL
1080 1243
1081void 1244void
1082scroll (CFClient::Map self, int dx, int dy) 1245scroll (CFPlus::Map self, int dx, int dy)
1083 CODE: 1246 CODE:
1084{ 1247{
1085 if (dx > 0) 1248 if (dx > 0)
1086 map_blank (self, self->x, self->y, dx - 1, self->h); 1249 map_blank (self, self->x, self->y, dx - 1, self->h);
1087 else if (dx < 0) 1250 else if (dx < 0)
1103 self->y += MAP_EXTEND_Y; 1266 self->y += MAP_EXTEND_Y;
1104 } 1267 }
1105} 1268}
1106 1269
1107void 1270void
1108map1a_update (CFClient::Map self, SV *data_) 1271map1a_update (CFPlus::Map self, SV *data_, int extmap)
1109 CODE: 1272 CODE:
1110{ 1273{
1111 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1274 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1112 uint8_t *data_end = (uint8_t *)SvEND (data_); 1275 uint8_t *data_end = (uint8_t *)SvEND (data_);
1113 mapcell *cell; 1276 mapcell *cell;
1114 int x, y, flags; 1277 int x, y, flags;
1115 1278
1116 while (data < data_end) 1279 while (data < data_end - 1)
1117 { 1280 {
1118 flags = (data [0] << 8) + data [1]; data += 2; 1281 flags = (data [0] << 8) + data [1]; data += 2;
1119 1282
1120 x = ((flags >> 10) & 63) + self->x; 1283 x = self->x + ((flags >> 10) & 63);
1121 y = ((flags >> 4) & 63) + self->y; 1284 y = self->y + ((flags >> 4) & 63);
1122 1285
1123 cell = map_get_cell (self, x, y); 1286 cell = map_get_cell (self, x, y);
1124 1287
1125 if (flags & 15) 1288 if (flags & 15)
1126 { 1289 {
1127 if (cell->darkness < 0) 1290 if (!cell->darkness)
1128 { 1291 {
1129 cell->darkness = 0; 1292 cell->darkness = 256;
1130 cell->face [0] = 0; 1293 cell->face [0] = 0;
1131 cell->face [1] = 0; 1294 cell->face [1] = 0;
1132 cell->face [2] = 0; 1295 cell->face [2] = 0;
1133 } 1296 }
1134 1297
1135 cell->darkness = flags & 8 ? *data++ : 255;
1136
1137 //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 }
1138 1339
1139 if (flags & 4) 1340 if (flags & 4)
1140 { 1341 {
1141 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;
1142 } 1343 }
1150 { 1351 {
1151 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;
1152 } 1353 }
1153 } 1354 }
1154 else 1355 else
1356 {
1155 cell->darkness = -1; 1357 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1156 } 1360 }
1157} 1361}
1158 1362
1159SV * 1363SV *
1160mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1161 CODE: 1365 CODE:
1162{ 1366{
1163 int x1, x; 1367 int x1, x;
1164 int y1, y; 1368 int y1, y;
1165 int z; 1369 int z;
1215} 1419}
1216 OUTPUT: 1420 OUTPUT:
1217 RETVAL 1421 RETVAL
1218 1422
1219void 1423void
1220draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1424draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1221 PPCODE: 1425 CODE:
1222{ 1426{
1223 int vx, vy; 1427 int vx, vy;
1224 int x, y, z; 1428 int x, y, z;
1225 int last_name; 1429 int last_name;
1226 mapface face; 1430 mapface face;
1227 int sw4 = (sw + 3) & ~3;
1228 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1229 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1230 1431
1231 memset (darkness, 255, sw4 * sh);
1232 SvPOK_only (darkness_sv);
1233 SvCUR_set (darkness_sv, sw4 * sh);
1234
1235 vx = self->x + (self->w - sw) / 2 - shift_x; 1432 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1236 vy = self->y + (self->h - sh) / 2 - shift_y; 1433 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1237 1434
1238 /* 1435 /*
1239 int vx = self->vx = self->w >= sw 1436 int vx = self->vx = self->w >= sw
1240 ? self->x + (self->w - sw) / 2 1437 ? self->x + (self->w - sw) / 2
1241 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1438 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1245 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1442 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1246 */ 1443 */
1247 1444
1248 glColor4ub (255, 255, 255, 255); 1445 glColor4ub (255, 255, 255, 255);
1249 1446
1447 glEnable (GL_BLEND);
1250 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1251 glEnable (GL_BLEND);
1252 glEnable (GL_TEXTURE_2D); 1449 glEnable (GL_TEXTURE_2D);
1253 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1450 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1254 1451
1255 glBegin (GL_QUADS); 1452 glBegin (GL_QUADS);
1256 1453
1265 for (x = 0; x < sw; x++) 1462 for (x = 0; x < sw; x++)
1266 if (row->c0 <= x + vx && x + vx < row->c1) 1463 if (row->c0 <= x + vx && x + vx < row->c1)
1267 { 1464 {
1268 mapcell *cell = row->col + (x + vx - row->c0); 1465 mapcell *cell = row->col + (x + vx - row->c0);
1269 1466
1270 darkness[y * sw4 + x] = cell->darkness < 0
1271 ? 255 - FOW_DARKNESS
1272 : 255 - cell->darkness;
1273
1274 face = cell->face [z]; 1467 face = cell->face [z];
1275 1468
1276 if (face) 1469 if (face && face < self->texs)
1277 { 1470 {
1278 maptex tex = self->tex [face]; 1471 maptex tex = self->tex [face];
1279
1280 int px = (x + 1) * 32 - tex.w; 1472 int px = (x + 1) * 32 - tex.w;
1281 int py = (y + 1) * 32 - tex.h; 1473 int py = (y + 1) * 32 - tex.h;
1282 1474
1283 if (last_name != tex.name) 1475 if (last_name != tex.name)
1284 { 1476 {
1285 glEnd (); 1477 glEnd ();
1286 last_name = tex.name;
1287 glBindTexture (GL_TEXTURE_2D, last_name); 1478 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1288 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1289 } 1480 }
1290 1481
1291 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1482 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1292 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1483 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1293 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1484 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1294 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1485 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1295 } 1486 }
1487
1488 if (cell->flags && z == 2)
1489 {
1490 if (cell->flags & 1)
1491 {
1492 maptex tex = self->tex [1];
1493 int px = (x + 1) * 32 - tex.w + 2;
1494 int py = (y + 1) * 32 - tex.h - 6;
1495
1496 glEnd ();
1497 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1498 glBegin (GL_QUADS);
1499
1500 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1501 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1502 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1503 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1504 }
1505 }
1296 } 1506 }
1297 } 1507 }
1298 1508
1299 glEnd (); 1509 glEnd ();
1300 1510
1301 glDisable (GL_TEXTURE_2D); 1511 glDisable (GL_TEXTURE_2D);
1302 glDisable (GL_BLEND); 1512 glDisable (GL_BLEND);
1513
1514 // top layer: overlays such as the health bar
1515 for (y = 0; y < sh; y++)
1516 if (0 <= y + vy && y + vy < self->rows)
1517 {
1518 maprow *row = self->row + (y + vy);
1519
1520 for (x = 0; x < sw; x++)
1521 if (row->c0 <= x + vx && x + vx < row->c1)
1522 {
1523 mapcell *cell = row->col + (x + vx - row->c0);
1524
1525 int px = x * 32;
1526 int py = y * 32;
1527
1528 if (cell->stat_hp)
1529 {
1530 int width = cell->stat_width * 32;
1531 int thick = sh / 28 + 1 + cell->stat_width;
1532
1533 glColor3ub (0, 0, 0);
1534 glRectf (px + 1, py - thick - 2,
1535 px + width - 1, py);
1536
1537 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1538 glRectf (px + 2,
1539 py - thick - 1,
1540 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1541 }
1542 }
1543 }
1544}
1545
1546void
1547draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1548 CODE:
1549{
1550 static float color[16][3] = {
1551 { 0.00F, 0.00F, 0.00F },
1552 { 1.00F, 1.00F, 1.00F },
1553 { 0.00F, 0.00F, 0.55F },
1554 { 1.00F, 0.00F, 0.00F },
1555
1556 { 1.00F, 0.54F, 0.00F },
1557 { 0.11F, 0.56F, 1.00F },
1558 { 0.93F, 0.46F, 0.00F },
1559 { 0.18F, 0.54F, 0.34F },
1560
1561 { 0.56F, 0.73F, 0.56F },
1562 { 0.80F, 0.80F, 0.80F },
1563 { 0.55F, 0.41F, 0.13F },
1564 { 0.99F, 0.77F, 0.26F },
1565
1566 { 0.74F, 0.65F, 0.41F },
1567
1568 { 0.00F, 1.00F, 1.00F },
1569 { 1.00F, 0.00F, 1.00F },
1570 { 1.00F, 1.00F, 0.00F },
1571 };
1572
1573 int x, y;
1574
1575 glEnable (GL_TEXTURE_2D);
1576 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1577 glEnable (GL_BLEND);
1578 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1579 glBegin (GL_QUADS);
1580
1581 for (y = 0; y < h; y++)
1582 for (x = 0; x < w; x++)
1583 {
1584 unsigned char m = data [x + y * w];
1585
1586 if (m)
1587 {
1588 float *c = color [m & 15];
1589
1590 float tx1 = m & 0x40 ? 0.5 : 0.;
1591 float tx2 = tx1 + 0.5;
1592
1593 glColor4f (c[0], c[1], c[2], 0.75);
1594 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1595 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1596 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1597 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1598 }
1599 }
1600
1601 glEnd ();
1602 glDisable (GL_BLEND);
1603 glDisable (GL_TEXTURE_2D);
1604}
1605
1606void
1607fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1608 PPCODE:
1609{
1610 int vx, vy;
1611 int x, y;
1612 int sw4 = (sw + 3) & ~3;
1613 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1614 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1615
1616 memset (darkness, 255, sw4 * sh);
1617 SvPOK_only (darkness_sv);
1618 SvCUR_set (darkness_sv, sw4 * sh);
1619
1620 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1621 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1622
1623 for (y = 0; y < sh; y++)
1624 if (0 <= y + vy && y + vy < self->rows)
1625 {
1626 maprow *row = self->row + (y + vy);
1627
1628 for (x = 0; x < sw; x++)
1629 if (row->c0 <= x + vx && x + vx < row->c1)
1630 {
1631 mapcell *cell = row->col + (x + vx - row->c0);
1632
1633 darkness[y * sw4 + x] = cell->darkness
1634 ? 255 - (cell->darkness - 1)
1635 : 255 - FOW_DARKNESS;
1636 }
1637 }
1303 1638
1304 EXTEND (SP, 3); 1639 EXTEND (SP, 3);
1305 PUSHs (sv_2mortal (newSViv (sw4))); 1640 PUSHs (sv_2mortal (newSViv (sw4)));
1306 PUSHs (sv_2mortal (newSViv (sh))); 1641 PUSHs (sv_2mortal (newSViv (sh)));
1307 PUSHs (darkness_sv); 1642 PUSHs (darkness_sv);
1308} 1643}
1309 1644
1310SV * 1645SV *
1311get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1646get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1312 CODE: 1647 CODE:
1313{ 1648{
1314 int x, y, x1, y1; 1649 int x, y, x1, y1;
1315 SV *data_sv = newSV (w * h * 7 + 5); 1650 SV *data_sv = newSV (w * h * 7 + 5);
1316 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1651 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1378} 1713}
1379 OUTPUT: 1714 OUTPUT:
1380 RETVAL 1715 RETVAL
1381 1716
1382void 1717void
1383set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1718set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1384 PPCODE: 1719 PPCODE:
1385{ 1720{
1386 int x, y, z; 1721 int x, y, z;
1387 int w, h; 1722 int w, h;
1388 int x1, y1; 1723 int x1, y1;
1420 1755
1421 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1756 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1422 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1757 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1423 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1758 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1424 1759
1425 if (cell->darkness <= 0) 1760 if (cell->darkness == 0)
1426 { 1761 {
1427 cell->darkness = -1; 1762 cell->darkness = 0;
1428 1763
1429 for (z = 0; z <= 2; z++) 1764 for (z = 0; z <= 2; z++)
1430 { 1765 {
1431 cell->face[z] = face[z]; 1766 cell->face[z] = face[z];
1432 1767
1437 } 1772 }
1438 } 1773 }
1439 } 1774 }
1440} 1775}
1441 1776
1442MODULE = CFClient PACKAGE = CFClient::MixChunk 1777MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1443 1778
1444CFClient::MixChunk 1779CFPlus::MixChunk
1445new_from_file (SV *class, char *path) 1780new_from_file (SV *class, char *path)
1446 CODE: 1781 CODE:
1447 RETVAL = Mix_LoadWAV (path); 1782 RETVAL = Mix_LoadWAV (path);
1448 OUTPUT: 1783 OUTPUT:
1449 RETVAL 1784 RETVAL
1450 1785
1451void 1786void
1452DESTROY (CFClient::MixChunk self) 1787DESTROY (CFPlus::MixChunk self)
1453 CODE: 1788 CODE:
1454 Mix_FreeChunk (self); 1789 Mix_FreeChunk (self);
1455 1790
1456int 1791int
1457volume (CFClient::MixChunk self, int volume = -1) 1792volume (CFPlus::MixChunk self, int volume = -1)
1458 CODE: 1793 CODE:
1459 RETVAL = Mix_VolumeChunk (self, volume); 1794 RETVAL = Mix_VolumeChunk (self, volume);
1460 OUTPUT: 1795 OUTPUT:
1461 RETVAL 1796 RETVAL
1462 1797
1463int 1798int
1464play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1799play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1465 CODE: 1800 CODE:
1466 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1801 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1467 OUTPUT: 1802 OUTPUT:
1468 RETVAL 1803 RETVAL
1469 1804
1470MODULE = CFClient PACKAGE = CFClient::MixMusic 1805MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1471 1806
1472int 1807int
1473volume (int volume = -1) 1808volume (int volume = -1)
1474 CODE: 1809 CODE:
1475 RETVAL = Mix_VolumeMusic (volume); 1810 RETVAL = Mix_VolumeMusic (volume);
1476 OUTPUT: 1811 OUTPUT:
1477 RETVAL 1812 RETVAL
1478 1813
1479CFClient::MixMusic 1814CFPlus::MixMusic
1480new_from_file (SV *class, char *path) 1815new_from_file (SV *class, char *path)
1481 CODE: 1816 CODE:
1482 RETVAL = Mix_LoadMUS (path); 1817 RETVAL = Mix_LoadMUS (path);
1483 OUTPUT: 1818 OUTPUT:
1484 RETVAL 1819 RETVAL
1485 1820
1486void 1821void
1487DESTROY (CFClient::MixMusic self) 1822DESTROY (CFPlus::MixMusic self)
1488 CODE: 1823 CODE:
1489 Mix_FreeMusic (self); 1824 Mix_FreeMusic (self);
1490 1825
1491int 1826int
1492play (CFClient::MixMusic self, int loops = -1) 1827play (CFPlus::MixMusic self, int loops = -1)
1493 CODE: 1828 CODE:
1494 RETVAL = Mix_PlayMusic (self, loops); 1829 RETVAL = Mix_PlayMusic (self, loops);
1495 OUTPUT: 1830 OUTPUT:
1496 RETVAL 1831 RETVAL
1497 1832
1498MODULE = CFClient PACKAGE = CFClient::OpenGL 1833MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1499 1834
1500BOOT: 1835BOOT:
1501{ 1836{
1502 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1837 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1503 static const struct { 1838 static const struct {
1504 const char *name; 1839 const char *name;
1505 IV iv; 1840 IV iv;
1506 } *civ, const_iv[] = { 1841 } *civ, const_iv[] = {
1507# define const_iv(name) { # name, (IV)name } 1842# define const_iv(name) { # name, (IV)name }
1508 const_iv (GL_COLOR_MATERIAL), 1843 const_iv (GL_COLOR_MATERIAL),
1509 const_iv (GL_SMOOTH), 1844 const_iv (GL_SMOOTH),
1510 const_iv (GL_FLAT), 1845 const_iv (GL_FLAT),
1511 const_iv (GL_DITHER), 1846 const_iv (GL_DITHER),
1512 const_iv (GL_BLEND), 1847 const_iv (GL_BLEND),
1848 const_iv (GL_CULL_FACE),
1513 const_iv (GL_SCISSOR_TEST), 1849 const_iv (GL_SCISSOR_TEST),
1850 const_iv (GL_DEPTH_TEST),
1851 const_iv (GL_ALPHA_TEST),
1852 const_iv (GL_NORMALIZE),
1853 const_iv (GL_RESCALE_NORMAL),
1854 const_iv (GL_FRONT),
1855 const_iv (GL_BACK),
1514 const_iv (GL_AND), 1856 const_iv (GL_AND),
1515 const_iv (GL_ONE), 1857 const_iv (GL_ONE),
1516 const_iv (GL_ZERO), 1858 const_iv (GL_ZERO),
1517 const_iv (GL_SRC_ALPHA), 1859 const_iv (GL_SRC_ALPHA),
1518 const_iv (GL_SRC_ALPHA_SATURATE), 1860 const_iv (GL_DST_ALPHA),
1519 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1861 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520 const_iv (GL_ONE_MINUS_DST_ALPHA), 1862 const_iv (GL_ONE_MINUS_DST_ALPHA),
1863 const_iv (GL_SRC_ALPHA_SATURATE),
1521 const_iv (GL_RGB), 1864 const_iv (GL_RGB),
1522 const_iv (GL_RGBA), 1865 const_iv (GL_RGBA),
1866 const_iv (GL_RGBA4),
1867 const_iv (GL_RGBA8),
1868 const_iv (GL_RGB5_A1),
1523 const_iv (GL_UNSIGNED_BYTE), 1869 const_iv (GL_UNSIGNED_BYTE),
1870 const_iv (GL_UNSIGNED_SHORT),
1871 const_iv (GL_UNSIGNED_INT),
1524 const_iv (GL_ALPHA), 1872 const_iv (GL_ALPHA),
1873 const_iv (GL_INTENSITY),
1525 const_iv (GL_LUMINANCE), 1874 const_iv (GL_LUMINANCE),
1875 const_iv (GL_LUMINANCE_ALPHA),
1526 const_iv (GL_FLOAT), 1876 const_iv (GL_FLOAT),
1527 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1877 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528 const_iv (GL_COMPILE), 1878 const_iv (GL_COMPILE),
1529 const_iv (GL_TEXTURE_1D), 1879 const_iv (GL_TEXTURE_1D),
1530 const_iv (GL_TEXTURE_2D), 1880 const_iv (GL_TEXTURE_2D),
1532 const_iv (GL_TEXTURE_MAG_FILTER), 1882 const_iv (GL_TEXTURE_MAG_FILTER),
1533 const_iv (GL_TEXTURE_MIN_FILTER), 1883 const_iv (GL_TEXTURE_MIN_FILTER),
1534 const_iv (GL_TEXTURE_ENV_MODE), 1884 const_iv (GL_TEXTURE_ENV_MODE),
1535 const_iv (GL_TEXTURE_WRAP_S), 1885 const_iv (GL_TEXTURE_WRAP_S),
1536 const_iv (GL_TEXTURE_WRAP_T), 1886 const_iv (GL_TEXTURE_WRAP_T),
1887 const_iv (GL_REPEAT),
1537 const_iv (GL_CLAMP), 1888 const_iv (GL_CLAMP),
1538 const_iv (GL_REPEAT), 1889 const_iv (GL_CLAMP_TO_EDGE),
1539 const_iv (GL_NEAREST), 1890 const_iv (GL_NEAREST),
1540 const_iv (GL_LINEAR), 1891 const_iv (GL_LINEAR),
1541 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1892 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1893 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1894 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1895 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545 const_iv (GL_GENERATE_MIPMAP), 1896 const_iv (GL_GENERATE_MIPMAP),
1546 const_iv (GL_MODULATE), 1897 const_iv (GL_MODULATE),
1547 const_iv (GL_DECAL), 1898 const_iv (GL_DECAL),
1548 const_iv (GL_REPLACE), 1899 const_iv (GL_REPLACE),
1900 const_iv (GL_DEPTH_BUFFER_BIT),
1549 const_iv (GL_COLOR_BUFFER_BIT), 1901 const_iv (GL_COLOR_BUFFER_BIT),
1550 const_iv (GL_PROJECTION), 1902 const_iv (GL_PROJECTION),
1551 const_iv (GL_MODELVIEW), 1903 const_iv (GL_MODELVIEW),
1552 const_iv (GL_COLOR_LOGIC_OP), 1904 const_iv (GL_COLOR_LOGIC_OP),
1553 const_iv (GL_SEPARABLE_2D), 1905 const_iv (GL_SEPARABLE_2D),
1554 const_iv (GL_CONVOLUTION_2D), 1906 const_iv (GL_CONVOLUTION_2D),
1555 const_iv (GL_CONVOLUTION_BORDER_MODE), 1907 const_iv (GL_CONVOLUTION_BORDER_MODE),
1556 const_iv (GL_CONSTANT_BORDER), 1908 const_iv (GL_CONSTANT_BORDER),
1557 const_iv (GL_LINES), 1909 const_iv (GL_LINES),
1910 const_iv (GL_LINE_STRIP),
1911 const_iv (GL_LINE_LOOP),
1558 const_iv (GL_QUADS), 1912 const_iv (GL_QUADS),
1559 const_iv (GL_LINE_LOOP), 1913 const_iv (GL_QUAD_STRIP),
1914 const_iv (GL_TRIANGLES),
1915 const_iv (GL_TRIANGLE_STRIP),
1916 const_iv (GL_TRIANGLE_FAN),
1560 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1917 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561 const_iv (GL_FASTEST), 1918 const_iv (GL_FASTEST),
1919 const_iv (GL_V2F),
1920 const_iv (GL_V3F),
1921 const_iv (GL_T2F_V3F),
1922 const_iv (GL_T2F_N3F_V3F),
1562# undef const_iv 1923# undef const_iv
1563 }; 1924 };
1564 1925
1565 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1926 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1927 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567} 1928}
1568 1929
1930char *
1931gl_vendor ()
1932 CODE:
1933 RETVAL = (char *)glGetString (GL_VENDOR);
1934 OUTPUT:
1935 RETVAL
1936
1937char *
1938gl_version ()
1939 CODE:
1940 RETVAL = (char *)glGetString (GL_VERSION);
1941 OUTPUT:
1942 RETVAL
1943
1944char *
1945gl_extensions ()
1946 CODE:
1947 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1948 OUTPUT:
1949 RETVAL
1950
1569int glGetError () 1951int glGetError ()
1952
1953void glFinish ()
1570 1954
1571void glClear (int mask) 1955void glClear (int mask)
1572 1956
1573void glClearColor (float r, float g, float b, float a = 1.0) 1957void glClearColor (float r, float g, float b, float a = 1.0)
1574 PROTOTYPE: @ 1958 PROTOTYPE: @
1581 1965
1582void glHint (int target, int mode) 1966void glHint (int target, int mode)
1583 1967
1584void glBlendFunc (int sfactor, int dfactor) 1968void glBlendFunc (int sfactor, int dfactor)
1585 1969
1970void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1971 CODE:
1972 gl_BlendFuncSeparate (sa, da, saa, daa);
1973
1974void glDepthMask (int flag)
1975
1586void glLogicOp (int opcode) 1976void glLogicOp (int opcode)
1587 1977
1588void glColorMask (int red, int green, int blue, int alpha) 1978void glColorMask (int red, int green, int blue, int alpha)
1589 1979
1590void glMatrixMode (int mode) 1980void glMatrixMode (int mode)
1593 1983
1594void glPopMatrix () 1984void glPopMatrix ()
1595 1985
1596void glLoadIdentity () 1986void glLoadIdentity ()
1597 1987
1988void glDrawBuffer (int buffer)
1989
1990void glReadBuffer (int buffer)
1991
1598# near and far are due to microsofts buggy c compiler 1992# near_ and far_ are due to microsofts buggy "c" compiler
1993void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1994
1995# near_ and far_ are due to microsofts buggy "c" compiler
1599void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1996void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600 1997
1601void glViewport (int x, int y, int width, int height) 1998void glViewport (int x, int y, int width, int height)
1602 1999
1603void glScissor (int x, int y, int width, int height) 2000void glScissor (int x, int y, int width, int height)
1618 2015
1619void glEnd () 2016void glEnd ()
1620 2017
1621void glColor (float r, float g, float b, float a = 1.0) 2018void glColor (float r, float g, float b, float a = 1.0)
1622 PROTOTYPE: @ 2019 PROTOTYPE: @
2020 ALIAS:
2021 glColor_premultiply = 1
1623 CODE: 2022 CODE:
1624 glColor4ub (MIN ((int)(r * 255.f), 255), 2023 if (ix)
1625 MIN ((int)(g * 255.f), 255), 2024 {
1626 MIN ((int)(b * 255.f), 255), 2025 r *= a;
1627 MIN ((int)(a * 255.f), 255)); 2026 g *= a;
2027 b *= a;
2028 }
2029 // microsoft visual "c" rounds instead of truncating...
2030 glColor4f (r, g, b, a);
2031
2032void glInterleavedArrays (int format, int stride, char *data)
2033
2034void glDrawElements (int mode, int count, int type, char *indices)
2035
2036# 1.2 void glDrawRangeElements (int mode, int start, int end
2037
2038void glRasterPos (float x, float y, float z = 0.)
2039 CODE:
2040 glRasterPos3f (0, 0, z);
2041 glBitmap (0, 0, 0, 0, x, y, 0);
1628 2042
1629void glVertex (float x, float y, float z = 0.) 2043void glVertex (float x, float y, float z = 0.)
1630 CODE: 2044 CODE:
1631 glVertex3f (x, y, z); 2045 glVertex3f (x, y, z);
1632 2046
1644 2058
1645void glBindTexture (int target, int name) 2059void glBindTexture (int target, int name)
1646 2060
1647void glConvolutionParameter (int target, int pname, float params) 2061void glConvolutionParameter (int target, int pname, float params)
1648 CODE: 2062 CODE:
1649 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2063 if (gl.ConvolutionParameterf)
2064 gl.ConvolutionParameterf (target, pname, params);
1650 2065
1651void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2066void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652 CODE: 2067 CODE:
1653 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2068 if (gl.ConvolutionFilter2D)
1654 (target, internalformat, width, height, format, type, data)); 2069 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655 2070
1656void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2071void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1657 CODE: 2072 CODE:
1658 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2073 if (gl.SeparableFilter2D)
1659 (target, internalformat, width, height, format, type, row, column)); 2074 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660 2075
1661void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2076void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662 2077
1663void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2078void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664 2079
1665void glRasterPos (int x, int y) 2080void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666 CODE:
1667 glRasterPos2i (x, y);
1668 2081
1669void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2082void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670 2083
1671int glGenTexture () 2084int glGenTexture ()
1672 CODE: 2085 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines