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.86 by root, Fri May 19 16:43:56 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
441 SDL_Rect **m; 513 SDL_Rect **m;
442 514
443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16); 518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 519
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 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);
470 546
471 ++m; 547 ++m;
472 } 548 }
473} 549}
474 550
551char *
552SDL_GetError ()
553
475int 554int
476SDL_SetVideoMode (int w, int h, int fullscreen) 555SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 556 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 557 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 559 );
560 if (RETVAL)
561 {
481 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 }
482 OUTPUT: 567 OUTPUT:
483 RETVAL 568 RETVAL
484 569
485void 570void
486SDL_GL_SwapBuffers () 571SDL_GL_SwapBuffers ()
572
573char *
574SDL_GetKeyName (int sym)
487 575
488void 576void
489SDL_PollEvent () 577SDL_PollEvent ()
490 PPCODE: 578 PPCODE:
491{ 579{
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 600 break;
513 601
514 case SDL_MOUSEMOTION: 602 case SDL_MOUSEMOTION:
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 610 break;
521 611
522 case SDL_MOUSEBUTTONDOWN: 612 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 613 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
615
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 616 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 617 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 618 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 619 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 620 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 626 break;
535 } 627 }
536 628
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538 } 630 }
539} 631}
540 632
541int 633int
542Mix_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)
555 CODE: 647 CODE:
556#ifndef _WIN32 648#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 650#endif
559 651
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573
574void 652void
575add_font (char *file) 653add_font (char *file)
576 CODE: 654 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 656
583void 657void
584load_image_inline (SV *image_) 658load_image_inline (SV *image_)
585 ALIAS: 659 ALIAS:
586 load_image_file = 1 660 load_image_file = 1
628 702
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 704
631 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
632 706
707 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 708 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 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)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
642 716
643 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
645} 719}
646 720
682 CODE: 756 CODE:
683 fprintf (stderr, "FATAL: %s\n", message); 757 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 758#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#endif 760#endif
687 exit (1); 761 _exit (1);
688 762
763void
764_exit (int retval)
765 CODE:
766 _exit (retval);
767
689MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
690 769
691CFClient::Font 770CFPlus::Font
692new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
693 CODE: 772 CODE:
694{ 773{
695 int count; 774 int count;
696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
699} 778}
700 OUTPUT: 779 OUTPUT:
701 RETVAL 780 RETVAL
702 781
703void 782void
704DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
705 CODE: 784 CODE:
706 pango_font_description_free (self); 785 pango_font_description_free (self);
707 786
708void 787void
709make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
710 CODE: 789 CODE:
711 default_font = self; 790 default_font = self;
712 791
713MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
714 793
715CFClient::Layout 794void
716new (SV *class, int rgba = 0) 795reset_glyph_cache ()
796 CODE:
797 tc_clear ();
798
799CFPlus::Layout
800new (SV *class)
717 CODE: 801 CODE:
718 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
719 803
720 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
721 RETVAL->rgba = rgba;
722 RETVAL->r = 1.; 805 RETVAL->r = 1.;
723 RETVAL->g = 1.; 806 RETVAL->g = 1.;
724 RETVAL->b = 1.; 807 RETVAL->b = 1.;
725 RETVAL->a = 1.; 808 RETVAL->a = 1.;
726 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
730 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
731 OUTPUT: 814 OUTPUT:
732 RETVAL 815 RETVAL
733 816
734void 817void
735DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
736 CODE: 819 CODE:
737 g_object_unref (self->pl); 820 g_object_unref (self->pl);
738 Safefree (self); 821 Safefree (self);
739 822
740int
741is_rgba (CFClient::Layout self)
742 CODE:
743 RETVAL = self->rgba;
744 OUTPUT:
745 RETVAL
746
747void 823void
748set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
749 CODE: 825 CODE:
750{ 826{
751 STRLEN textlen; 827 STRLEN textlen;
752 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
753 829
754 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
755} 831}
756 832
757void 833void
758set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
759 CODE: 835 CODE:
760{ 836{
761 STRLEN textlen; 837 STRLEN textlen;
762 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
763 839
764 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
765} 841}
766 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
767SV * 928SV *
768get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
769 CODE: 930 CODE:
770 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771 SvUTF8_on (RETVAL); 932 sv_utf8_decode (RETVAL);
772 OUTPUT: 933 OUTPUT:
773 RETVAL 934 RETVAL
774 935
775void 936void
776set_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.)
777 CODE: 938 CODE:
778 self->r = r; 939 self->r = r;
779 self->g = g; 940 self->g = g;
780 self->b = b; 941 self->b = b;
781 self->a = a; 942 self->a = a;
782 943
783void 944void
784set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
785 CODE: 946 CODE:
786 if (self->font != font) 947 if (self->font != font)
787 { 948 {
788 self->font = font; 949 self->font = font;
789 layout_update_font (self); 950 layout_update_font (self);
790 } 951 }
791 952
792void 953void
793set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
794 CODE: 955 CODE:
795 if (self->base_height != base_height) 956 if (self->base_height != base_height)
796 { 957 {
797 self->base_height = base_height; 958 self->base_height = base_height;
798 layout_update_font (self); 959 layout_update_font (self);
799 } 960 }
800 961
801void 962void
802set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
803 CODE: 964 CODE:
804 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);
805 966
806void 967void
807set_indent (CFClient::Layout self, int indent) 968set_indent (CFPlus::Layout self, int indent)
808 CODE: 969 CODE:
809 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810 971
811void 972void
812set_spacing (CFClient::Layout self, int spacing) 973set_spacing (CFPlus::Layout self, int spacing)
813 CODE: 974 CODE:
814 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815 976
816void 977void
817set_ellipsise (CFClient::Layout self, int ellipsise) 978set_ellipsise (CFPlus::Layout self, int ellipsise)
818 CODE: 979 CODE:
819 pango_layout_set_ellipsize (self->pl, 980 pango_layout_set_ellipsize (self->pl,
820 ellipsise == 1 ? PANGO_ELLIPSIZE_START 981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
821 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
823 : PANGO_ELLIPSIZE_NONE 984 : PANGO_ELLIPSIZE_NONE
824 ); 985 );
825 986
826void 987void
827set_single_paragraph_mode (CFClient::Layout self, int spm) 988set_single_paragraph_mode (CFPlus::Layout self, int spm)
828 CODE: 989 CODE:
829 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
830 991
831void 992void
832size (CFClient::Layout self) 993size (CFPlus::Layout self)
833 PPCODE: 994 PPCODE:
834{ 995{
835 int w, h; 996 int w, h;
836 997
837 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
840 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
841 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
842} 1003}
843 1004
844int 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
845xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
846 CODE: 1019 CODE:
847{ 1020{
848 int index, trailing; 1021 int index, trailing;
849 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);
850 RETVAL = index; 1023 RETVAL = index;
851} 1024}
852 OUTPUT: 1025 OUTPUT:
853 RETVAL 1026 RETVAL
854 1027
855void 1028void
856cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
857 PPCODE: 1030 PPCODE:
858{ 1031{
859 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
860 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
861 1034
864 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
865 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
866} 1039}
867 1040
868void 1041void
869render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
870 PPCODE: 1043 PPCODE:
871{ 1044 pango_opengl_render_layout_subpixel (
872 SV *retval; 1045 self->pl,
873 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
874 1050
875 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
876 1052
877 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)
878 { 1061 {
879 cairo_surface_t *surface; 1062 int nw = minpot (ow);
880 cairo_t *cairo; 1063 int nh = minpot (oh);
881 1064
882 retval = newSV (w * h * 4); 1065 if (nw != ow || nh != oh)
883 SvPOK_only (retval);
884 SvCUR_set (retval, w * h * 4);
885
886 memset (SvPVX (retval), 0, w * h * 4);
887
888 surface = cairo_image_surface_create_for_data (
889 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
890 cairo = cairo_create (surface);
891 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893 pango_cairo_show_layout (cairo, self->pl);
894
895 cairo_destroy (cairo);
896 cairo_surface_destroy (surface);
897
898 // what a mess, and its premultiplied, too :(
899 { 1066 {
900 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
901 uint32_t *e = p + w * h;
902
903 while (p < e)
904 { 1068 {
905 uint32_t rgba = *p; 1069 STRLEN datalen;
906 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
907 rgba = SDL_SwapBE32 (rgba); 1071 int bpp = datalen / (ow * oh);
908 *p++ = rgba; 1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1073
1074 SvPOK_only (result_);
1075 SvCUR_set (result_, nw * nh * bpp);
1076
1077 memset (SvPVX (result_), 0, nw * nh * bpp);
1078 while (oh--)
1079 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1080
1081 sv_setsv (data_, result_);
909 } 1082 }
1083
1084 sv_setiv (w_, nw);
1085 sv_setiv (h_, nh);
910 } 1086 }
911
912 EXTEND (SP, 5);
913 PUSHs (sv_2mortal (newSViv (w)));
914 PUSHs (sv_2mortal (newSViv (h)));
915 PUSHs (sv_2mortal (retval));
916 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918 } 1087 }
919 else
920 {
921 FT_Bitmap bitmap;
922
923 retval = newSV (w * h);
924 SvPOK_only (retval);
925 SvCUR_set (retval, w * h);
926
927 bitmap.rows = h;
928 bitmap.width = w;
929 bitmap.pitch = w;
930 bitmap.buffer = (unsigned char*)SvPVX (retval);
931 bitmap.num_grays = 256;
932 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
933
934 memset (bitmap.buffer, 0, w * h);
935
936 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
937
938 EXTEND (SP, 5);
939 PUSHs (sv_2mortal (newSViv (w)));
940 PUSHs (sv_2mortal (newSViv (h)));
941 PUSHs (sv_2mortal (retval));
942 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944 }
945} 1088}
946 1089
947MODULE = CFClient PACKAGE = CFClient::Texture
948
949void 1090void
950draw_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.)
951 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
952 ALIAS: 1093 ALIAS:
953 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
954 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
955 CODE: 1096 CODE:
956{ 1097{
957 HV *hv = (HV *)SvRV (self); 1098 HV *hv = (HV *)SvRV (self);
958 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1099 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1100 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1101 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962 1102
963 if (items < 5) 1103 if (items < 5)
964 { 1104 {
965 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1105 w = SvNV (*hv_fetch (hv, "w", 1, 1));
966 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1106 h = SvNV (*hv_fetch (hv, "h", 1, 1));
967 } 1107 }
968 1108
969 if (ix) 1109 if (ix)
970 { 1110 {
971 glEnable (GL_BLEND); 1111 glEnable (GL_BLEND);
1112
1113 if (ix == 2)
972 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
973 glEnable (GL_ALPHA_TEST); 1119 glEnable (GL_ALPHA_TEST);
974 glAlphaFunc (GL_GREATER, 0.01f); 1120 glAlphaFunc (GL_GREATER, 0.01f);
975 } 1121 }
976 1122
977 glBindTexture (GL_TEXTURE_2D, name); 1123 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1124
985 glBegin (GL_QUADS); 1125 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1126 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1127 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1128 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
994 glDisable (GL_ALPHA_TEST); 1134 glDisable (GL_ALPHA_TEST);
995 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
996 } 1136 }
997} 1137}
998 1138
999MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
1000 1140
1001CFClient::Map 1141CFPlus::Map
1002new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
1003 CODE: 1143 CODE:
1004 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
1005 RETVAL->x = 0; 1145 RETVAL->x = 0;
1006 RETVAL->y = 0; 1146 RETVAL->y = 0;
1016 RETVAL->row = 0; 1156 RETVAL->row = 0;
1017 OUTPUT: 1157 OUTPUT:
1018 RETVAL 1158 RETVAL
1019 1159
1020void 1160void
1021DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
1022 CODE: 1162 CODE:
1023{ 1163{
1024 map_clear (self); 1164 map_clear (self);
1025 Safefree (self->face); 1165 Safefree (self->face);
1166 Safefree (self->tex);
1026 Safefree (self); 1167 Safefree (self);
1027} 1168}
1028 1169
1029void 1170void
1030clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1031 CODE: 1172 CODE:
1032 map_clear (self); 1173 map_clear (self);
1033 1174
1034void 1175void
1035set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1036 CODE: 1177 CODE:
1037{ 1178{
1038 while (self->faces <= face) 1179 while (self->faces <= face)
1039 { 1180 {
1040 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
1043 1184
1044 self->face [face] = texid; 1185 self->face [face] = texid;
1045} 1186}
1046 1187
1047void 1188void
1048set_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)
1049 CODE: 1190 CODE:
1050{ 1191{
1051 while (self->texs <= texid) 1192 while (self->texs <= texid)
1052 { 1193 {
1053 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1065 tex->r = r; 1206 tex->r = r;
1066 tex->g = g; 1207 tex->g = g;
1067 tex->b = b; 1208 tex->b = b;
1068 tex->a = a; 1209 tex->a = a;
1069 } 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);
1070} 1220}
1071 1221
1072int 1222int
1073ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1074 ALIAS: 1224 ALIAS:
1075 oy = 1 1225 oy = 1
1226 x = 2
1227 y = 3
1228 w = 4
1229 h = 5
1076 CODE: 1230 CODE:
1077 switch (ix) 1231 switch (ix)
1078 { 1232 {
1079 case 0: RETVAL = self->ox; break; 1233 case 0: RETVAL = self->ox; break;
1080 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;
1081 } 1239 }
1082 OUTPUT: 1240 OUTPUT:
1083 RETVAL 1241 RETVAL
1084 1242
1085void 1243void
1086scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1087 CODE: 1245 CODE:
1088{ 1246{
1089 if (dx > 0) 1247 if (dx > 0)
1090 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1091 else if (dx < 0) 1249 else if (dx < 0)
1107 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1108 } 1266 }
1109} 1267}
1110 1268
1111void 1269void
1112map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1113 CODE: 1271 CODE:
1114{ 1272{
1115 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1116 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1117 mapcell *cell; 1275 mapcell *cell;
1119 1277
1120 while (data < data_end) 1278 while (data < data_end)
1121 { 1279 {
1122 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1123 1281
1124 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1125 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1126 1284
1127 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1128 1286
1129 if (flags & 15) 1287 if (flags & 15)
1130 { 1288 {
1131 if (cell->darkness < 0) 1289 if (!cell->darkness)
1132 { 1290 {
1133 cell->darkness = 0; 1291 cell->darkness = 256;
1134 cell->face [0] = 0; 1292 cell->face [0] = 0;
1135 cell->face [1] = 0; 1293 cell->face [1] = 0;
1136 cell->face [2] = 0; 1294 cell->face [2] = 0;
1137 } 1295 }
1138 1296
1139 cell->darkness = flags & 8 ? *data++ : 255;
1140
1141 //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 }
1142 1322
1143 if (flags & 4) 1323 if (flags & 4)
1144 { 1324 {
1145 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;
1146 } 1326 }
1154 { 1334 {
1155 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;
1156 } 1336 }
1157 } 1337 }
1158 else 1338 else
1339 {
1159 cell->darkness = -1; 1340 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1160 } 1343 }
1161} 1344}
1162 1345
1163SV * 1346SV *
1164mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1165 CODE: 1348 CODE:
1166{ 1349{
1167 int x1, x; 1350 int x1, x;
1168 int y1, y; 1351 int y1, y;
1169 int z; 1352 int z;
1219} 1402}
1220 OUTPUT: 1403 OUTPUT:
1221 RETVAL 1404 RETVAL
1222 1405
1223void 1406void
1224draw (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)
1225 PPCODE: 1408 CODE:
1226{ 1409{
1227 int vx, vy; 1410 int vx, vy;
1228 int x, y, z; 1411 int x, y, z;
1229 int last_name; 1412 int last_name;
1230 mapface face; 1413 mapface face;
1231 int sw4 = (sw + 3) & ~3;
1232 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1233 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1234 1414
1235 memset (darkness, 255, sw4 * sh);
1236 SvPOK_only (darkness_sv);
1237 SvCUR_set (darkness_sv, sw4 * sh);
1238
1239 vx = self->x + (self->w - sw) / 2 - shift_x; 1415 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1240 vy = self->y + (self->h - sh) / 2 - shift_y; 1416 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1241 1417
1242 /* 1418 /*
1243 int vx = self->vx = self->w >= sw 1419 int vx = self->vx = self->w >= sw
1244 ? self->x + (self->w - sw) / 2 1420 ? self->x + (self->w - sw) / 2
1245 : 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));
1249 : 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));
1250 */ 1426 */
1251 1427
1252 glColor4ub (255, 255, 255, 255); 1428 glColor4ub (255, 255, 255, 255);
1253 1429
1430 glEnable (GL_BLEND);
1254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1431 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1255 glEnable (GL_BLEND);
1256 glEnable (GL_TEXTURE_2D); 1432 glEnable (GL_TEXTURE_2D);
1257 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1433 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1258 1434
1259 glBegin (GL_QUADS); 1435 glBegin (GL_QUADS);
1260 1436
1269 for (x = 0; x < sw; x++) 1445 for (x = 0; x < sw; x++)
1270 if (row->c0 <= x + vx && x + vx < row->c1) 1446 if (row->c0 <= x + vx && x + vx < row->c1)
1271 { 1447 {
1272 mapcell *cell = row->col + (x + vx - row->c0); 1448 mapcell *cell = row->col + (x + vx - row->c0);
1273 1449
1274 darkness[y * sw4 + x] = cell->darkness < 0
1275 ? 255 - FOW_DARKNESS
1276 : 255 - cell->darkness;
1277
1278 face = cell->face [z]; 1450 face = cell->face [z];
1279 1451
1280 if (face) 1452 if (face && face < self->texs)
1281 { 1453 {
1282 maptex tex = self->tex [face]; 1454 maptex tex = self->tex [face];
1283 1455
1284 int px = (x + 1) * 32 - tex.w; 1456 int px = (x + 1) * 32 - tex.w;
1285 int py = (y + 1) * 32 - tex.h; 1457 int py = (y + 1) * 32 - tex.h;
1303 glEnd (); 1475 glEnd ();
1304 1476
1305 glDisable (GL_TEXTURE_2D); 1477 glDisable (GL_TEXTURE_2D);
1306 glDisable (GL_BLEND); 1478 glDisable (GL_BLEND);
1307 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
1308 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1309 PUSHs (sv_2mortal (newSViv (sw4))); 1602 PUSHs (sv_2mortal (newSViv (sw4)));
1310 PUSHs (sv_2mortal (newSViv (sh))); 1603 PUSHs (sv_2mortal (newSViv (sh)));
1311 PUSHs (darkness_sv); 1604 PUSHs (darkness_sv);
1312} 1605}
1313 1606
1314SV * 1607SV *
1315get_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)
1316 CODE: 1609 CODE:
1317{ 1610{
1318 int x, y, x1, y1; 1611 int x, y, x1, y1;
1319 SV *data_sv = newSV (w * h * 7 + 5); 1612 SV *data_sv = newSV (w * h * 7 + 5);
1320 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1613 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1382} 1675}
1383 OUTPUT: 1676 OUTPUT:
1384 RETVAL 1677 RETVAL
1385 1678
1386void 1679void
1387set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1680set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1388 PPCODE: 1681 PPCODE:
1389{ 1682{
1390 int x, y, z; 1683 int x, y, z;
1391 int w, h; 1684 int w, h;
1392 int x1, y1; 1685 int x1, y1;
1424 1717
1425 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1718 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1426 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1719 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1427 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1720 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1428 1721
1429 if (cell->darkness <= 0) 1722 if (cell->darkness == 0)
1430 { 1723 {
1431 cell->darkness = -1; 1724 cell->darkness = 0;
1432 1725
1433 for (z = 0; z <= 2; z++) 1726 for (z = 0; z <= 2; z++)
1434 { 1727 {
1435 cell->face[z] = face[z]; 1728 cell->face[z] = face[z];
1436 1729
1441 } 1734 }
1442 } 1735 }
1443 } 1736 }
1444} 1737}
1445 1738
1446MODULE = CFClient PACKAGE = CFClient::MixChunk 1739MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1447 1740
1448CFClient::MixChunk 1741CFPlus::MixChunk
1449new_from_file (SV *class, char *path) 1742new_from_file (SV *class, char *path)
1450 CODE: 1743 CODE:
1451 RETVAL = Mix_LoadWAV (path); 1744 RETVAL = Mix_LoadWAV (path);
1452 OUTPUT: 1745 OUTPUT:
1453 RETVAL 1746 RETVAL
1454 1747
1455void 1748void
1456DESTROY (CFClient::MixChunk self) 1749DESTROY (CFPlus::MixChunk self)
1457 CODE: 1750 CODE:
1458 Mix_FreeChunk (self); 1751 Mix_FreeChunk (self);
1459 1752
1460int 1753int
1461volume (CFClient::MixChunk self, int volume = -1) 1754volume (CFPlus::MixChunk self, int volume = -1)
1462 CODE: 1755 CODE:
1463 RETVAL = Mix_VolumeChunk (self, volume); 1756 RETVAL = Mix_VolumeChunk (self, volume);
1464 OUTPUT: 1757 OUTPUT:
1465 RETVAL 1758 RETVAL
1466 1759
1467int 1760int
1468play (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)
1469 CODE: 1762 CODE:
1470 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1763 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1471 OUTPUT: 1764 OUTPUT:
1472 RETVAL 1765 RETVAL
1473 1766
1474MODULE = CFClient PACKAGE = CFClient::MixMusic 1767MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1475 1768
1476int 1769int
1477volume (int volume = -1) 1770volume (int volume = -1)
1478 CODE: 1771 CODE:
1479 RETVAL = Mix_VolumeMusic (volume); 1772 RETVAL = Mix_VolumeMusic (volume);
1480 OUTPUT: 1773 OUTPUT:
1481 RETVAL 1774 RETVAL
1482 1775
1483CFClient::MixMusic 1776CFPlus::MixMusic
1484new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1485 CODE: 1778 CODE:
1486 RETVAL = Mix_LoadMUS (path); 1779 RETVAL = Mix_LoadMUS (path);
1487 OUTPUT: 1780 OUTPUT:
1488 RETVAL 1781 RETVAL
1489 1782
1490void 1783void
1491DESTROY (CFClient::MixMusic self) 1784DESTROY (CFPlus::MixMusic self)
1492 CODE: 1785 CODE:
1493 Mix_FreeMusic (self); 1786 Mix_FreeMusic (self);
1494 1787
1495int 1788int
1496play (CFClient::MixMusic self, int loops = -1) 1789play (CFPlus::MixMusic self, int loops = -1)
1497 CODE: 1790 CODE:
1498 RETVAL = Mix_PlayMusic (self, loops); 1791 RETVAL = Mix_PlayMusic (self, loops);
1499 OUTPUT: 1792 OUTPUT:
1500 RETVAL 1793 RETVAL
1501 1794
1502MODULE = CFClient PACKAGE = CFClient::OpenGL 1795MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1503 1796
1504BOOT: 1797BOOT:
1505{ 1798{
1506 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1799 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1507 static const struct { 1800 static const struct {
1508 const char *name; 1801 const char *name;
1509 IV iv; 1802 IV iv;
1510 } *civ, const_iv[] = { 1803 } *civ, const_iv[] = {
1511# define const_iv(name) { # name, (IV)name } 1804# define const_iv(name) { # name, (IV)name }
1512 const_iv (GL_COLOR_MATERIAL), 1805 const_iv (GL_COLOR_MATERIAL),
1513 const_iv (GL_SMOOTH), 1806 const_iv (GL_SMOOTH),
1514 const_iv (GL_FLAT), 1807 const_iv (GL_FLAT),
1515 const_iv (GL_DITHER), 1808 const_iv (GL_DITHER),
1516 const_iv (GL_BLEND), 1809 const_iv (GL_BLEND),
1810 const_iv (GL_CULL_FACE),
1517 const_iv (GL_SCISSOR_TEST), 1811 const_iv (GL_SCISSOR_TEST),
1812 const_iv (GL_DEPTH_TEST),
1813 const_iv (GL_ALPHA_TEST),
1814 const_iv (GL_NORMALIZE),
1815 const_iv (GL_RESCALE_NORMAL),
1816 const_iv (GL_FRONT),
1817 const_iv (GL_BACK),
1518 const_iv (GL_AND), 1818 const_iv (GL_AND),
1519 const_iv (GL_ONE), 1819 const_iv (GL_ONE),
1520 const_iv (GL_ZERO), 1820 const_iv (GL_ZERO),
1521 const_iv (GL_SRC_ALPHA), 1821 const_iv (GL_SRC_ALPHA),
1522 const_iv (GL_SRC_ALPHA_SATURATE), 1822 const_iv (GL_DST_ALPHA),
1523 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1823 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524 const_iv (GL_ONE_MINUS_DST_ALPHA), 1824 const_iv (GL_ONE_MINUS_DST_ALPHA),
1825 const_iv (GL_SRC_ALPHA_SATURATE),
1525 const_iv (GL_RGB), 1826 const_iv (GL_RGB),
1526 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),
1527 const_iv (GL_UNSIGNED_BYTE), 1831 const_iv (GL_UNSIGNED_BYTE),
1832 const_iv (GL_UNSIGNED_SHORT),
1833 const_iv (GL_UNSIGNED_INT),
1528 const_iv (GL_ALPHA), 1834 const_iv (GL_ALPHA),
1529 const_iv (GL_INTENSITY), 1835 const_iv (GL_INTENSITY),
1530 const_iv (GL_LUMINANCE), 1836 const_iv (GL_LUMINANCE),
1531 const_iv (GL_LUMINANCE_ALPHA), 1837 const_iv (GL_LUMINANCE_ALPHA),
1532 const_iv (GL_FLOAT), 1838 const_iv (GL_FLOAT),
1538 const_iv (GL_TEXTURE_MAG_FILTER), 1844 const_iv (GL_TEXTURE_MAG_FILTER),
1539 const_iv (GL_TEXTURE_MIN_FILTER), 1845 const_iv (GL_TEXTURE_MIN_FILTER),
1540 const_iv (GL_TEXTURE_ENV_MODE), 1846 const_iv (GL_TEXTURE_ENV_MODE),
1541 const_iv (GL_TEXTURE_WRAP_S), 1847 const_iv (GL_TEXTURE_WRAP_S),
1542 const_iv (GL_TEXTURE_WRAP_T), 1848 const_iv (GL_TEXTURE_WRAP_T),
1849 const_iv (GL_REPEAT),
1543 const_iv (GL_CLAMP), 1850 const_iv (GL_CLAMP),
1544 const_iv (GL_REPEAT), 1851 const_iv (GL_CLAMP_TO_EDGE),
1545 const_iv (GL_NEAREST), 1852 const_iv (GL_NEAREST),
1546 const_iv (GL_LINEAR), 1853 const_iv (GL_LINEAR),
1547 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1854 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1855 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1856 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1857 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551 const_iv (GL_GENERATE_MIPMAP), 1858 const_iv (GL_GENERATE_MIPMAP),
1552 const_iv (GL_MODULATE), 1859 const_iv (GL_MODULATE),
1553 const_iv (GL_DECAL), 1860 const_iv (GL_DECAL),
1554 const_iv (GL_REPLACE), 1861 const_iv (GL_REPLACE),
1862 const_iv (GL_DEPTH_BUFFER_BIT),
1555 const_iv (GL_COLOR_BUFFER_BIT), 1863 const_iv (GL_COLOR_BUFFER_BIT),
1556 const_iv (GL_PROJECTION), 1864 const_iv (GL_PROJECTION),
1557 const_iv (GL_MODELVIEW), 1865 const_iv (GL_MODELVIEW),
1558 const_iv (GL_COLOR_LOGIC_OP), 1866 const_iv (GL_COLOR_LOGIC_OP),
1559 const_iv (GL_SEPARABLE_2D), 1867 const_iv (GL_SEPARABLE_2D),
1560 const_iv (GL_CONVOLUTION_2D), 1868 const_iv (GL_CONVOLUTION_2D),
1561 const_iv (GL_CONVOLUTION_BORDER_MODE), 1869 const_iv (GL_CONVOLUTION_BORDER_MODE),
1562 const_iv (GL_CONSTANT_BORDER), 1870 const_iv (GL_CONSTANT_BORDER),
1563 const_iv (GL_LINES), 1871 const_iv (GL_LINES),
1872 const_iv (GL_LINE_STRIP),
1873 const_iv (GL_LINE_LOOP),
1564 const_iv (GL_QUADS), 1874 const_iv (GL_QUADS),
1565 const_iv (GL_LINE_LOOP), 1875 const_iv (GL_QUAD_STRIP),
1876 const_iv (GL_TRIANGLES),
1877 const_iv (GL_TRIANGLE_STRIP),
1878 const_iv (GL_TRIANGLE_FAN),
1566 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1879 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567 const_iv (GL_FASTEST), 1880 const_iv (GL_FASTEST),
1881 const_iv (GL_V2F),
1882 const_iv (GL_V3F),
1883 const_iv (GL_T2F_V3F),
1884 const_iv (GL_T2F_N3F_V3F),
1568# undef const_iv 1885# undef const_iv
1569 }; 1886 };
1570 1887
1571 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; )
1572 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573} 1890}
1574 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
1575int glGetError () 1913int glGetError ()
1914
1915void glFinish ()
1576 1916
1577void glClear (int mask) 1917void glClear (int mask)
1578 1918
1579void glClearColor (float r, float g, float b, float a = 1.0) 1919void glClearColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1920 PROTOTYPE: @
1587 1927
1588void glHint (int target, int mode) 1928void glHint (int target, int mode)
1589 1929
1590void glBlendFunc (int sfactor, int dfactor) 1930void glBlendFunc (int sfactor, int dfactor)
1591 1931
1932void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1933 CODE:
1934 gl_BlendFuncSeparate (sa, da, saa, daa);
1935
1936void glDepthMask (int flag)
1937
1592void glLogicOp (int opcode) 1938void glLogicOp (int opcode)
1593 1939
1594void glColorMask (int red, int green, int blue, int alpha) 1940void glColorMask (int red, int green, int blue, int alpha)
1595 1941
1596void glMatrixMode (int mode) 1942void glMatrixMode (int mode)
1599 1945
1600void glPopMatrix () 1946void glPopMatrix ()
1601 1947
1602void glLoadIdentity () 1948void glLoadIdentity ()
1603 1949
1950void glDrawBuffer (int buffer)
1951
1952void glReadBuffer (int buffer)
1953
1604# near and far are due to microsofts buggy c compiler 1954# near_ and far_ are due to microsofts buggy "c" compiler
1955void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1956
1957# near_ and far_ are due to microsofts buggy "c" compiler
1605void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1958void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606 1959
1607void glViewport (int x, int y, int width, int height) 1960void glViewport (int x, int y, int width, int height)
1608 1961
1609void glScissor (int x, int y, int width, int height) 1962void glScissor (int x, int y, int width, int height)
1624 1977
1625void glEnd () 1978void glEnd ()
1626 1979
1627void glColor (float r, float g, float b, float a = 1.0) 1980void glColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1981 PROTOTYPE: @
1982 ALIAS:
1983 glColor_premultiply = 1
1629 CODE: 1984 CODE:
1630 glColor4ub (MIN ((int)(r * 255.f), 255), 1985 if (ix)
1631 MIN ((int)(g * 255.f), 255), 1986 {
1632 MIN ((int)(b * 255.f), 255), 1987 r *= a;
1633 MIN ((int)(a * 255.f), 255)); 1988 g *= a;
1989 b *= a;
1990 }
1991 // microsoft visual "c" rounds instead of truncating...
1992 glColor4f (r, g, b, a);
1993
1994void glInterleavedArrays (int format, int stride, char *data)
1995
1996void glDrawElements (int mode, int count, int type, char *indices)
1997
1998# 1.2 void glDrawRangeElements (int mode, int start, int end
1999
2000void glRasterPos (float x, float y, float z = 0.)
2001 CODE:
2002 glRasterPos3f (0, 0, z);
2003 glBitmap (0, 0, 0, 0, x, y, 0);
1634 2004
1635void glVertex (float x, float y, float z = 0.) 2005void glVertex (float x, float y, float z = 0.)
1636 CODE: 2006 CODE:
1637 glVertex3f (x, y, z); 2007 glVertex3f (x, y, z);
1638 2008
1650 2020
1651void glBindTexture (int target, int name) 2021void glBindTexture (int target, int name)
1652 2022
1653void glConvolutionParameter (int target, int pname, float params) 2023void glConvolutionParameter (int target, int pname, float params)
1654 CODE: 2024 CODE:
1655 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2025 if (gl.ConvolutionParameterf)
2026 gl.ConvolutionParameterf (target, pname, params);
1656 2027
1657void 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)
1658 CODE: 2029 CODE:
1659 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2030 if (gl.ConvolutionFilter2D)
1660 (target, internalformat, width, height, format, type, data)); 2031 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661 2032
1662void 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)
1663 CODE: 2034 CODE:
1664 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2035 if (gl.SeparableFilter2D)
1665 (target, internalformat, width, height, format, type, row, column)); 2036 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666 2037
1667void 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)
1668 2039
1669void 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)
1670 2041
1671void glRasterPos (int x, int y) 2042void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672 CODE:
1673 glRasterPos2i (x, y);
1674 2043
1675void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2044void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676 2045
1677int glGenTexture () 2046int glGenTexture ()
1678 CODE: 2047 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines