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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines