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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines