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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines