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.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 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
441 SDL_Rect **m; 509 SDL_Rect **m;
442 510
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, 16); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 515
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 518
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 523
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
457 529
458 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 532
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
470 542
471 ++m; 543 ++m;
472 } 544 }
473} 545}
474 546
547char *
548SDL_GetError ()
549
475int 550int
476SDL_SetVideoMode (int w, int h, int fullscreen) 551SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 552 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 553 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 555 );
556 if (RETVAL)
557 {
481 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 }
482 OUTPUT: 563 OUTPUT:
483 RETVAL 564 RETVAL
484 565
485void 566void
486SDL_GL_SwapBuffers () 567SDL_GL_SwapBuffers ()
568
569char *
570SDL_GetKeyName (int sym)
487 571
488void 572void
489SDL_PollEvent () 573SDL_PollEvent ()
490 PPCODE: 574 PPCODE:
491{ 575{
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 596 break;
513 597
514 case SDL_MOUSEMOTION: 598 case SDL_MOUSEMOTION:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 601 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 602 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 603 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 604 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 605 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 606 break;
521 607
522 case SDL_MOUSEBUTTONDOWN: 608 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 609 case SDL_MOUSEBUTTONUP:
610 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
611
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 612 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 613 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 614 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 615 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 616 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 622 break;
535 } 623 }
536 624
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538 } 626 }
539} 627}
540 628
541int 629int
542Mix_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)
555 CODE: 643 CODE:
556#ifndef _WIN32 644#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 646#endif
559 647
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573
574void 648void
575add_font (char *file) 649add_font (char *file)
576 CODE: 650 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 652
583void 653void
584load_image_inline (SV *image_) 654load_image_inline (SV *image_)
585 ALIAS: 655 ALIAS:
586 load_image_file = 1 656 load_image_file = 1
628 698
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 700
631 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
632 702
703 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 704 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 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)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
642 712
643 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
645} 715}
646 716
682 CODE: 752 CODE:
683 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 754#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#endif 756#endif
687 exit (1); 757 _exit (1);
688 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
689MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
690 765
691CFClient::Font 766CFPlus::Font
692new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
693 CODE: 768 CODE:
694{ 769{
695 int count; 770 int count;
696 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
699} 774}
700 OUTPUT: 775 OUTPUT:
701 RETVAL 776 RETVAL
702 777
703void 778void
704DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
705 CODE: 780 CODE:
706 pango_font_description_free (self); 781 pango_font_description_free (self);
707 782
708void 783void
709make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
710 CODE: 785 CODE:
711 default_font = self; 786 default_font = self;
712 787
713MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
714 789
715CFClient::Layout 790void
716new (SV *class, int rgba = 0) 791reset_glyph_cache ()
717 CODE: 792 CODE:
718#if _WIN32 793 tc_clear ();
719 rgba = 0;//D 794
720#endif 795CFPlus::Layout
796new (SV *class)
797 CODE:
721 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
722 799
723 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
724 RETVAL->rgba = rgba;
725 RETVAL->r = 1.; 801 RETVAL->r = 1.;
726 RETVAL->g = 1.; 802 RETVAL->g = 1.;
727 RETVAL->b = 1.; 803 RETVAL->b = 1.;
728 RETVAL->a = 1.; 804 RETVAL->a = 1.;
729 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
733 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
734 OUTPUT: 810 OUTPUT:
735 RETVAL 811 RETVAL
736 812
737void 813void
738DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
739 CODE: 815 CODE:
740 g_object_unref (self->pl); 816 g_object_unref (self->pl);
741 Safefree (self); 817 Safefree (self);
742 818
743int
744is_rgba (CFClient::Layout self)
745 CODE:
746 RETVAL = self->rgba;
747 OUTPUT:
748 RETVAL
749
750void 819void
751set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
752 CODE: 821 CODE:
753{ 822{
754 STRLEN textlen; 823 STRLEN textlen;
755 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
756 825
757 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
758} 827}
759 828
760void 829void
761set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
762 CODE: 831 CODE:
763{ 832{
764 STRLEN textlen; 833 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
766 835
767 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
768} 837}
769 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
770SV * 924SV *
771get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
772 CODE: 926 CODE:
773 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
774 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
775 OUTPUT: 929 OUTPUT:
776 RETVAL 930 RETVAL
777 931
778void 932void
779set_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.)
780 CODE: 934 CODE:
781 self->r = r; 935 self->r = r;
782 self->g = g; 936 self->g = g;
783 self->b = b; 937 self->b = b;
784 self->a = a; 938 self->a = a;
785 939
786void 940void
787set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
788 CODE: 942 CODE:
789 if (self->font != font) 943 if (self->font != font)
790 { 944 {
791 self->font = font; 945 self->font = font;
792 layout_update_font (self); 946 layout_update_font (self);
793 } 947 }
794 948
795void 949void
796set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
797 CODE: 951 CODE:
798 if (self->base_height != base_height) 952 if (self->base_height != base_height)
799 { 953 {
800 self->base_height = base_height; 954 self->base_height = base_height;
801 layout_update_font (self); 955 layout_update_font (self);
802 } 956 }
803 957
804void 958void
805set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
806 CODE: 960 CODE:
807 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);
808 962
809void 963void
810set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
811 CODE: 965 CODE:
812 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813 967
814void 968void
815set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
816 CODE: 970 CODE:
817 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818 972
819void 973void
820set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
821 CODE: 975 CODE:
822 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
823 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
824 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
826 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
827 ); 981 );
828 982
829void 983void
830set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
831 CODE: 985 CODE:
832 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833 987
834void 988void
835size (CFClient::Layout self) 989size (CFPlus::Layout self)
836 PPCODE: 990 PPCODE:
837{ 991{
838 int w, h; 992 int w, h;
839 993
840 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
843 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
844 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
845} 999}
846 1000
847int 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
848xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
849 CODE: 1015 CODE:
850{ 1016{
851 int index, trailing; 1017 int index, trailing;
852 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);
853 RETVAL = index; 1019 RETVAL = index;
854} 1020}
855 OUTPUT: 1021 OUTPUT:
856 RETVAL 1022 RETVAL
857 1023
858void 1024void
859cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
860 PPCODE: 1026 PPCODE:
861{ 1027{
862 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
863 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
864 1030
867 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
868 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
869} 1035}
870 1036
871void 1037void
872render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
873 PPCODE: 1039 PPCODE:
874{ 1040 pango_opengl_render_layout_subpixel (
875 SV *retval; 1041 self->pl,
876 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
877 1046
878 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
879 1048
880 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)
881 { 1057 {
882 cairo_surface_t *surface; 1058 int nw = minpot (ow);
883 cairo_t *cairo; 1059 int nh = minpot (oh);
884 1060
885 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
886 SvPOK_only (retval);
887 SvCUR_set (retval, w * h * 4);
888
889 memset (SvPVX (retval), 0, w * h * 4);
890
891 surface = cairo_image_surface_create_for_data (
892 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
893 cairo = cairo_create (surface);
894 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
895
896 pango_cairo_show_layout (cairo, self->pl);
897
898 cairo_destroy (cairo);
899 cairo_surface_destroy (surface);
900
901 // what a mess, and its premultiplied, too :(
902 { 1062 {
903 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
904 uint32_t *e = p + w * h;
905
906 while (p < e)
907 { 1064 {
908 uint32_t rgba = *p; 1065 STRLEN datalen;
909 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
910#if 0 1067 int bpp = datalen / (ow * oh);
911#ifdef _WIN32 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
912 {//D
913 uint8_t r = rgba >> 24;
914 uint8_t g = rgba >> 16;
915 uint8_t b = rgba >> 8;
916 uint8_t a = rgba >> 0;
917 1069
918 rgba = (rgba & 0xffffff00) | a; 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_);
919 } 1078 }
920#endif 1079
921#endif 1080 sv_setiv (w_, nw);
922 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
923 *p++ = rgba;
924 } 1082 }
925 }
926
927 EXTEND (SP, 5);
928 PUSHs (sv_2mortal (newSViv (w)));
929 PUSHs (sv_2mortal (newSViv (h)));
930 PUSHs (sv_2mortal (retval));
931 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
932 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
933 } 1083 }
934 else
935 {
936 FT_Bitmap bitmap;
937
938 retval = newSV (w * h);
939 SvPOK_only (retval);
940 SvCUR_set (retval, w * h);
941
942 bitmap.rows = h;
943 bitmap.width = w;
944 bitmap.pitch = w;
945 bitmap.buffer = (unsigned char*)SvPVX (retval);
946 bitmap.num_grays = 256;
947 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
948
949 memset (bitmap.buffer, 0, w * h);
950
951 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
952
953 EXTEND (SP, 5);
954 PUSHs (sv_2mortal (newSViv (w)));
955 PUSHs (sv_2mortal (newSViv (h)));
956 PUSHs (sv_2mortal (retval));
957 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
958 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
959 }
960} 1084}
961 1085
962MODULE = CFClient PACKAGE = CFClient::Texture
963
964void 1086void
965draw_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.)
966 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
967 ALIAS: 1089 ALIAS:
968 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
969 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
970 CODE: 1092 CODE:
971{ 1093{
972 HV *hv = (HV *)SvRV (self); 1094 HV *hv = (HV *)SvRV (self);
973 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1095 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1096 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1097 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977 1098
978 if (items < 5) 1099 if (items < 5)
979 { 1100 {
980 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1101 w = SvNV (*hv_fetch (hv, "w", 1, 1));
981 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1102 h = SvNV (*hv_fetch (hv, "h", 1, 1));
982 } 1103 }
983 1104
984 if (ix) 1105 if (ix)
985 { 1106 {
986 glEnable (GL_BLEND); 1107 glEnable (GL_BLEND);
1108
1109 if (ix == 2)
987 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
988 glEnable (GL_ALPHA_TEST); 1115 glEnable (GL_ALPHA_TEST);
989 glAlphaFunc (GL_GREATER, 0.01f); 1116 glAlphaFunc (GL_GREATER, 0.01f);
990 } 1117 }
991 1118
992 glBindTexture (GL_TEXTURE_2D, name); 1119 glBindTexture (GL_TEXTURE_2D, name);
993
994 if (wrap_mode)
995 {
996 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998 }
999 1120
1000 glBegin (GL_QUADS); 1121 glBegin (GL_QUADS);
1001 glTexCoord2f (0, 0); glVertex2f (x , y ); 1122 glTexCoord2f (0, 0); glVertex2f (x , y );
1002 glTexCoord2f (0, t); glVertex2f (x , y + h); 1123 glTexCoord2f (0, t); glVertex2f (x , y + h);
1003 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1124 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1009 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1010 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1011 } 1132 }
1012} 1133}
1013 1134
1014MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1015 1136
1016CFClient::Map 1137CFPlus::Map
1017new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1018 CODE: 1139 CODE:
1019 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1020 RETVAL->x = 0; 1141 RETVAL->x = 0;
1021 RETVAL->y = 0; 1142 RETVAL->y = 0;
1031 RETVAL->row = 0; 1152 RETVAL->row = 0;
1032 OUTPUT: 1153 OUTPUT:
1033 RETVAL 1154 RETVAL
1034 1155
1035void 1156void
1036DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1037 CODE: 1158 CODE:
1038{ 1159{
1039 map_clear (self); 1160 map_clear (self);
1040 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1041 Safefree (self); 1163 Safefree (self);
1042} 1164}
1043 1165
1044void 1166void
1045clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1046 CODE: 1168 CODE:
1047 map_clear (self); 1169 map_clear (self);
1048 1170
1049void 1171void
1050set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1051 CODE: 1173 CODE:
1052{ 1174{
1053 while (self->faces <= face) 1175 while (self->faces <= face)
1054 { 1176 {
1055 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1058 1180
1059 self->face [face] = texid; 1181 self->face [face] = texid;
1060} 1182}
1061 1183
1062void 1184void
1063set_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)
1064 CODE: 1186 CODE:
1065{ 1187{
1066 while (self->texs <= texid) 1188 while (self->texs <= texid)
1067 { 1189 {
1068 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1080 tex->r = r; 1202 tex->r = r;
1081 tex->g = g; 1203 tex->g = g;
1082 tex->b = b; 1204 tex->b = b;
1083 tex->a = a; 1205 tex->a = a;
1084 } 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);
1085} 1216}
1086 1217
1087int 1218int
1088ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1089 ALIAS: 1220 ALIAS:
1090 oy = 1 1221 oy = 1
1222 x = 2
1223 y = 3
1224 w = 4
1225 h = 5
1091 CODE: 1226 CODE:
1092 switch (ix) 1227 switch (ix)
1093 { 1228 {
1094 case 0: RETVAL = self->ox; break; 1229 case 0: RETVAL = self->ox; break;
1095 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;
1096 } 1235 }
1097 OUTPUT: 1236 OUTPUT:
1098 RETVAL 1237 RETVAL
1099 1238
1100void 1239void
1101scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1102 CODE: 1241 CODE:
1103{ 1242{
1104 if (dx > 0) 1243 if (dx > 0)
1105 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1106 else if (dx < 0) 1245 else if (dx < 0)
1122 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1123 } 1262 }
1124} 1263}
1125 1264
1126void 1265void
1127map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1128 CODE: 1267 CODE:
1129{ 1268{
1130 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1131 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1132 mapcell *cell; 1271 mapcell *cell;
1134 1273
1135 while (data < data_end) 1274 while (data < data_end)
1136 { 1275 {
1137 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1138 1277
1139 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1140 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1141 1280
1142 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1143 1282
1144 if (flags & 15) 1283 if (flags & 15)
1145 { 1284 {
1146 if (cell->darkness < 0) 1285 if (!cell->darkness)
1147 { 1286 {
1148 cell->darkness = 0; 1287 cell->darkness = 256;
1149 cell->face [0] = 0; 1288 cell->face [0] = 0;
1150 cell->face [1] = 0; 1289 cell->face [1] = 0;
1151 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1152 } 1292 }
1153 1293
1154 cell->darkness = flags & 8 ? *data++ : 255;
1155
1156 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x3f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1;
1313 }
1314 while (cmd & 0x80);
1315 }
1316 else
1317 cell->darkness = *data++ + 1;
1318 }
1157 1319
1158 if (flags & 4) 1320 if (flags & 4)
1159 { 1321 {
1160 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1161 } 1323 }
1169 { 1331 {
1170 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1171 } 1333 }
1172 } 1334 }
1173 else 1335 else
1174 cell->darkness = -1; 1336 cell->darkness = 0;
1175 } 1337 }
1176} 1338}
1177 1339
1178SV * 1340SV *
1179mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1180 CODE: 1342 CODE:
1181{ 1343{
1182 int x1, x; 1344 int x1, x;
1183 int y1, y; 1345 int y1, y;
1184 int z; 1346 int z;
1234} 1396}
1235 OUTPUT: 1397 OUTPUT:
1236 RETVAL 1398 RETVAL
1237 1399
1238void 1400void
1239draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1401draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1240 PPCODE: 1402 CODE:
1241{ 1403{
1242 int vx, vy; 1404 int vx, vy;
1243 int x, y, z; 1405 int x, y, z;
1244 int last_name; 1406 int last_name;
1245 mapface face; 1407 mapface face;
1246 int sw4 = (sw + 3) & ~3;
1247 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1248 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1249 1408
1250 memset (darkness, 255, sw4 * sh);
1251 SvPOK_only (darkness_sv);
1252 SvCUR_set (darkness_sv, sw4 * sh);
1253
1254 vx = self->x + (self->w - sw) / 2 - shift_x; 1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1255 vy = self->y + (self->h - sh) / 2 - shift_y; 1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1256 1411
1257 /* 1412 /*
1258 int vx = self->vx = self->w >= sw 1413 int vx = self->vx = self->w >= sw
1259 ? self->x + (self->w - sw) / 2 1414 ? self->x + (self->w - sw) / 2
1260 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1264 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1265 */ 1420 */
1266 1421
1267 glColor4ub (255, 255, 255, 255); 1422 glColor4ub (255, 255, 255, 255);
1268 1423
1424 glEnable (GL_BLEND);
1269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1270 glEnable (GL_BLEND);
1271 glEnable (GL_TEXTURE_2D); 1426 glEnable (GL_TEXTURE_2D);
1272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1427 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1273 1428
1274 glBegin (GL_QUADS); 1429 glBegin (GL_QUADS);
1275 1430
1283 1438
1284 for (x = 0; x < sw; x++) 1439 for (x = 0; x < sw; x++)
1285 if (row->c0 <= x + vx && x + vx < row->c1) 1440 if (row->c0 <= x + vx && x + vx < row->c1)
1286 { 1441 {
1287 mapcell *cell = row->col + (x + vx - row->c0); 1442 mapcell *cell = row->col + (x + vx - row->c0);
1288
1289 darkness[y * sw4 + x] = cell->darkness < 0
1290 ? 255 - FOW_DARKNESS
1291 : 255 - cell->darkness;
1292 1443
1293 face = cell->face [z]; 1444 face = cell->face [z];
1294 1445
1295 if (face) 1446 if (face)
1296 { 1447 {
1318 glEnd (); 1469 glEnd ();
1319 1470
1320 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1321 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1322 1473
1474 for (y = 0; y < sh; y++)
1475 if (0 <= y + vy && y + vy < self->rows)
1476 {
1477 maprow *row = self->row + (y + vy);
1478
1479 for (x = 0; x < sw; x++)
1480 if (row->c0 <= x + vx && x + vx < row->c1)
1481 {
1482 mapcell *cell = row->col + (x + vx - row->c0);
1483
1484 int px = x * 32;
1485 int py = y * 32;
1486
1487 if (cell->stat_hp)
1488 {
1489 glColor3ub (0, 0, 0);
1490 glRectf (px + 1, py + 1, px + 31, py + 4);
1491
1492 glColor3ub (0, 255, 0);
1493 glBegin (GL_LINES);
1494 glVertex2f (px + 2, py + 2.5f);
1495 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1496 glEnd ();
1497 }
1498 }
1499 }
1500}
1501
1502void
1503draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1504 CODE:
1505{
1506 static float color[16][3] = {
1507 { 0.00F, 0.00F, 0.00F },
1508 { 1.00F, 1.00F, 1.00F },
1509 { 0.00F, 0.00F, 0.55F },
1510 { 1.00F, 0.00F, 0.00F },
1511
1512 { 1.00F, 0.54F, 0.00F },
1513 { 0.11F, 0.56F, 1.00F },
1514 { 0.93F, 0.46F, 0.00F },
1515 { 0.18F, 0.54F, 0.34F },
1516
1517 { 0.56F, 0.73F, 0.56F },
1518 { 0.80F, 0.80F, 0.80F },
1519 { 0.55F, 0.41F, 0.13F },
1520 { 0.99F, 0.77F, 0.26F },
1521
1522 { 0.74F, 0.65F, 0.41F },
1523
1524 { 0.00F, 1.00F, 1.00F },
1525 { 1.00F, 0.00F, 1.00F },
1526 { 1.00F, 1.00F, 0.00F },
1527 };
1528
1529 int x, y;
1530
1531 glEnable (GL_TEXTURE_2D);
1532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1533 glEnable (GL_BLEND);
1534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1535 glBegin (GL_QUADS);
1536
1537 for (y = 0; y < h; y++)
1538 for (x = 0; x < w; x++)
1539 {
1540 unsigned char m = data [x + y * w];
1541
1542 if (m)
1543 {
1544 float *c = color [m & 15];
1545
1546 float tx1 = m & 0x40 ? 0.5 : 0.;
1547 float tx2 = tx1 + 0.5;
1548
1549 glColor4f (c[0], c[1], c[2], 0.75);
1550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1554 }
1555 }
1556
1557 glEnd ();
1558 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D);
1560}
1561
1562void
1563fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1564 PPCODE:
1565{
1566 int vx, vy;
1567 int x, y;
1568 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571
1572 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh);
1575
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1578
1579 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows)
1581 {
1582 maprow *row = self->row + (y + vy);
1583
1584 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1)
1586 {
1587 mapcell *cell = row->col + (x + vx - row->c0);
1588
1589 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS;
1592 }
1593 }
1594
1323 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1324 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
1325 PUSHs (sv_2mortal (newSViv (sh))); 1597 PUSHs (sv_2mortal (newSViv (sh)));
1326 PUSHs (darkness_sv); 1598 PUSHs (darkness_sv);
1327} 1599}
1328 1600
1329SV * 1601SV *
1330get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1602get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1331 CODE: 1603 CODE:
1332{ 1604{
1333 int x, y, x1, y1; 1605 int x, y, x1, y1;
1334 SV *data_sv = newSV (w * h * 7 + 5); 1606 SV *data_sv = newSV (w * h * 7 + 5);
1335 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1607 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1397} 1669}
1398 OUTPUT: 1670 OUTPUT:
1399 RETVAL 1671 RETVAL
1400 1672
1401void 1673void
1402set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1674set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1403 PPCODE: 1675 PPCODE:
1404{ 1676{
1405 int x, y, z; 1677 int x, y, z;
1406 int w, h; 1678 int w, h;
1407 int x1, y1; 1679 int x1, y1;
1439 1711
1440 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1441 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1442 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1443 1715
1444 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1445 { 1717 {
1446 cell->darkness = -1; 1718 cell->darkness = 0;
1447 1719
1448 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1449 { 1721 {
1450 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1451 1723
1456 } 1728 }
1457 } 1729 }
1458 } 1730 }
1459} 1731}
1460 1732
1461MODULE = CFClient PACKAGE = CFClient::MixChunk 1733MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1462 1734
1463CFClient::MixChunk 1735CFPlus::MixChunk
1464new_from_file (SV *class, char *path) 1736new_from_file (SV *class, char *path)
1465 CODE: 1737 CODE:
1466 RETVAL = Mix_LoadWAV (path); 1738 RETVAL = Mix_LoadWAV (path);
1467 OUTPUT: 1739 OUTPUT:
1468 RETVAL 1740 RETVAL
1469 1741
1470void 1742void
1471DESTROY (CFClient::MixChunk self) 1743DESTROY (CFPlus::MixChunk self)
1472 CODE: 1744 CODE:
1473 Mix_FreeChunk (self); 1745 Mix_FreeChunk (self);
1474 1746
1475int 1747int
1476volume (CFClient::MixChunk self, int volume = -1) 1748volume (CFPlus::MixChunk self, int volume = -1)
1477 CODE: 1749 CODE:
1478 RETVAL = Mix_VolumeChunk (self, volume); 1750 RETVAL = Mix_VolumeChunk (self, volume);
1479 OUTPUT: 1751 OUTPUT:
1480 RETVAL 1752 RETVAL
1481 1753
1482int 1754int
1483play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1755play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1484 CODE: 1756 CODE:
1485 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1757 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1486 OUTPUT: 1758 OUTPUT:
1487 RETVAL 1759 RETVAL
1488 1760
1489MODULE = CFClient PACKAGE = CFClient::MixMusic 1761MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1490 1762
1491int 1763int
1492volume (int volume = -1) 1764volume (int volume = -1)
1493 CODE: 1765 CODE:
1494 RETVAL = Mix_VolumeMusic (volume); 1766 RETVAL = Mix_VolumeMusic (volume);
1495 OUTPUT: 1767 OUTPUT:
1496 RETVAL 1768 RETVAL
1497 1769
1498CFClient::MixMusic 1770CFPlus::MixMusic
1499new_from_file (SV *class, char *path) 1771new_from_file (SV *class, char *path)
1500 CODE: 1772 CODE:
1501 RETVAL = Mix_LoadMUS (path); 1773 RETVAL = Mix_LoadMUS (path);
1502 OUTPUT: 1774 OUTPUT:
1503 RETVAL 1775 RETVAL
1504 1776
1505void 1777void
1506DESTROY (CFClient::MixMusic self) 1778DESTROY (CFPlus::MixMusic self)
1507 CODE: 1779 CODE:
1508 Mix_FreeMusic (self); 1780 Mix_FreeMusic (self);
1509 1781
1510int 1782int
1511play (CFClient::MixMusic self, int loops = -1) 1783play (CFPlus::MixMusic self, int loops = -1)
1512 CODE: 1784 CODE:
1513 RETVAL = Mix_PlayMusic (self, loops); 1785 RETVAL = Mix_PlayMusic (self, loops);
1514 OUTPUT: 1786 OUTPUT:
1515 RETVAL 1787 RETVAL
1516 1788
1517MODULE = CFClient PACKAGE = CFClient::OpenGL 1789MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1518 1790
1519BOOT: 1791BOOT:
1520{ 1792{
1521 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1793 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1522 static const struct { 1794 static const struct {
1523 const char *name; 1795 const char *name;
1524 IV iv; 1796 IV iv;
1525 } *civ, const_iv[] = { 1797 } *civ, const_iv[] = {
1526# define const_iv(name) { # name, (IV)name } 1798# define const_iv(name) { # name, (IV)name }
1527 const_iv (GL_COLOR_MATERIAL), 1799 const_iv (GL_COLOR_MATERIAL),
1528 const_iv (GL_SMOOTH), 1800 const_iv (GL_SMOOTH),
1529 const_iv (GL_FLAT), 1801 const_iv (GL_FLAT),
1530 const_iv (GL_DITHER), 1802 const_iv (GL_DITHER),
1531 const_iv (GL_BLEND), 1803 const_iv (GL_BLEND),
1804 const_iv (GL_CULL_FACE),
1532 const_iv (GL_SCISSOR_TEST), 1805 const_iv (GL_SCISSOR_TEST),
1806 const_iv (GL_DEPTH_TEST),
1807 const_iv (GL_ALPHA_TEST),
1808 const_iv (GL_NORMALIZE),
1809 const_iv (GL_RESCALE_NORMAL),
1810 const_iv (GL_FRONT),
1811 const_iv (GL_BACK),
1533 const_iv (GL_AND), 1812 const_iv (GL_AND),
1534 const_iv (GL_ONE), 1813 const_iv (GL_ONE),
1535 const_iv (GL_ZERO), 1814 const_iv (GL_ZERO),
1536 const_iv (GL_SRC_ALPHA), 1815 const_iv (GL_SRC_ALPHA),
1537 const_iv (GL_SRC_ALPHA_SATURATE), 1816 const_iv (GL_DST_ALPHA),
1538 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1817 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539 const_iv (GL_ONE_MINUS_DST_ALPHA), 1818 const_iv (GL_ONE_MINUS_DST_ALPHA),
1819 const_iv (GL_SRC_ALPHA_SATURATE),
1540 const_iv (GL_RGB), 1820 const_iv (GL_RGB),
1541 const_iv (GL_RGBA), 1821 const_iv (GL_RGBA),
1822 const_iv (GL_RGBA4),
1823 const_iv (GL_RGBA8),
1824 const_iv (GL_RGB5_A1),
1542 const_iv (GL_UNSIGNED_BYTE), 1825 const_iv (GL_UNSIGNED_BYTE),
1826 const_iv (GL_UNSIGNED_SHORT),
1827 const_iv (GL_UNSIGNED_INT),
1543 const_iv (GL_ALPHA), 1828 const_iv (GL_ALPHA),
1544 const_iv (GL_INTENSITY), 1829 const_iv (GL_INTENSITY),
1545 const_iv (GL_LUMINANCE), 1830 const_iv (GL_LUMINANCE),
1546 const_iv (GL_LUMINANCE_ALPHA), 1831 const_iv (GL_LUMINANCE_ALPHA),
1547 const_iv (GL_FLOAT), 1832 const_iv (GL_FLOAT),
1553 const_iv (GL_TEXTURE_MAG_FILTER), 1838 const_iv (GL_TEXTURE_MAG_FILTER),
1554 const_iv (GL_TEXTURE_MIN_FILTER), 1839 const_iv (GL_TEXTURE_MIN_FILTER),
1555 const_iv (GL_TEXTURE_ENV_MODE), 1840 const_iv (GL_TEXTURE_ENV_MODE),
1556 const_iv (GL_TEXTURE_WRAP_S), 1841 const_iv (GL_TEXTURE_WRAP_S),
1557 const_iv (GL_TEXTURE_WRAP_T), 1842 const_iv (GL_TEXTURE_WRAP_T),
1843 const_iv (GL_REPEAT),
1558 const_iv (GL_CLAMP), 1844 const_iv (GL_CLAMP),
1559 const_iv (GL_REPEAT), 1845 const_iv (GL_CLAMP_TO_EDGE),
1560 const_iv (GL_NEAREST), 1846 const_iv (GL_NEAREST),
1561 const_iv (GL_LINEAR), 1847 const_iv (GL_LINEAR),
1562 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1848 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1849 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1850 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1851 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566 const_iv (GL_GENERATE_MIPMAP), 1852 const_iv (GL_GENERATE_MIPMAP),
1567 const_iv (GL_MODULATE), 1853 const_iv (GL_MODULATE),
1568 const_iv (GL_DECAL), 1854 const_iv (GL_DECAL),
1569 const_iv (GL_REPLACE), 1855 const_iv (GL_REPLACE),
1856 const_iv (GL_DEPTH_BUFFER_BIT),
1570 const_iv (GL_COLOR_BUFFER_BIT), 1857 const_iv (GL_COLOR_BUFFER_BIT),
1571 const_iv (GL_PROJECTION), 1858 const_iv (GL_PROJECTION),
1572 const_iv (GL_MODELVIEW), 1859 const_iv (GL_MODELVIEW),
1573 const_iv (GL_COLOR_LOGIC_OP), 1860 const_iv (GL_COLOR_LOGIC_OP),
1574 const_iv (GL_SEPARABLE_2D), 1861 const_iv (GL_SEPARABLE_2D),
1575 const_iv (GL_CONVOLUTION_2D), 1862 const_iv (GL_CONVOLUTION_2D),
1576 const_iv (GL_CONVOLUTION_BORDER_MODE), 1863 const_iv (GL_CONVOLUTION_BORDER_MODE),
1577 const_iv (GL_CONSTANT_BORDER), 1864 const_iv (GL_CONSTANT_BORDER),
1578 const_iv (GL_LINES), 1865 const_iv (GL_LINES),
1866 const_iv (GL_LINE_STRIP),
1867 const_iv (GL_LINE_LOOP),
1579 const_iv (GL_QUADS), 1868 const_iv (GL_QUADS),
1580 const_iv (GL_LINE_LOOP), 1869 const_iv (GL_QUAD_STRIP),
1870 const_iv (GL_TRIANGLES),
1871 const_iv (GL_TRIANGLE_STRIP),
1872 const_iv (GL_TRIANGLE_FAN),
1581 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1873 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582 const_iv (GL_FASTEST), 1874 const_iv (GL_FASTEST),
1875 const_iv (GL_V2F),
1876 const_iv (GL_V3F),
1877 const_iv (GL_T2F_V3F),
1878 const_iv (GL_T2F_N3F_V3F),
1583# undef const_iv 1879# undef const_iv
1584 }; 1880 };
1585 1881
1586 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1882 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1587 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1883 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588} 1884}
1589 1885
1886char *
1887gl_vendor ()
1888 CODE:
1889 RETVAL = (char *)glGetString (GL_VENDOR);
1890 OUTPUT:
1891 RETVAL
1892
1893char *
1894gl_version ()
1895 CODE:
1896 RETVAL = (char *)glGetString (GL_VERSION);
1897 OUTPUT:
1898 RETVAL
1899
1900char *
1901gl_extensions ()
1902 CODE:
1903 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1904 OUTPUT:
1905 RETVAL
1906
1590int glGetError () 1907int glGetError ()
1908
1909void glFinish ()
1591 1910
1592void glClear (int mask) 1911void glClear (int mask)
1593 1912
1594void glClearColor (float r, float g, float b, float a = 1.0) 1913void glClearColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1914 PROTOTYPE: @
1602 1921
1603void glHint (int target, int mode) 1922void glHint (int target, int mode)
1604 1923
1605void glBlendFunc (int sfactor, int dfactor) 1924void glBlendFunc (int sfactor, int dfactor)
1606 1925
1926void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1927 CODE:
1928 gl_BlendFuncSeparate (sa, da, saa, daa);
1929
1930void glDepthMask (int flag)
1931
1607void glLogicOp (int opcode) 1932void glLogicOp (int opcode)
1608 1933
1609void glColorMask (int red, int green, int blue, int alpha) 1934void glColorMask (int red, int green, int blue, int alpha)
1610 1935
1611void glMatrixMode (int mode) 1936void glMatrixMode (int mode)
1614 1939
1615void glPopMatrix () 1940void glPopMatrix ()
1616 1941
1617void glLoadIdentity () 1942void glLoadIdentity ()
1618 1943
1944void glDrawBuffer (int buffer)
1945
1946void glReadBuffer (int buffer)
1947
1619# near and far are due to microsofts buggy c compiler 1948# near_ and far_ are due to microsofts buggy "c" compiler
1949void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1950
1951# near_ and far_ are due to microsofts buggy "c" compiler
1620void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1952void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1621 1953
1622void glViewport (int x, int y, int width, int height) 1954void glViewport (int x, int y, int width, int height)
1623 1955
1624void glScissor (int x, int y, int width, int height) 1956void glScissor (int x, int y, int width, int height)
1639 1971
1640void glEnd () 1972void glEnd ()
1641 1973
1642void glColor (float r, float g, float b, float a = 1.0) 1974void glColor (float r, float g, float b, float a = 1.0)
1643 PROTOTYPE: @ 1975 PROTOTYPE: @
1976 ALIAS:
1977 glColor_premultiply = 1
1644 CODE: 1978 CODE:
1645 glColor4ub (MIN ((int)(r * 255.f), 255), 1979 if (ix)
1646 MIN ((int)(g * 255.f), 255), 1980 {
1647 MIN ((int)(b * 255.f), 255), 1981 r *= a;
1648 MIN ((int)(a * 255.f), 255)); 1982 g *= a;
1983 b *= a;
1984 }
1985 // microsoft visual "c" rounds instead of truncating...
1986 glColor4f (r, g, b, a);
1987
1988void glInterleavedArrays (int format, int stride, char *data)
1989
1990void glDrawElements (int mode, int count, int type, char *indices)
1991
1992# 1.2 void glDrawRangeElements (int mode, int start, int end
1993
1994void glRasterPos (float x, float y, float z = 0.)
1995 CODE:
1996 glRasterPos3f (0, 0, z);
1997 glBitmap (0, 0, 0, 0, x, y, 0);
1649 1998
1650void glVertex (float x, float y, float z = 0.) 1999void glVertex (float x, float y, float z = 0.)
1651 CODE: 2000 CODE:
1652 glVertex3f (x, y, z); 2001 glVertex3f (x, y, z);
1653 2002
1665 2014
1666void glBindTexture (int target, int name) 2015void glBindTexture (int target, int name)
1667 2016
1668void glConvolutionParameter (int target, int pname, float params) 2017void glConvolutionParameter (int target, int pname, float params)
1669 CODE: 2018 CODE:
1670 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2019 if (gl.ConvolutionParameterf)
2020 gl.ConvolutionParameterf (target, pname, params);
1671 2021
1672void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2022void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1673 CODE: 2023 CODE:
1674 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2024 if (gl.ConvolutionFilter2D)
1675 (target, internalformat, width, height, format, type, data)); 2025 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1676 2026
1677void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2027void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1678 CODE: 2028 CODE:
1679 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2029 if (gl.SeparableFilter2D)
1680 (target, internalformat, width, height, format, type, row, column)); 2030 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1681 2031
1682void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2032void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1683 2033
1684void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2034void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1685 2035
1686void glRasterPos (int x, int y) 2036void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687 CODE:
1688 glRasterPos2i (x, y);
1689 2037
1690void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2038void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1691 2039
1692int glGenTexture () 2040int glGenTexture ()
1693 CODE: 2041 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines