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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines