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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines