ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines