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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.148 by root, Sat Aug 19 03:57:25 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines