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.82 by root, Mon May 15 00:15:08 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#ifndef _WIN32 126#ifdef FC_HINT_STYLE
127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
128#endif
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif
92} 130}
93 131
94static void 132static void
95layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
96{ 134{
97 /* 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
98 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
99 */ 137 */
100 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
104 142
105 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
106} 144}
107 145
108static void 146static void
109layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
110{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
111 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
112 153
113 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
114 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
115 156
116 *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;
117} 162}
118 163
119typedef uint16_t mapface; 164typedef uint16_t mapface;
120 165
121typedef struct { 166typedef struct {
124 float s, t; 169 float s, t;
125 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
126} maptex; 171} maptex;
127 172
128typedef struct { 173typedef struct {
129 int16_t darkness; 174 uint16_t darkness;
130 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
131} mapcell; 177} mapcell;
132 178
133typedef struct { 179typedef struct {
134 int32_t c0, c1; 180 int32_t c0, c1;
135 mapcell *col; 181 mapcell *col;
144 int texs; 190 int texs;
145 maptex *tex; 191 maptex *tex;
146 192
147 int32_t rows; 193 int32_t rows;
148 maprow *row; 194 maprow *row;
149} *CFClient__Map; 195} *CFPlus__Map;
150 196
151static char * 197static char *
152prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
153{ 199{
154 char *p; 200 char *p;
172 218
173#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))
174#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))
175 221
176static maprow * 222static maprow *
177map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
178{ 224{
179 if (0 > y) 225 if (0 > y)
180 { 226 {
181 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
182 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
220 266
221 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
222} 268}
223 269
224static mapcell * 270static mapcell *
225map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
226{ 272{
227 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
228} 274}
229 275
230static void 276static void
231map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
232{ 278{
233 int r; 279 int r;
234 280
235 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
236 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
244 self->row = 0; 290 self->row = 0;
245 self->rows = 0; 291 self->rows = 0;
246} 292}
247 293
248static void 294static void
249map_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)
250{ 296{
251 int x, y; 297 int x, y;
252 maprow *row; 298 maprow *row;
299 mapcell *cell;
253 300
254 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
255 if (y >= 0) 302 if (y >= 0)
256 { 303 {
257 if (y >= self->rows) 304 if (y >= self->rows)
263 if (x >= row->c0) 310 if (x >= row->c0)
264 { 311 {
265 if (x >= row->c1) 312 if (x >= row->c1)
266 break; 313 break;
267 314
268 row->col[x - row->c0].darkness = -1; 315 cell = row->col + x - row->c0;
316
317 cell->darkness = 0;
318 cell->stat_hp = 0;
269 } 319 }
270 } 320 }
271} 321}
272 322
273static void 323static void
294 ev.data2 = 0; 344 ev.data2 = 0;
295 345
296 SDL_PushEvent ((SDL_Event *)&ev); 346 SDL_PushEvent ((SDL_Event *)&ev);
297} 347}
298 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
299MODULE = CFClient PACKAGE = CFClient 366MODULE = CFPlus PACKAGE = CFPlus
300 367
301PROTOTYPES: ENABLE 368PROTOTYPES: ENABLE
302 369
303BOOT: 370BOOT:
304{ 371{
305 HV *stash = gv_stashpv ("CFClient", 1); 372 HV *stash = gv_stashpv ("CFPlus", 1);
306 static const struct { 373 static const struct {
307 const char *name; 374 const char *name;
308 IV iv; 375 IV iv;
309 } *civ, const_iv[] = { 376 } *civ, const_iv[] = {
310# define const_iv(name) { # name, (IV)name } 377# define const_iv(name) { # name, (IV)name }
411 478
412 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; )
413 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 480 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
414} 481}
415 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
416void 494void
417pango_init () 495pango_init ()
418 CODE: 496 CODE:
419{ 497{
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421 ft2_fontmap = pango_ft2_font_map_new (); 498 opengl_fontmap = pango_opengl_font_map_new ();
422 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);
423 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
424
425 cairo_fontmap = pango_cairo_font_map_get_default ();
426 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
427} 501}
428 502
429int 503int
430SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
431 505
432void 506void
433SDL_Quit () 507SDL_Quit ()
434 508
435void 509void
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 519
520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
522
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 527
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10)
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif
454 533
455 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 536
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
467 546
468 ++m; 547 ++m;
469 } 548 }
470} 549}
471 550
551char *
552SDL_GetError ()
553
472int 554int
473SDL_SetVideoMode (int w, int h, int fullscreen) 555SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 556 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 557 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
477 ); 559 );
560 if (RETVAL)
561 {
478 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 }
479 OUTPUT: 567 OUTPUT:
480 RETVAL 568 RETVAL
481 569
482void 570void
483SDL_GL_SwapBuffers () 571SDL_GL_SwapBuffers ()
572
573char *
574SDL_GetKeyName (int sym)
484 575
485void 576void
486SDL_PollEvent () 577SDL_PollEvent ()
487 PPCODE: 578 PPCODE:
488{ 579{
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 600 break;
510 601
511 case SDL_MOUSEMOTION: 602 case SDL_MOUSEMOTION:
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 610 break;
518 611
519 case SDL_MOUSEBUTTONDOWN: 612 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 613 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
615
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 616 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 617 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 618 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 619 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 620 break;
529 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
530 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
531 break; 626 break;
532 } 627 }
533 628
534 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
535 } 630 }
536} 631}
537 632
538int 633int
539Mix_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)
552 CODE: 647 CODE:
553#ifndef _WIN32 648#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 650#endif
556 651
557char *
558gl_version ()
559 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION);
561 OUTPUT:
562 RETVAL
563
564char *
565gl_extensions ()
566 CODE:
567 RETVAL = (char *)glGetString (GL_EXTENSIONS);
568 OUTPUT:
569 RETVAL
570
571void 652void
572add_font (char *file) 653add_font (char *file)
573 CODE: 654 CODE:
574 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
575#ifdef _WIN32
576 // cairo... sigh... requires win2000
577 AddFontResourceEx (file, FR_PRIVATE, 0);
578#endif
579 656
580void 657void
581load_image_inline (SV *image_) 658load_image_inline (SV *image_)
582 ALIAS: 659 ALIAS:
583 load_image_file = 1 660 load_image_file = 1
625 702
626 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
627 704
628 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
629 706
707 SDL_LockSurface (surface2);
630 EXTEND (SP, 5); 708 EXTEND (SP, 6);
631 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
632 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
633 SDL_LockSurface (surface2);
634 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
635 SDL_UnlockSurface (surface2);
636 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)));
637 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
638 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
639 716
640 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
641 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
642} 719}
643 720
667} 744}
668 745
669void 746void
670error (char *message) 747error (char *message)
671 CODE: 748 CODE:
749 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 750#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 751 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 752#endif
677 753
678void 754void
679fatal (char *message) 755fatal (char *message)
680 CODE: 756 CODE:
757 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 758#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 760#endif
686 exit (1); 761 _exit (1);
687 762
763void
764_exit (int retval)
765 CODE:
766 _exit (retval);
767
688MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
689 769
690CFClient::Font 770CFPlus::Font
691new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
692 CODE: 772 CODE:
693{ 773{
694 int count; 774 int count;
695 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
698} 778}
699 OUTPUT: 779 OUTPUT:
700 RETVAL 780 RETVAL
701 781
702void 782void
703DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
704 CODE: 784 CODE:
705 pango_font_description_free (self); 785 pango_font_description_free (self);
706 786
707void 787void
708make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
709 CODE: 789 CODE:
710 default_font = self; 790 default_font = self;
711 791
712MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
713 793
714CFClient::Layout 794void
715new (SV *class, int rgba = 0) 795reset_glyph_cache ()
796 CODE:
797 tc_clear ();
798
799CFPlus::Layout
800new (SV *class)
716 CODE: 801 CODE:
717 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
718 803
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 805 RETVAL->r = 1.;
722 RETVAL->g = 1.; 806 RETVAL->g = 1.;
723 RETVAL->b = 1.; 807 RETVAL->b = 1.;
724 RETVAL->a = 1.; 808 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
729 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
730 OUTPUT: 814 OUTPUT:
731 RETVAL 815 RETVAL
732 816
733void 817void
734DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
735 CODE: 819 CODE:
736 g_object_unref (self->pl); 820 g_object_unref (self->pl);
737 Safefree (self); 821 Safefree (self);
738 822
739int
740is_rgba (CFClient::Layout self)
741 CODE:
742 RETVAL = self->rgba;
743 OUTPUT:
744 RETVAL
745
746void 823void
747set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
748 CODE: 825 CODE:
749{ 826{
750 STRLEN textlen; 827 STRLEN textlen;
751 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
752 829
753 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
754} 831}
755 832
756void 833void
757set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
758 CODE: 835 CODE:
759{ 836{
760 STRLEN textlen; 837 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
762 839
763 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
764} 841}
765 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
766SV * 928SV *
767get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
768 CODE: 930 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 932 sv_utf8_decode (RETVAL);
771 OUTPUT: 933 OUTPUT:
772 RETVAL 934 RETVAL
773 935
774void 936void
775set_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.)
776 CODE: 938 CODE:
777 self->r = r; 939 self->r = r;
778 self->g = g; 940 self->g = g;
779 self->b = b; 941 self->b = b;
780 self->a = a; 942 self->a = a;
781 943
782void 944void
783set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784 CODE: 946 CODE:
785 if (self->font != font) 947 if (self->font != font)
786 { 948 {
787 self->font = font; 949 self->font = font;
788 layout_update_font (self); 950 layout_update_font (self);
789 } 951 }
790 952
791void 953void
792set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
793 CODE: 955 CODE:
794 if (self->base_height != base_height) 956 if (self->base_height != base_height)
795 { 957 {
796 self->base_height = base_height; 958 self->base_height = base_height;
797 layout_update_font (self); 959 layout_update_font (self);
798 } 960 }
799 961
800void 962void
801set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
802 CODE: 964 CODE:
803 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);
804 966
805void 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
806size (CFClient::Layout self) 993size (CFPlus::Layout self)
807 PPCODE: 994 PPCODE:
808{ 995{
809 int w, h; 996 int w, h;
810 997
811 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
814 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
815 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
816} 1003}
817 1004
818int 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
819xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
820 CODE: 1019 CODE:
821{ 1020{
822 int index, trailing; 1021 int index, trailing;
823 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);
824 RETVAL = index; 1023 RETVAL = index;
825} 1024}
826 OUTPUT: 1025 OUTPUT:
827 RETVAL 1026 RETVAL
828 1027
829void 1028void
830cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
831 PPCODE: 1030 PPCODE:
832{ 1031{
833 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
834 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
835 1034
838 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
839 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
840} 1039}
841 1040
842void 1041void
843render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
844 PPCODE: 1043 PPCODE:
845{ 1044 pango_opengl_render_layout_subpixel (
846 SV *retval; 1045 self->pl,
847 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
848 1050
849 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
850 1052
851 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)
852 { 1061 {
853 cairo_surface_t *surface; 1062 int nw = minpot (ow);
854 cairo_t *cairo; 1063 int nh = minpot (oh);
855 1064
856 retval = newSV (w * h * 4); 1065 if (nw != ow || nh != oh)
857 SvPOK_only (retval);
858 SvCUR_set (retval, w * h * 4);
859
860 memset (SvPVX (retval), 0, w * h * 4);
861
862 surface = cairo_image_surface_create_for_data (
863 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
864 cairo = cairo_create (surface);
865 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
866
867 pango_cairo_show_layout (cairo, self->pl);
868
869 cairo_destroy (cairo);
870 cairo_surface_destroy (surface);
871
872 // what a mess, and its premultiplied, too :(
873 { 1066 {
874 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
875 uint32_t *e = p + w * h;
876
877 while (p < e)
878 { 1068 {
879 uint32_t rgba = *p; 1069 STRLEN datalen;
880 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
881 rgba = SDL_SwapBE32 (rgba); 1071 int bpp = datalen / (ow * oh);
882 *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_);
883 } 1082 }
1083
1084 sv_setiv (w_, nw);
1085 sv_setiv (h_, nh);
884 } 1086 }
885
886 EXTEND (SP, 5);
887 PUSHs (sv_2mortal (newSViv (w)));
888 PUSHs (sv_2mortal (newSViv (h)));
889 PUSHs (sv_2mortal (retval));
890 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
891 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
892 } 1087 }
893 else
894 {
895 FT_Bitmap bitmap;
896
897 retval = newSV (w * h);
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h);
900
901 bitmap.rows = h;
902 bitmap.width = w;
903 bitmap.pitch = w;
904 bitmap.buffer = (unsigned char*)SvPVX (retval);
905 bitmap.num_grays = 256;
906 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
907
908 memset (bitmap.buffer, 0, w * h);
909
910 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
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_ALPHA)));
917 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
918 }
919} 1088}
920 1089
921MODULE = CFClient PACKAGE = CFClient::Texture
922
923void 1090void
924draw_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.)
925 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
926 ALIAS: 1093 ALIAS:
927 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
928 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
929 CODE: 1096 CODE:
930{ 1097{
931 HV *hv = (HV *)SvRV (self); 1098 HV *hv = (HV *)SvRV (self);
932 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1099 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1100 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1101 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936 1102
937 if (items < 5) 1103 if (items < 5)
938 { 1104 {
939 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1105 w = SvNV (*hv_fetch (hv, "w", 1, 1));
940 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1106 h = SvNV (*hv_fetch (hv, "h", 1, 1));
941 } 1107 }
942 1108
943 if (ix) 1109 if (ix)
944 { 1110 {
945 glEnable (GL_BLEND); 1111 glEnable (GL_BLEND);
1112
1113 if (ix == 2)
946 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);
947 } 1121 }
948 1122
949 glBindTexture (GL_TEXTURE_2D, name); 1123 glBindTexture (GL_TEXTURE_2D, name);
950
951 if (wrap_mode)
952 {
953 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955 }
956 1124
957 glBegin (GL_QUADS); 1125 glBegin (GL_QUADS);
958 glTexCoord2f (0, 0); glVertex2f (x , y ); 1126 glTexCoord2f (0, 0); glVertex2f (x , y );
959 glTexCoord2f (0, t); glVertex2f (x , y + h); 1127 glTexCoord2f (0, t); glVertex2f (x , y + h);
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1128 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1129 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1130 glEnd ();
963 1131
964 if (ix) 1132 if (ix)
1133 {
1134 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1136 }
966} 1137}
967 1138
968MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
969 1140
970CFClient::Map 1141CFPlus::Map
971new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
972 CODE: 1143 CODE:
973 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
974 RETVAL->x = 0; 1145 RETVAL->x = 0;
975 RETVAL->y = 0; 1146 RETVAL->y = 0;
985 RETVAL->row = 0; 1156 RETVAL->row = 0;
986 OUTPUT: 1157 OUTPUT:
987 RETVAL 1158 RETVAL
988 1159
989void 1160void
990DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
991 CODE: 1162 CODE:
992{ 1163{
993 map_clear (self); 1164 map_clear (self);
994 Safefree (self->face); 1165 Safefree (self->face);
1166 Safefree (self->tex);
995 Safefree (self); 1167 Safefree (self);
996} 1168}
997 1169
998void 1170void
999clear (CFClient::Map self) 1171clear (CFPlus::Map self)
1000 CODE: 1172 CODE:
1001 map_clear (self); 1173 map_clear (self);
1002 1174
1003void 1175void
1004set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
1005 CODE: 1177 CODE:
1006{ 1178{
1007 while (self->faces <= face) 1179 while (self->faces <= face)
1008 { 1180 {
1009 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
1012 1184
1013 self->face [face] = texid; 1185 self->face [face] = texid;
1014} 1186}
1015 1187
1016void 1188void
1017set_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)
1018 CODE: 1190 CODE:
1019{ 1191{
1020 while (self->texs <= texid) 1192 while (self->texs <= texid)
1021 { 1193 {
1022 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1034 tex->r = r; 1206 tex->r = r;
1035 tex->g = g; 1207 tex->g = g;
1036 tex->b = b; 1208 tex->b = b;
1037 tex->a = a; 1209 tex->a = a;
1038 } 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);
1039} 1220}
1040 1221
1041int 1222int
1042ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1043 ALIAS: 1224 ALIAS:
1044 oy = 1 1225 oy = 1
1226 x = 2
1227 y = 3
1228 w = 4
1229 h = 5
1045 CODE: 1230 CODE:
1046 switch (ix) 1231 switch (ix)
1047 { 1232 {
1048 case 0: RETVAL = self->ox; break; 1233 case 0: RETVAL = self->ox; break;
1049 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;
1050 } 1239 }
1051 OUTPUT: 1240 OUTPUT:
1052 RETVAL 1241 RETVAL
1053 1242
1054void 1243void
1055scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1056 CODE: 1245 CODE:
1057{ 1246{
1058 if (dx > 0) 1247 if (dx > 0)
1059 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1060 else if (dx < 0) 1249 else if (dx < 0)
1076 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1077 } 1266 }
1078} 1267}
1079 1268
1080void 1269void
1081map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1082 CODE: 1271 CODE:
1083{ 1272{
1084 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1085 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1086 mapcell *cell; 1275 mapcell *cell;
1088 1277
1089 while (data < data_end) 1278 while (data < data_end)
1090 { 1279 {
1091 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1092 1281
1093 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1094 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1095 1284
1096 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1097 1286
1098 if (flags & 15) 1287 if (flags & 15)
1099 { 1288 {
1100 if (cell->darkness < 0) 1289 if (!cell->darkness)
1101 { 1290 {
1102 cell->darkness = 0; 1291 cell->darkness = 256;
1103 cell->face [0] = 0; 1292 cell->face [0] = 0;
1104 cell->face [1] = 0; 1293 cell->face [1] = 0;
1105 cell->face [2] = 0; 1294 cell->face [2] = 0;
1106 } 1295 }
1107 1296
1108 cell->darkness = flags & 8 ? *data++ : 255;
1109
1110 //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 }
1111 1322
1112 if (flags & 4) 1323 if (flags & 4)
1113 { 1324 {
1114 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;
1115 } 1326 }
1123 { 1334 {
1124 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;
1125 } 1336 }
1126 } 1337 }
1127 else 1338 else
1339 {
1128 cell->darkness = -1; 1340 cell->darkness = 0;
1341 cell->stat_hp = 0;
1342 }
1129 } 1343 }
1130} 1344}
1131 1345
1132SV * 1346SV *
1133mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1347mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1134 CODE: 1348 CODE:
1135{ 1349{
1136 int x1, x; 1350 int x1, x;
1137 int y1, y; 1351 int y1, y;
1138 int z; 1352 int z;
1188} 1402}
1189 OUTPUT: 1403 OUTPUT:
1190 RETVAL 1404 RETVAL
1191 1405
1192void 1406void
1193draw (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)
1194 PPCODE: 1408 CODE:
1195{ 1409{
1196 int vx, vy; 1410 int vx, vy;
1197 int x, y, z; 1411 int x, y, z;
1198 int last_name; 1412 int last_name;
1199 mapface face; 1413 mapface face;
1200 int sw4 = (sw + 3) & ~3;
1201 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1202 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1203 1414
1204 memset (darkness, 255, sw4 * sh);
1205 SvPOK_only (darkness_sv);
1206 SvCUR_set (darkness_sv, sw4 * sh);
1207
1208 vx = self->x + (self->w - sw) / 2 - shift_x; 1415 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1209 vy = self->y + (self->h - sh) / 2 - shift_y; 1416 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1210 1417
1211 /* 1418 /*
1212 int vx = self->vx = self->w >= sw 1419 int vx = self->vx = self->w >= sw
1213 ? self->x + (self->w - sw) / 2 1420 ? self->x + (self->w - sw) / 2
1214 : 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));
1218 : 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));
1219 */ 1426 */
1220 1427
1221 glColor4ub (255, 255, 255, 255); 1428 glColor4ub (255, 255, 255, 255);
1222 1429
1430 glEnable (GL_BLEND);
1223 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1431 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1224 glEnable (GL_BLEND);
1225 glEnable (GL_TEXTURE_2D); 1432 glEnable (GL_TEXTURE_2D);
1226 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1433 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1227 1434
1228 glBegin (GL_QUADS); 1435 glBegin (GL_QUADS);
1229 1436
1238 for (x = 0; x < sw; x++) 1445 for (x = 0; x < sw; x++)
1239 if (row->c0 <= x + vx && x + vx < row->c1) 1446 if (row->c0 <= x + vx && x + vx < row->c1)
1240 { 1447 {
1241 mapcell *cell = row->col + (x + vx - row->c0); 1448 mapcell *cell = row->col + (x + vx - row->c0);
1242 1449
1243 darkness[y * sw4 + x] = cell->darkness < 0
1244 ? 255 - FOW_DARKNESS
1245 : 255 - cell->darkness;
1246
1247 face = cell->face [z]; 1450 face = cell->face [z];
1248 1451
1249 if (face) 1452 if (face && face < self->texs)
1250 { 1453 {
1251 maptex tex = self->tex [face]; 1454 maptex tex = self->tex [face];
1252 1455
1253 int px = (x + 1) * 32 - tex.w; 1456 int px = (x + 1) * 32 - tex.w;
1254 int py = (y + 1) * 32 - tex.h; 1457 int py = (y + 1) * 32 - tex.h;
1272 glEnd (); 1475 glEnd ();
1273 1476
1274 glDisable (GL_TEXTURE_2D); 1477 glDisable (GL_TEXTURE_2D);
1275 glDisable (GL_BLEND); 1478 glDisable (GL_BLEND);
1276 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
1277 EXTEND (SP, 3); 1601 EXTEND (SP, 3);
1278 PUSHs (sv_2mortal (newSViv (sw4))); 1602 PUSHs (sv_2mortal (newSViv (sw4)));
1279 PUSHs (sv_2mortal (newSViv (sh))); 1603 PUSHs (sv_2mortal (newSViv (sh)));
1280 PUSHs (darkness_sv); 1604 PUSHs (darkness_sv);
1281} 1605}
1282 1606
1283SV * 1607SV *
1284get_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)
1285 CODE: 1609 CODE:
1286{ 1610{
1287 int x, y, x1, y1; 1611 int x, y, x1, y1;
1288 SV *data_sv = newSV (w * h * 7 + 5); 1612 SV *data_sv = newSV (w * h * 7 + 5);
1289 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1613 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1351} 1675}
1352 OUTPUT: 1676 OUTPUT:
1353 RETVAL 1677 RETVAL
1354 1678
1355void 1679void
1356set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1680set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1357 PPCODE: 1681 PPCODE:
1358{ 1682{
1359 int x, y, z; 1683 int x, y, z;
1360 int w, h; 1684 int w, h;
1361 int x1, y1; 1685 int x1, y1;
1393 1717
1394 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1718 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1395 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1719 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1396 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1720 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1397 1721
1398 if (cell->darkness <= 0) 1722 if (cell->darkness == 0)
1399 { 1723 {
1400 cell->darkness = -1; 1724 cell->darkness = 0;
1401 1725
1402 for (z = 0; z <= 2; z++) 1726 for (z = 0; z <= 2; z++)
1403 { 1727 {
1404 cell->face[z] = face[z]; 1728 cell->face[z] = face[z];
1405 1729
1410 } 1734 }
1411 } 1735 }
1412 } 1736 }
1413} 1737}
1414 1738
1415MODULE = CFClient PACKAGE = CFClient::MixChunk 1739MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1416 1740
1417CFClient::MixChunk 1741CFPlus::MixChunk
1418new_from_file (SV *class, char *path) 1742new_from_file (SV *class, char *path)
1419 CODE: 1743 CODE:
1420 RETVAL = Mix_LoadWAV (path); 1744 RETVAL = Mix_LoadWAV (path);
1421 OUTPUT: 1745 OUTPUT:
1422 RETVAL 1746 RETVAL
1423 1747
1424void 1748void
1425DESTROY (CFClient::MixChunk self) 1749DESTROY (CFPlus::MixChunk self)
1426 CODE: 1750 CODE:
1427 Mix_FreeChunk (self); 1751 Mix_FreeChunk (self);
1428 1752
1429int 1753int
1430volume (CFClient::MixChunk self, int volume = -1) 1754volume (CFPlus::MixChunk self, int volume = -1)
1431 CODE: 1755 CODE:
1432 RETVAL = Mix_VolumeChunk (self, volume); 1756 RETVAL = Mix_VolumeChunk (self, volume);
1433 OUTPUT: 1757 OUTPUT:
1434 RETVAL 1758 RETVAL
1435 1759
1436int 1760int
1437play (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)
1438 CODE: 1762 CODE:
1439 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1763 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1440 OUTPUT: 1764 OUTPUT:
1441 RETVAL 1765 RETVAL
1442 1766
1443MODULE = CFClient PACKAGE = CFClient::MixMusic 1767MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1444 1768
1445int 1769int
1446volume (int volume = -1) 1770volume (int volume = -1)
1447 CODE: 1771 CODE:
1448 RETVAL = Mix_VolumeMusic (volume); 1772 RETVAL = Mix_VolumeMusic (volume);
1449 OUTPUT: 1773 OUTPUT:
1450 RETVAL 1774 RETVAL
1451 1775
1452CFClient::MixMusic 1776CFPlus::MixMusic
1453new_from_file (SV *class, char *path) 1777new_from_file (SV *class, char *path)
1454 CODE: 1778 CODE:
1455 RETVAL = Mix_LoadMUS (path); 1779 RETVAL = Mix_LoadMUS (path);
1456 OUTPUT: 1780 OUTPUT:
1457 RETVAL 1781 RETVAL
1458 1782
1459void 1783void
1460DESTROY (CFClient::MixMusic self) 1784DESTROY (CFPlus::MixMusic self)
1461 CODE: 1785 CODE:
1462 Mix_FreeMusic (self); 1786 Mix_FreeMusic (self);
1463 1787
1464int 1788int
1465play (CFClient::MixMusic self, int loops = -1) 1789play (CFPlus::MixMusic self, int loops = -1)
1466 CODE: 1790 CODE:
1467 RETVAL = Mix_PlayMusic (self, loops); 1791 RETVAL = Mix_PlayMusic (self, loops);
1468 OUTPUT: 1792 OUTPUT:
1469 RETVAL 1793 RETVAL
1470 1794
1471MODULE = CFClient PACKAGE = CFClient::OpenGL 1795MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1472 1796
1473BOOT: 1797BOOT:
1474{ 1798{
1475 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1799 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1476 static const struct { 1800 static const struct {
1477 const char *name; 1801 const char *name;
1478 IV iv; 1802 IV iv;
1479 } *civ, const_iv[] = { 1803 } *civ, const_iv[] = {
1480# define const_iv(name) { # name, (IV)name } 1804# define const_iv(name) { # name, (IV)name }
1481 const_iv (GL_COLOR_MATERIAL), 1805 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1806 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1807 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1808 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1809 const_iv (GL_BLEND),
1810 const_iv (GL_CULL_FACE),
1486 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),
1487 const_iv (GL_AND), 1818 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1819 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1820 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1821 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1822 const_iv (GL_DST_ALPHA),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1823 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1824 const_iv (GL_ONE_MINUS_DST_ALPHA),
1825 const_iv (GL_SRC_ALPHA_SATURATE),
1494 const_iv (GL_RGB), 1826 const_iv (GL_RGB),
1495 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),
1496 const_iv (GL_UNSIGNED_BYTE), 1831 const_iv (GL_UNSIGNED_BYTE),
1832 const_iv (GL_UNSIGNED_SHORT),
1833 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1834 const_iv (GL_ALPHA),
1835 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1836 const_iv (GL_LUMINANCE),
1837 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1838 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1839 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1840 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1841 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1842 const_iv (GL_TEXTURE_2D),
1505 const_iv (GL_TEXTURE_MAG_FILTER), 1844 const_iv (GL_TEXTURE_MAG_FILTER),
1506 const_iv (GL_TEXTURE_MIN_FILTER), 1845 const_iv (GL_TEXTURE_MIN_FILTER),
1507 const_iv (GL_TEXTURE_ENV_MODE), 1846 const_iv (GL_TEXTURE_ENV_MODE),
1508 const_iv (GL_TEXTURE_WRAP_S), 1847 const_iv (GL_TEXTURE_WRAP_S),
1509 const_iv (GL_TEXTURE_WRAP_T), 1848 const_iv (GL_TEXTURE_WRAP_T),
1849 const_iv (GL_REPEAT),
1510 const_iv (GL_CLAMP), 1850 const_iv (GL_CLAMP),
1511 const_iv (GL_REPEAT), 1851 const_iv (GL_CLAMP_TO_EDGE),
1512 const_iv (GL_NEAREST), 1852 const_iv (GL_NEAREST),
1513 const_iv (GL_LINEAR), 1853 const_iv (GL_LINEAR),
1514 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1854 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1855 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1856 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1857 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1858 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1859 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1860 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1861 const_iv (GL_REPLACE),
1862 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1863 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1864 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1865 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1866 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1867 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1868 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1869 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1870 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1871 const_iv (GL_LINES),
1872 const_iv (GL_LINE_STRIP),
1873 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1874 const_iv (GL_QUADS),
1532 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),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1879 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 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),
1535# undef const_iv 1885# undef const_iv
1536 }; 1886 };
1537 1887
1538 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; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1889 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540} 1890}
1541 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
1542int glGetError () 1913int glGetError ()
1914
1915void glFinish ()
1543 1916
1544void glClear (int mask) 1917void glClear (int mask)
1545 1918
1546void glClearColor (float r, float g, float b, float a = 1.0) 1919void glClearColor (float r, float g, float b, float a = 1.0)
1547 PROTOTYPE: @ 1920 PROTOTYPE: @
1554 1927
1555void glHint (int target, int mode) 1928void glHint (int target, int mode)
1556 1929
1557void glBlendFunc (int sfactor, int dfactor) 1930void glBlendFunc (int sfactor, int dfactor)
1558 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
1559void glLogicOp (int opcode) 1938void glLogicOp (int opcode)
1560 1939
1561void glColorMask (int red, int green, int blue, int alpha) 1940void glColorMask (int red, int green, int blue, int alpha)
1562 1941
1563void glMatrixMode (int mode) 1942void glMatrixMode (int mode)
1566 1945
1567void glPopMatrix () 1946void glPopMatrix ()
1568 1947
1569void glLoadIdentity () 1948void glLoadIdentity ()
1570 1949
1950void glDrawBuffer (int buffer)
1951
1952void glReadBuffer (int buffer)
1953
1571# 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
1572void 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_)
1573 1959
1574void glViewport (int x, int y, int width, int height) 1960void glViewport (int x, int y, int width, int height)
1575 1961
1576void glScissor (int x, int y, int width, int height) 1962void glScissor (int x, int y, int width, int height)
1591 1977
1592void glEnd () 1978void glEnd ()
1593 1979
1594void glColor (float r, float g, float b, float a = 1.0) 1980void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1981 PROTOTYPE: @
1982 ALIAS:
1983 glColor_premultiply = 1
1596 CODE: 1984 CODE:
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1985 if (ix)
1598 MIN ((int)(g * 255.f), 255), 1986 {
1599 MIN ((int)(b * 255.f), 255), 1987 r *= a;
1600 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);
1601 2004
1602void glVertex (float x, float y, float z = 0.) 2005void glVertex (float x, float y, float z = 0.)
1603 CODE: 2006 CODE:
1604 glVertex3f (x, y, z); 2007 glVertex3f (x, y, z);
1605 2008
1617 2020
1618void glBindTexture (int target, int name) 2021void glBindTexture (int target, int name)
1619 2022
1620void glConvolutionParameter (int target, int pname, float params) 2023void glConvolutionParameter (int target, int pname, float params)
1621 CODE: 2024 CODE:
1622 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2025 if (gl.ConvolutionParameterf)
2026 gl.ConvolutionParameterf (target, pname, params);
1623 2027
1624void 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)
1625 CODE: 2029 CODE:
1626 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2030 if (gl.ConvolutionFilter2D)
1627 (target, internalformat, width, height, format, type, data)); 2031 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628 2032
1629void 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)
1630 CODE: 2034 CODE:
1631 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2035 if (gl.SeparableFilter2D)
1632 (target, internalformat, width, height, format, type, row, column)); 2036 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633 2037
1634void 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)
1635 2039
1636void 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)
1637 2041
1638void glRasterPos (int x, int y) 2042void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 2043
1642void 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)
1643 2045
1644int glGenTexture () 2046int glGenTexture ()
1645 CODE: 2047 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines