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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines