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.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.149 by root, Sat Aug 19 04:03:15 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines