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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines