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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 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_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
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
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 522
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 527
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10)
530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif
457 533
458 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 536
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 555SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 556 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 557 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 559 );
560 if (RETVAL)
561 {
484 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 }
485 OUTPUT: 567 OUTPUT:
486 RETVAL 568 RETVAL
487 569
488void 570void
489SDL_GL_SwapBuffers () 571SDL_GL_SwapBuffers ()
572
573char *
574SDL_GetKeyName (int sym)
490 575
491void 576void
492SDL_PollEvent () 577SDL_PollEvent ()
493 PPCODE: 578 PPCODE:
494{ 579{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 600 break;
516 601
517 case SDL_MOUSEMOTION: 602 case SDL_MOUSEMOTION:
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 610 break;
524 611
525 case SDL_MOUSEBUTTONDOWN: 612 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 613 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
615
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 616 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 617 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 618 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 619 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 620 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 626 break;
538 } 627 }
539 628
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 630 }
542} 631}
543 632
544int 633int
545Mix_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)
558 CODE: 647 CODE:
559#ifndef _WIN32 648#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 650#endif
562 651
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583
584void 652void
585add_font (char *file) 653add_font (char *file)
586 CODE: 654 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 656
593void 657void
594load_image_inline (SV *image_) 658load_image_inline (SV *image_)
595 ALIAS: 659 ALIAS:
596 load_image_file = 1 660 load_image_file = 1
638 702
639 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640 704
641 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
642 706
707 SDL_LockSurface (surface2);
643 EXTEND (SP, 5); 708 EXTEND (SP, 6);
644 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
645 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
646 SDL_LockSurface (surface2);
647 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
648 SDL_UnlockSurface (surface2);
649 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)));
650 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
652 716
653 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
654 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
655} 719}
656 720
692 CODE: 756 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 757 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 758#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 760#endif
697 exit (1); 761 _exit (1);
698 762
763void
764_exit (int retval)
765 CODE:
766 _exit (retval);
767
699MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
700 769
701CFClient::Font 770CFPlus::Font
702new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
703 CODE: 772 CODE:
704{ 773{
705 int count; 774 int count;
706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
709} 778}
710 OUTPUT: 779 OUTPUT:
711 RETVAL 780 RETVAL
712 781
713void 782void
714DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
715 CODE: 784 CODE:
716 pango_font_description_free (self); 785 pango_font_description_free (self);
717 786
718void 787void
719make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
720 CODE: 789 CODE:
721 default_font = self; 790 default_font = self;
722 791
723MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
724 793
725CFClient::Layout 794void
726new (SV *class, int rgba = 0) 795reset_glyph_cache ()
727 CODE: 796 CODE:
728#if _WIN32 797 tc_clear ();
729 rgba = 0;//D 798
730#endif 799CFPlus::Layout
800new (SV *class)
801 CODE:
731 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
732 803
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 805 RETVAL->r = 1.;
736 RETVAL->g = 1.; 806 RETVAL->g = 1.;
737 RETVAL->b = 1.; 807 RETVAL->b = 1.;
738 RETVAL->a = 1.; 808 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
743 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
744 OUTPUT: 814 OUTPUT:
745 RETVAL 815 RETVAL
746 816
747void 817void
748DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
749 CODE: 819 CODE:
750 g_object_unref (self->pl); 820 g_object_unref (self->pl);
751 Safefree (self); 821 Safefree (self);
752 822
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 823void
761set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
762 CODE: 825 CODE:
763{ 826{
764 STRLEN textlen; 827 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
766 829
767 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
768} 831}
769 832
770void 833void
771set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
772 CODE: 835 CODE:
773{ 836{
774 STRLEN textlen; 837 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
776 839
777 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
778} 841}
779 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
780SV * 928SV *
781get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
782 CODE: 930 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 932 sv_utf8_decode (RETVAL);
785 OUTPUT: 933 OUTPUT:
786 RETVAL 934 RETVAL
787 935
788void 936void
789set_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.)
790 CODE: 938 CODE:
791 self->r = r; 939 self->r = r;
792 self->g = g; 940 self->g = g;
793 self->b = b; 941 self->b = b;
794 self->a = a; 942 self->a = a;
795 943
796void 944void
797set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798 CODE: 946 CODE:
799 if (self->font != font) 947 if (self->font != font)
800 { 948 {
801 self->font = font; 949 self->font = font;
802 layout_update_font (self); 950 layout_update_font (self);
803 } 951 }
804 952
805void 953void
806set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
807 CODE: 955 CODE:
808 if (self->base_height != base_height) 956 if (self->base_height != base_height)
809 { 957 {
810 self->base_height = base_height; 958 self->base_height = base_height;
811 layout_update_font (self); 959 layout_update_font (self);
812 } 960 }
813 961
814void 962void
815set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
816 CODE: 964 CODE:
817 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);
818 966
819void 967void
820set_indent (CFClient::Layout self, int indent) 968set_indent (CFPlus::Layout self, int indent)
821 CODE: 969 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823 971
824void 972void
825set_spacing (CFClient::Layout self, int spacing) 973set_spacing (CFPlus::Layout self, int spacing)
826 CODE: 974 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828 976
829void 977void
830set_ellipsise (CFClient::Layout self, int ellipsise) 978set_ellipsise (CFPlus::Layout self, int ellipsise)
831 CODE: 979 CODE:
832 pango_layout_set_ellipsize (self->pl, 980 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START 981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE 984 : PANGO_ELLIPSIZE_NONE
837 ); 985 );
838 986
839void 987void
840set_single_paragraph_mode (CFClient::Layout self, int spm) 988set_single_paragraph_mode (CFPlus::Layout self, int spm)
841 CODE: 989 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843 991
844void 992void
845size (CFClient::Layout self) 993size (CFPlus::Layout self)
846 PPCODE: 994 PPCODE:
847{ 995{
848 int w, h; 996 int w, h;
849 997
850 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
853 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
855} 1003}
856 1004
857int 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
858xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
859 CODE: 1019 CODE:
860{ 1020{
861 int index, trailing; 1021 int index, trailing;
862 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);
863 RETVAL = index; 1023 RETVAL = index;
864} 1024}
865 OUTPUT: 1025 OUTPUT:
866 RETVAL 1026 RETVAL
867 1027
868void 1028void
869cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
870 PPCODE: 1030 PPCODE:
871{ 1031{
872 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
873 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874 1034
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1039}
880 1040
881void 1041void
882render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
883 PPCODE: 1043 PPCODE:
884{ 1044 pango_opengl_render_layout_subpixel (
885 SV *retval; 1045 self->pl,
886 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
887 1050
888 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
889 1052
890 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)
891 { 1061 {
892 cairo_surface_t *surface; 1062 int nw = minpot (ow);
893 cairo_t *cairo; 1063 int nh = minpot (oh);
894 1064
895 retval = newSV (w * h * 4); 1065 if (nw != ow || nh != oh)
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 { 1066 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1068 {
918 uint32_t rgba = *p; 1069 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
920#if 0 1071 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927 1073
928 rgba = (rgba & 0xffffff00) | a; 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_);
929 } 1082 }
930#endif 1083
931#endif 1084 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1085 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1086 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 } 1087 }
944 else
945 {
946 FT_Bitmap bitmap;
947
948 retval = newSV (w * h);
949 SvPOK_only (retval);
950 SvCUR_set (retval, w * h);
951
952 bitmap.rows = h;
953 bitmap.width = w;
954 bitmap.pitch = w;
955 bitmap.buffer = (unsigned char*)SvPVX (retval);
956 bitmap.num_grays = 256;
957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959 memset (bitmap.buffer, 0, w * h);
960
961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963 EXTEND (SP, 5);
964 PUSHs (sv_2mortal (newSViv (w)));
965 PUSHs (sv_2mortal (newSViv (h)));
966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
970} 1088}
971 1089
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1090void
975draw_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.)
976 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
977 ALIAS: 1093 ALIAS:
978 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
980 CODE: 1096 CODE:
981{ 1097{
982 HV *hv = (HV *)SvRV (self); 1098 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1099 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1100 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1101 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1102
988 if (items < 5) 1103 if (items < 5)
989 { 1104 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1105 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1106 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1107 }
993 1108
994 if (ix) 1109 if (ix)
995 { 1110 {
996 glEnable (GL_BLEND); 1111 glEnable (GL_BLEND);
1112
1113 if (ix == 2)
997 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
998 glEnable (GL_ALPHA_TEST); 1119 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1120 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1121 }
1001 1122
1002 glBindTexture (GL_TEXTURE_2D, name); 1123 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1124
1010 glBegin (GL_QUADS); 1125 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1126 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1127 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1128 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1019 glDisable (GL_ALPHA_TEST); 1134 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1021 } 1136 }
1022} 1137}
1023 1138
1024MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
1025 1140
1026CFClient::Map 1141CFPlus::Map
1027new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
1028 CODE: 1143 CODE:
1029 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
1030 RETVAL->x = 0; 1145 RETVAL->x = 0;
1031 RETVAL->y = 0; 1146 RETVAL->y = 0;
1041 RETVAL->row = 0; 1156 RETVAL->row = 0;
1042 OUTPUT: 1157 OUTPUT:
1043 RETVAL 1158 RETVAL
1044 1159
1045void 1160void
1046DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
1047 CODE: 1162 CODE:
1048{ 1163{
1049 map_clear (self); 1164 map_clear (self);
1050 Safefree (self->face); 1165 Safefree (self->face);
1166 Safefree (self->tex);
1051 Safefree (self); 1167 Safefree (self);
1052} 1168}
1053 1169
1054void 1170void
1055clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1056 CODE: 1172 CODE:
1057 map_clear (self); 1173 map_clear (self);
1058 1174
1059void 1175void
1060set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1061 CODE: 1177 CODE:
1062{ 1178{
1063 while (self->faces <= face) 1179 while (self->faces <= face)
1064 { 1180 {
1065 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
1068 1184
1069 self->face [face] = texid; 1185 self->face [face] = texid;
1070} 1186}
1071 1187
1072void 1188void
1073set_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)
1074 CODE: 1190 CODE:
1075{ 1191{
1076 while (self->texs <= texid) 1192 while (self->texs <= texid)
1077 { 1193 {
1078 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1090 tex->r = r; 1206 tex->r = r;
1091 tex->g = g; 1207 tex->g = g;
1092 tex->b = b; 1208 tex->b = b;
1093 tex->a = a; 1209 tex->a = a;
1094 } 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);
1095} 1220}
1096 1221
1097int 1222int
1098ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1099 ALIAS: 1224 ALIAS:
1100 oy = 1 1225 oy = 1
1226 x = 2
1227 y = 3
1228 w = 4
1229 h = 5
1101 CODE: 1230 CODE:
1102 switch (ix) 1231 switch (ix)
1103 { 1232 {
1104 case 0: RETVAL = self->ox; break; 1233 case 0: RETVAL = self->ox; break;
1105 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;
1106 } 1239 }
1107 OUTPUT: 1240 OUTPUT:
1108 RETVAL 1241 RETVAL
1109 1242
1110void 1243void
1111scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1112 CODE: 1245 CODE:
1113{ 1246{
1114 if (dx > 0) 1247 if (dx > 0)
1115 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1116 else if (dx < 0) 1249 else if (dx < 0)
1132 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1133 } 1266 }
1134} 1267}
1135 1268
1136void 1269void
1137map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1138 CODE: 1271 CODE:
1139{ 1272{
1140 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1141 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1142 mapcell *cell; 1275 mapcell *cell;
1144 1277
1145 while (data < data_end) 1278 while (data < data_end)
1146 { 1279 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1148 1281
1149 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1151 1284
1152 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1153 1286
1154 if (flags & 15) 1287 if (flags & 15)
1155 { 1288 {
1156 if (cell->darkness < 0) 1289 if (!cell->darkness)
1157 { 1290 {
1158 cell->darkness = 0; 1291 cell->darkness = 256;
1159 cell->face [0] = 0; 1292 cell->face [0] = 0;
1160 cell->face [1] = 0; 1293 cell->face [1] = 0;
1161 cell->face [2] = 0; 1294 cell->face [2] = 0;
1162 } 1295 }
1163 1296
1164 cell->darkness = flags & 8 ? *data++ : 255;
1165
1166 //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 (ext < 4)
1311 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health
1313 cell->stat_hp = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1;
1316 }
1317 while (cmd & 0x80);
1318 }
1319 else
1320 cell->darkness = *data++ + 1;
1321 }
1167 1322
1168 if (flags & 4) 1323 if (flags & 4)
1169 { 1324 {
1170 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1325 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1171 } 1326 }
1179 { 1334 {
1180 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1335 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181 } 1336 }
1182 } 1337 }
1183 else 1338 else
1339 {
1184 cell->darkness = -1; 1340 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1185 } 1343 }
1186} 1344}
1187 1345
1188SV * 1346SV *
1189mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190 CODE: 1348 CODE:
1191{ 1349{
1192 int x1, x; 1350 int x1, x;
1193 int y1, y; 1351 int y1, y;
1194 int z; 1352 int z;
1244} 1402}
1245 OUTPUT: 1403 OUTPUT:
1246 RETVAL 1404 RETVAL
1247 1405
1248void 1406void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1407draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1408 CODE:
1251{ 1409{
1252 int vx, vy; 1410 int vx, vy;
1253 int x, y, z; 1411 int x, y, z;
1254 int last_name; 1412 int last_name;
1255 mapface face; 1413 mapface face;
1256 int sw4 = (sw + 3) & ~3;
1257 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1258 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1259 1414
1260 memset (darkness, 255, sw4 * sh);
1261 SvPOK_only (darkness_sv);
1262 SvCUR_set (darkness_sv, sw4 * sh);
1263
1264 vx = self->x + (self->w - sw) / 2 - shift_x; 1415 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1416 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1417
1267 /* 1418 /*
1268 int vx = self->vx = self->w >= sw 1419 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1420 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1421 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1425 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1426 */
1276 1427
1277 glColor4ub (255, 255, 255, 255); 1428 glColor4ub (255, 255, 255, 255);
1278 1429
1430 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1431 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1432 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1433 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1434
1284 glBegin (GL_QUADS); 1435 glBegin (GL_QUADS);
1285 1436
1294 for (x = 0; x < sw; x++) 1445 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1446 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1447 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1448 mapcell *cell = row->col + (x + vx - row->c0);
1298 1449
1299 darkness[y * sw4 + x] = cell->darkness < 0
1300 ? 255 - FOW_DARKNESS
1301 : 255 - cell->darkness;
1302
1303 face = cell->face [z]; 1450 face = cell->face [z];
1304 1451
1305 if (face) 1452 if (face && face < self->texs)
1306 { 1453 {
1307 maptex tex = self->tex [face]; 1454 maptex tex = self->tex [face];
1308 1455
1309 int px = (x + 1) * 32 - tex.w; 1456 int px = (x + 1) * 32 - tex.w;
1310 int py = (y + 1) * 32 - tex.h; 1457 int py = (y + 1) * 32 - tex.h;
1328 glEnd (); 1475 glEnd ();
1329 1476
1330 glDisable (GL_TEXTURE_2D); 1477 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1478 glDisable (GL_BLEND);
1332 1479
1480 // top layer: overlays such as the health bar
1481 for (y = 0; y < sh; y++)
1482 if (0 <= y + vy && y + vy < self->rows)
1483 {
1484 maprow *row = self->row + (y + vy);
1485
1486 for (x = 0; x < sw; x++)
1487 if (row->c0 <= x + vx && x + vx < row->c1)
1488 {
1489 mapcell *cell = row->col + (x + vx - row->c0);
1490
1491 int px = x * 32;
1492 int py = y * 32;
1493
1494 if (cell->stat_hp)
1495 {
1496 int width = sh / 28 + 1;
1497
1498 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2);
1500
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1502 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
1503 }
1504 }
1505 }
1506}
1507
1508void
1509draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1510 CODE:
1511{
1512 static float color[16][3] = {
1513 { 0.00F, 0.00F, 0.00F },
1514 { 1.00F, 1.00F, 1.00F },
1515 { 0.00F, 0.00F, 0.55F },
1516 { 1.00F, 0.00F, 0.00F },
1517
1518 { 1.00F, 0.54F, 0.00F },
1519 { 0.11F, 0.56F, 1.00F },
1520 { 0.93F, 0.46F, 0.00F },
1521 { 0.18F, 0.54F, 0.34F },
1522
1523 { 0.56F, 0.73F, 0.56F },
1524 { 0.80F, 0.80F, 0.80F },
1525 { 0.55F, 0.41F, 0.13F },
1526 { 0.99F, 0.77F, 0.26F },
1527
1528 { 0.74F, 0.65F, 0.41F },
1529
1530 { 0.00F, 1.00F, 1.00F },
1531 { 1.00F, 0.00F, 1.00F },
1532 { 1.00F, 1.00F, 0.00F },
1533 };
1534
1535 int x, y;
1536
1537 glEnable (GL_TEXTURE_2D);
1538 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1539 glEnable (GL_BLEND);
1540 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1541 glBegin (GL_QUADS);
1542
1543 for (y = 0; y < h; y++)
1544 for (x = 0; x < w; x++)
1545 {
1546 unsigned char m = data [x + y * w];
1547
1548 if (m)
1549 {
1550 float *c = color [m & 15];
1551
1552 float tx1 = m & 0x40 ? 0.5 : 0.;
1553 float tx2 = tx1 + 0.5;
1554
1555 glColor4f (c[0], c[1], c[2], 0.75);
1556 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1557 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1558 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1559 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1560 }
1561 }
1562
1563 glEnd ();
1564 glDisable (GL_BLEND);
1565 glDisable (GL_TEXTURE_2D);
1566}
1567
1568void
1569fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1570 PPCODE:
1571{
1572 int vx, vy;
1573 int x, y;
1574 int sw4 = (sw + 3) & ~3;
1575 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1576 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1577
1578 memset (darkness, 255, sw4 * sh);
1579 SvPOK_only (darkness_sv);
1580 SvCUR_set (darkness_sv, sw4 * sh);
1581
1582 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1583 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1584
1585 for (y = 0; y < sh; y++)
1586 if (0 <= y + vy && y + vy < self->rows)
1587 {
1588 maprow *row = self->row + (y + vy);
1589
1590 for (x = 0; x < sw; x++)
1591 if (row->c0 <= x + vx && x + vx < row->c1)
1592 {
1593 mapcell *cell = row->col + (x + vx - row->c0);
1594
1595 darkness[y * sw4 + x] = cell->darkness
1596 ? 255 - (cell->darkness - 1)
1597 : 255 - FOW_DARKNESS;
1598 }
1599 }
1600
1333 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1602 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1603 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1604 PUSHs (darkness_sv);
1337} 1605}
1338 1606
1339SV * 1607SV *
1340get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1608get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341 CODE: 1609 CODE:
1342{ 1610{
1343 int x, y, x1, y1; 1611 int x, y, x1, y1;
1344 SV *data_sv = newSV (w * h * 7 + 5); 1612 SV *data_sv = newSV (w * h * 7 + 5);
1345 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1613 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1407} 1675}
1408 OUTPUT: 1676 OUTPUT:
1409 RETVAL 1677 RETVAL
1410 1678
1411void 1679void
1412set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1680set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413 PPCODE: 1681 PPCODE:
1414{ 1682{
1415 int x, y, z; 1683 int x, y, z;
1416 int w, h; 1684 int w, h;
1417 int x1, y1; 1685 int x1, y1;
1449 1717
1450 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1718 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1451 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1719 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1452 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1720 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1453 1721
1454 if (cell->darkness <= 0) 1722 if (cell->darkness == 0)
1455 { 1723 {
1456 cell->darkness = -1; 1724 cell->darkness = 0;
1457 1725
1458 for (z = 0; z <= 2; z++) 1726 for (z = 0; z <= 2; z++)
1459 { 1727 {
1460 cell->face[z] = face[z]; 1728 cell->face[z] = face[z];
1461 1729
1466 } 1734 }
1467 } 1735 }
1468 } 1736 }
1469} 1737}
1470 1738
1471MODULE = CFClient PACKAGE = CFClient::MixChunk 1739MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472 1740
1473CFClient::MixChunk 1741CFPlus::MixChunk
1474new_from_file (SV *class, char *path) 1742new_from_file (SV *class, char *path)
1475 CODE: 1743 CODE:
1476 RETVAL = Mix_LoadWAV (path); 1744 RETVAL = Mix_LoadWAV (path);
1477 OUTPUT: 1745 OUTPUT:
1478 RETVAL 1746 RETVAL
1479 1747
1480void 1748void
1481DESTROY (CFClient::MixChunk self) 1749DESTROY (CFPlus::MixChunk self)
1482 CODE: 1750 CODE:
1483 Mix_FreeChunk (self); 1751 Mix_FreeChunk (self);
1484 1752
1485int 1753int
1486volume (CFClient::MixChunk self, int volume = -1) 1754volume (CFPlus::MixChunk self, int volume = -1)
1487 CODE: 1755 CODE:
1488 RETVAL = Mix_VolumeChunk (self, volume); 1756 RETVAL = Mix_VolumeChunk (self, volume);
1489 OUTPUT: 1757 OUTPUT:
1490 RETVAL 1758 RETVAL
1491 1759
1492int 1760int
1493play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1761play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494 CODE: 1762 CODE:
1495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1763 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496 OUTPUT: 1764 OUTPUT:
1497 RETVAL 1765 RETVAL
1498 1766
1499MODULE = CFClient PACKAGE = CFClient::MixMusic 1767MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500 1768
1501int 1769int
1502volume (int volume = -1) 1770volume (int volume = -1)
1503 CODE: 1771 CODE:
1504 RETVAL = Mix_VolumeMusic (volume); 1772 RETVAL = Mix_VolumeMusic (volume);
1505 OUTPUT: 1773 OUTPUT:
1506 RETVAL 1774 RETVAL
1507 1775
1508CFClient::MixMusic 1776CFPlus::MixMusic
1509new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1510 CODE: 1778 CODE:
1511 RETVAL = Mix_LoadMUS (path); 1779 RETVAL = Mix_LoadMUS (path);
1512 OUTPUT: 1780 OUTPUT:
1513 RETVAL 1781 RETVAL
1514 1782
1515void 1783void
1516DESTROY (CFClient::MixMusic self) 1784DESTROY (CFPlus::MixMusic self)
1517 CODE: 1785 CODE:
1518 Mix_FreeMusic (self); 1786 Mix_FreeMusic (self);
1519 1787
1520int 1788int
1521play (CFClient::MixMusic self, int loops = -1) 1789play (CFPlus::MixMusic self, int loops = -1)
1522 CODE: 1790 CODE:
1523 RETVAL = Mix_PlayMusic (self, loops); 1791 RETVAL = Mix_PlayMusic (self, loops);
1524 OUTPUT: 1792 OUTPUT:
1525 RETVAL 1793 RETVAL
1526 1794
1527MODULE = CFClient PACKAGE = CFClient::OpenGL 1795MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528 1796
1529BOOT: 1797BOOT:
1530{ 1798{
1531 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1799 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532 static const struct { 1800 static const struct {
1533 const char *name; 1801 const char *name;
1534 IV iv; 1802 IV iv;
1535 } *civ, const_iv[] = { 1803 } *civ, const_iv[] = {
1536# define const_iv(name) { # name, (IV)name } 1804# define const_iv(name) { # name, (IV)name }
1543 const_iv (GL_SCISSOR_TEST), 1811 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1812 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1813 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1814 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1815 const_iv (GL_RESCALE_NORMAL),
1816 const_iv (GL_FRONT),
1817 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1818 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1819 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1820 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1821 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1822 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1823 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1824 const_iv (GL_ONE_MINUS_DST_ALPHA),
1825 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1826 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1827 const_iv (GL_RGBA),
1828 const_iv (GL_RGBA4),
1829 const_iv (GL_RGBA8),
1830 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1831 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1832 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1833 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1834 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1835 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1844 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1845 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1846 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1847 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1848 const_iv (GL_TEXTURE_WRAP_T),
1849 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1850 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1851 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1852 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1853 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1854 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1855 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1856 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1592 const_iv (GL_SEPARABLE_2D), 1867 const_iv (GL_SEPARABLE_2D),
1593 const_iv (GL_CONVOLUTION_2D), 1868 const_iv (GL_CONVOLUTION_2D),
1594 const_iv (GL_CONVOLUTION_BORDER_MODE), 1869 const_iv (GL_CONVOLUTION_BORDER_MODE),
1595 const_iv (GL_CONSTANT_BORDER), 1870 const_iv (GL_CONSTANT_BORDER),
1596 const_iv (GL_LINES), 1871 const_iv (GL_LINES),
1872 const_iv (GL_LINE_STRIP),
1597 const_iv (GL_LINE_LOOP), 1873 const_iv (GL_LINE_LOOP),
1598 const_iv (GL_QUADS), 1874 const_iv (GL_QUADS),
1599 const_iv (GL_QUAD_STRIP), 1875 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES), 1876 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP), 1877 const_iv (GL_TRIANGLE_STRIP),
1611 1887
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1888 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1890}
1615 1891
1892char *
1893gl_vendor ()
1894 CODE:
1895 RETVAL = (char *)glGetString (GL_VENDOR);
1896 OUTPUT:
1897 RETVAL
1898
1899char *
1900gl_version ()
1901 CODE:
1902 RETVAL = (char *)glGetString (GL_VERSION);
1903 OUTPUT:
1904 RETVAL
1905
1906char *
1907gl_extensions ()
1908 CODE:
1909 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1910 OUTPUT:
1911 RETVAL
1912
1616int glGetError () 1913int glGetError ()
1914
1915void glFinish ()
1617 1916
1618void glClear (int mask) 1917void glClear (int mask)
1619 1918
1620void glClearColor (float r, float g, float b, float a = 1.0) 1919void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1920 PROTOTYPE: @
1628 1927
1629void glHint (int target, int mode) 1928void glHint (int target, int mode)
1630 1929
1631void glBlendFunc (int sfactor, int dfactor) 1930void glBlendFunc (int sfactor, int dfactor)
1632 1931
1932void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1933 CODE:
1934 gl_BlendFuncSeparate (sa, da, saa, daa);
1935
1633void glDepthMask (int flag) 1936void glDepthMask (int flag)
1634 1937
1635void glLogicOp (int opcode) 1938void glLogicOp (int opcode)
1636 1939
1637void glColorMask (int red, int green, int blue, int alpha) 1940void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1944void glPushMatrix ()
1642 1945
1643void glPopMatrix () 1946void glPopMatrix ()
1644 1947
1645void glLoadIdentity () 1948void glLoadIdentity ()
1949
1950void glDrawBuffer (int buffer)
1951
1952void glReadBuffer (int buffer)
1646 1953
1647# near_ and far_ are due to microsofts buggy "c" compiler 1954# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1955void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1956
1650# near_ and far_ are due to microsofts buggy "c" compiler 1957# near_ and far_ are due to microsofts buggy "c" compiler
1670 1977
1671void glEnd () 1978void glEnd ()
1672 1979
1673void glColor (float r, float g, float b, float a = 1.0) 1980void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1981 PROTOTYPE: @
1982 ALIAS:
1983 glColor_premultiply = 1
1675 CODE: 1984 CODE:
1985 if (ix)
1986 {
1987 r *= a;
1988 g *= a;
1989 b *= a;
1990 }
1676 // microsoft visual "c" rounds instead of truncating... 1991 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1992 glColor4f (r, g, b, a);
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681 1993
1682void glInterleavedArrays (int format, int stride, char *data) 1994void glInterleavedArrays (int format, int stride, char *data)
1683 1995
1684void glDrawElements (int mode, int count, int type, char *indices) 1996void glDrawElements (int mode, int count, int type, char *indices)
1685 1997
1708 2020
1709void glBindTexture (int target, int name) 2021void glBindTexture (int target, int name)
1710 2022
1711void glConvolutionParameter (int target, int pname, float params) 2023void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 2024 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2025 if (gl.ConvolutionParameterf)
2026 gl.ConvolutionParameterf (target, pname, params);
1714 2027
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2028void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 2029 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2030 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 2031 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 2032
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2033void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 2034 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2035 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 2036 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 2037
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2038void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 2039
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2040void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 2041
1761 2074
1762void glEndList () 2075void glEndList ()
1763 2076
1764void glCallList (int list) 2077void glCallList (int list)
1765 2078
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines