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.134 by root, Fri Aug 4 16:49:58 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);
517#if SDL_VERSION_ATLEAST(1,2,10)
449 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
450 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
451 521
452 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
453 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454 524
455 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
464 534
465 ++m; 535 ++m;
466 } 536 }
467} 537}
468 538
539char *
540SDL_GetError ()
541
469int 542int
470SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
471 CODE: 544 CODE:
472 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
473 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474 ); 547 );
548 if (RETVAL)
549 {
475 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 550 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
551# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
552# include "glfunc.h"
553# undef GL_FUNC
554 }
476 OUTPUT: 555 OUTPUT:
477 RETVAL 556 RETVAL
478 557
479void 558void
480SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
481 563
482void 564void
483SDL_PollEvent () 565SDL_PollEvent ()
484 PPCODE: 566 PPCODE:
485{ 567{
504 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506 break; 588 break;
507 589
508 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
509 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514 break; 598 break;
515 599
516 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
517 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
518 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522 break; 608 break;
526 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528 break; 614 break;
529 } 615 }
530 616
531 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
532 } 618 }
533} 619}
534 620
535int 621int
536Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 622Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
549 CODE: 635 CODE:
550#ifndef _WIN32 636#ifndef _WIN32
551 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552#endif 638#endif
553 639
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 640void
569add_font (char *file) 641add_font (char *file)
570 CODE: 642 CODE:
571 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572#ifdef _WIN32
573 // cairo... sigh... requires win2000
574 AddFontResourceEx (file, FR_PRIVATE, 0);
575#endif
576 644
577void 645void
578load_image_inline (SV *image_) 646load_image_inline (SV *image_)
579 ALIAS: 647 ALIAS:
580 load_image_file = 1 648 load_image_file = 1
622 690
623 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624 692
625 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
626 694
695 SDL_LockSurface (surface2);
627 EXTEND (SP, 5); 696 EXTEND (SP, 6);
628 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
629 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
630 SDL_LockSurface (surface2);
631 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 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))); 700 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
634 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
636 704
637 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
638 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
639} 707}
640 708
664} 732}
665 733
666void 734void
667error (char *message) 735error (char *message)
668 CODE: 736 CODE:
737 fprintf (stderr, "ERROR: %s\n", message);
669#ifdef _WIN32 738#ifdef _WIN32
670 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 739 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671#else
672 fprintf (stderr, "ERROR: %s\n", message);
673#endif 740#endif
674 741
675void 742void
676fatal (char *message) 743fatal (char *message)
677 CODE: 744 CODE:
745 fprintf (stderr, "FATAL: %s\n", message);
678#ifdef _WIN32 746#ifdef _WIN32
679 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680#else
681 fprintf (stderr, "FATAL: %s\n", message);
682#endif 748#endif
683 exit (1); 749 _exit (1);
684 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
685MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
686 757
687CFClient::Font 758CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
689 CODE: 760 CODE:
690{ 761{
691 int count; 762 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 766}
696 OUTPUT: 767 OUTPUT:
697 RETVAL 768 RETVAL
698 769
699void 770void
700DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
701 CODE: 772 CODE:
702 pango_font_description_free (self); 773 pango_font_description_free (self);
703 774
704void 775void
705make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
706 CODE: 777 CODE:
707 default_font = self; 778 default_font = self;
708 779
709MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
710 781
711CFClient::Layout 782void
712new (SV *class, int rgba = 0) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
713 CODE: 789 CODE:
714 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
715 791
716 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
717 RETVAL->rgba = rgba;
718 RETVAL->r = 1.; 793 RETVAL->r = 1.;
719 RETVAL->g = 1.; 794 RETVAL->g = 1.;
720 RETVAL->b = 1.; 795 RETVAL->b = 1.;
721 RETVAL->a = 1.; 796 RETVAL->a = 1.;
722 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
726 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
727 OUTPUT: 802 OUTPUT:
728 RETVAL 803 RETVAL
729 804
730void 805void
731DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
732 CODE: 807 CODE:
733 g_object_unref (self->pl); 808 g_object_unref (self->pl);
734 Safefree (self); 809 Safefree (self);
735 810
736int
737is_rgba (CFClient::Layout self)
738 CODE:
739 RETVAL = self->rgba;
740 OUTPUT:
741 RETVAL
742
743void 811void
744set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
745 CODE: 813 CODE:
746{ 814{
747 STRLEN textlen; 815 STRLEN textlen;
748 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
749 817
750 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
751} 819}
752 820
753void 821void
754set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
755 CODE: 823 CODE:
756{ 824{
757 STRLEN textlen; 825 STRLEN textlen;
758 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
759 827
760 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
761} 829}
762 830
831void
832set_shapes (CFPlus::Layout self, ...)
833 CODE:
834{
835 PangoAttrList *attrs = 0;
836 const char *text = pango_layout_get_text (self->pl);
837 const char *pos = text;
838 int arg = 4;
839
840 while (arg < items && (pos = strstr (pos, OBJ_STR)))
841 {
842 PangoRectangle inkrect, rect;
843 PangoAttribute *attr;
844
845 int x = SvIV (ST (arg - 3));
846 int y = SvIV (ST (arg - 2));
847 int w = SvIV (ST (arg - 1));
848 int h = SvIV (ST (arg ));
849
850 inkrect.x = 0;
851 inkrect.y = 0;
852 inkrect.width = 0;
853 inkrect.height = 0;
854
855 rect.x = x * PANGO_SCALE;
856 rect.y = y * PANGO_SCALE;
857 rect.width = w * PANGO_SCALE;
858 rect.height = h * PANGO_SCALE;
859
860 if (!attrs)
861 attrs = pango_layout_get_attributes (self->pl);
862
863 attr = pango_attr_shape_new (&inkrect, &rect);
864 attr->start_index = pos - text;
865 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
866 pango_attr_list_insert (attrs, attr);
867
868 arg += 4;
869 pos += sizeof (OBJ_STR) - 1;
870 }
871
872 if (attrs)
873 pango_layout_set_attributes (self->pl, attrs);
874}
875
876void
877get_shapes (CFPlus::Layout self)
878 PPCODE:
879{
880 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
881
882 do
883 {
884 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
885
886 if (run && shape_attr_p (run))
887 {
888 PangoRectangle extents;
889 pango_layout_iter_get_run_extents (iter, 0, &extents);
890
891 EXTEND (SP, 2);
892 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
893 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
894 }
895 }
896 while (pango_layout_iter_next_run (iter));
897
898 pango_layout_iter_free (iter);
899}
900
901int
902has_wrapped (CFPlus::Layout self)
903 CODE:
904{
905 int lines = 1;
906 const char *text = pango_layout_get_text (self->pl);
907
908 while (*text)
909 lines += *text++ == '\n';
910
911 RETVAL = lines < pango_layout_get_line_count (self->pl);
912}
913 OUTPUT:
914 RETVAL
915
763SV * 916SV *
764get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
765 CODE: 918 CODE:
766 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
768 OUTPUT: 921 OUTPUT:
769 RETVAL 922 RETVAL
770 923
771void 924void
772set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 925set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
773 CODE: 926 CODE:
774 self->r = r; 927 self->r = r;
775 self->g = g; 928 self->g = g;
776 self->b = b; 929 self->b = b;
777 self->a = a; 930 self->a = a;
778 931
779void 932void
780set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781 CODE: 934 CODE:
782 if (self->font != font) 935 if (self->font != font)
783 { 936 {
784 self->font = font; 937 self->font = font;
785 layout_update_font (self); 938 layout_update_font (self);
786 } 939 }
787 940
788void 941void
789set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
790 CODE: 943 CODE:
791 if (self->base_height != base_height) 944 if (self->base_height != base_height)
792 { 945 {
793 self->base_height = base_height; 946 self->base_height = base_height;
794 layout_update_font (self); 947 layout_update_font (self);
795 } 948 }
796 949
797void 950void
798set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
799 CODE: 952 CODE:
800 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 953 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801 954
802void 955void
956set_indent (CFPlus::Layout self, int indent)
957 CODE:
958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
959
960void
961set_spacing (CFPlus::Layout self, int spacing)
962 CODE:
963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
964
965void
966set_ellipsise (CFPlus::Layout self, int ellipsise)
967 CODE:
968 pango_layout_set_ellipsize (self->pl,
969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
972 : PANGO_ELLIPSIZE_NONE
973 );
974
975void
976set_single_paragraph_mode (CFPlus::Layout self, int spm)
977 CODE:
978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
979
980void
803size (CFClient::Layout self) 981size (CFPlus::Layout self)
804 PPCODE: 982 PPCODE:
805{ 983{
806 int w, h; 984 int w, h;
807 985
808 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
811 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
812 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
813} 991}
814 992
815int 993int
994descent (CFPlus::Layout self)
995 CODE:
996{
997 PangoRectangle rect;
998 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
999 pango_layout_line_get_pixel_extents (line, 0, &rect);
1000 RETVAL = PANGO_DESCENT (rect);
1001}
1002 OUTPUT:
1003 RETVAL
1004
1005int
816xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
817 CODE: 1007 CODE:
818{ 1008{
819 int index, trailing; 1009 int index, trailing;
820 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
821 RETVAL = index; 1011 RETVAL = index;
822} 1012}
823 OUTPUT: 1013 OUTPUT:
824 RETVAL 1014 RETVAL
825 1015
826void 1016void
827cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
828 PPCODE: 1018 PPCODE:
829{ 1019{
830 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
831 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832 1022
835 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837} 1027}
838 1028
839void 1029void
840render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y)
841 PPCODE: 1031 PPCODE:
842{ 1032 pango_opengl_render_layout_subpixel (
843 SV *retval; 1033 self->pl,
844 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a
1036 );
845 1037
846 layout_get_pixel_size (self, &w, &h); 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
847 1039
848 if (self->rgba) 1040void
1041pad2pot (SV *data_, SV *w_, SV *h_)
1042 CODE:
1043{
1044 int ow = SvIV (w_);
1045 int oh = SvIV (h_);
1046
1047 if (ow && oh)
849 { 1048 {
850 cairo_surface_t *surface; 1049 int nw = minpot (ow);
851 cairo_t *cairo; 1050 int nh = minpot (oh);
852 1051
853 retval = newSV (w * h * 4); 1052 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 { 1053 {
871 uint32_t *p = (uint32_t *)SvPVX (retval); 1054 if (SvOK (data_))
872 uint32_t *e = p + w * h;
873
874 while (p < e)
875 { 1055 {
876 uint32_t rgba = *p; 1056 STRLEN datalen;
877 rgba = (rgba >> 24) | (rgba << 8); 1057 char *data = SvPVbyte (data_, datalen);
878 rgba = SDL_SwapBE32 (rgba); 1058 int bpp = datalen / (ow * oh);
879 *p++ = rgba; 1059 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1060
1061 SvPOK_only (result_);
1062 SvCUR_set (result_, nw * nh * bpp);
1063
1064 memset (SvPVX (result_), 0, nw * nh * bpp);
1065 while (oh--)
1066 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1067
1068 sv_setsv (data_, result_);
880 } 1069 }
1070
1071 sv_setiv (w_, nw);
1072 sv_setiv (h_, nh);
881 } 1073 }
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 } 1074 }
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} 1075}
917 1076
918MODULE = CFClient PACKAGE = CFClient::Texture
919
920void 1077void
921draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1078draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
922 PROTOTYPE: $$$;$$ 1079 PROTOTYPE: $$$;$$
923 ALIAS: 1080 ALIAS:
924 draw_quad_alpha = 1 1081 draw_quad_alpha = 1
925 draw_quad_alpha_premultiplied = 2 1082 draw_quad_alpha_premultiplied = 2
926 CODE: 1083 CODE:
927{ 1084{
928 HV *hv = (HV *)SvRV (self); 1085 HV *hv = (HV *)SvRV (self);
929 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1086 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1087 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1088 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933 1089
934 if (items < 5) 1090 if (items < 5)
935 { 1091 {
936 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1092 w = SvNV (*hv_fetch (hv, "w", 1, 1));
937 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1093 h = SvNV (*hv_fetch (hv, "h", 1, 1));
938 } 1094 }
939 1095
940 if (ix) 1096 if (ix)
941 { 1097 {
942 glEnable (GL_BLEND); 1098 glEnable (GL_BLEND);
1099
1100 if (ix == 2)
943 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1101 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1102 else
1103 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1104 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1105
1106 glEnable (GL_ALPHA_TEST);
1107 glAlphaFunc (GL_GREATER, 0.01f);
944 } 1108 }
945 1109
946 glBindTexture (GL_TEXTURE_2D, name); 1110 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 1111
954 glBegin (GL_QUADS); 1112 glBegin (GL_QUADS);
955 glTexCoord2f (0, 0); glVertex2f (x , y ); 1113 glTexCoord2f (0, 0); glVertex2f (x , y );
956 glTexCoord2f (0, t); glVertex2f (x , y + h); 1114 glTexCoord2f (0, t); glVertex2f (x , y + h);
957 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1115 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1116 glTexCoord2f (s, 0); glVertex2f (x + w, y );
959 glEnd (); 1117 glEnd ();
960 1118
961 if (ix) 1119 if (ix)
1120 {
1121 glDisable (GL_ALPHA_TEST);
962 glDisable (GL_BLEND); 1122 glDisable (GL_BLEND);
1123 }
963} 1124}
964 1125
965MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
966 1127
967CFClient::Map 1128CFPlus::Map
968new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
969 CODE: 1130 CODE:
970 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
971 RETVAL->x = 0; 1132 RETVAL->x = 0;
972 RETVAL->y = 0; 1133 RETVAL->y = 0;
982 RETVAL->row = 0; 1143 RETVAL->row = 0;
983 OUTPUT: 1144 OUTPUT:
984 RETVAL 1145 RETVAL
985 1146
986void 1147void
987DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
988 CODE: 1149 CODE:
989{ 1150{
990 map_clear (self); 1151 map_clear (self);
991 Safefree (self->face); 1152 Safefree (self->face);
1153 Safefree (self->tex);
992 Safefree (self); 1154 Safefree (self);
993} 1155}
994 1156
995void 1157void
996clear (CFClient::Map self) 1158clear (CFPlus::Map self)
997 CODE: 1159 CODE:
998 map_clear (self); 1160 map_clear (self);
999 1161
1000void 1162void
1001set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
1002 CODE: 1164 CODE:
1003{ 1165{
1004 while (self->faces <= face) 1166 while (self->faces <= face)
1005 { 1167 {
1006 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
1009 1171
1010 self->face [face] = texid; 1172 self->face [face] = texid;
1011} 1173}
1012 1174
1013void 1175void
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) 1176set_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: 1177 CODE:
1016{ 1178{
1017 while (self->texs <= texid) 1179 while (self->texs <= texid)
1018 { 1180 {
1019 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
1031 tex->r = r; 1193 tex->r = r;
1032 tex->g = g; 1194 tex->g = g;
1033 tex->b = b; 1195 tex->b = b;
1034 tex->a = a; 1196 tex->a = a;
1035 } 1197 }
1198
1199 // somewhat hackish, but for textures that require it, it really
1200 // improves the look, and most others don't suffer.
1201 glBindTexture (GL_TEXTURE_2D, name);
1202 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1203 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1204 // use uglier nearest interpolation because linear suffers
1205 // from transparent color bleeding and ugly wrapping effects.
1206 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1036} 1207}
1037 1208
1038int 1209int
1039ox (CFClient::Map self) 1210ox (CFPlus::Map self)
1040 ALIAS: 1211 ALIAS:
1041 oy = 1 1212 oy = 1
1213 x = 2
1214 y = 3
1215 w = 4
1216 h = 5
1042 CODE: 1217 CODE:
1043 switch (ix) 1218 switch (ix)
1044 { 1219 {
1045 case 0: RETVAL = self->ox; break; 1220 case 0: RETVAL = self->ox; break;
1046 case 1: RETVAL = self->oy; break; 1221 case 1: RETVAL = self->oy; break;
1222 case 2: RETVAL = self->x; break;
1223 case 3: RETVAL = self->y; break;
1224 case 4: RETVAL = self->w; break;
1225 case 5: RETVAL = self->h; break;
1047 } 1226 }
1048 OUTPUT: 1227 OUTPUT:
1049 RETVAL 1228 RETVAL
1050 1229
1051void 1230void
1052scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
1053 CODE: 1232 CODE:
1054{ 1233{
1055 if (dx > 0) 1234 if (dx > 0)
1056 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
1057 else if (dx < 0) 1236 else if (dx < 0)
1073 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
1074 } 1253 }
1075} 1254}
1076 1255
1077void 1256void
1078map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
1079 CODE: 1258 CODE:
1080{ 1259{
1081 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1082 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
1083 mapcell *cell; 1262 mapcell *cell;
1085 1264
1086 while (data < data_end) 1265 while (data < data_end)
1087 { 1266 {
1088 flags = (data [0] << 8) + data [1]; data += 2; 1267 flags = (data [0] << 8) + data [1]; data += 2;
1089 1268
1090 x = ((flags >> 10) & 63) + self->x; 1269 x = self->x + ((flags >> 10) & 63);
1091 y = ((flags >> 4) & 63) + self->y; 1270 y = self->y + ((flags >> 4) & 63);
1092 1271
1093 cell = map_get_cell (self, x, y); 1272 cell = map_get_cell (self, x, y);
1094 1273
1095 if (flags & 15) 1274 if (flags & 15)
1096 { 1275 {
1125 cell->darkness = -1; 1304 cell->darkness = -1;
1126 } 1305 }
1127} 1306}
1128 1307
1129SV * 1308SV *
1130mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1131 CODE: 1310 CODE:
1132{ 1311{
1133 int x1, x; 1312 int x1, x;
1134 int y1, y; 1313 int y1, y;
1135 int z; 1314 int z;
1185} 1364}
1186 OUTPUT: 1365 OUTPUT:
1187 RETVAL 1366 RETVAL
1188 1367
1189void 1368void
1190draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1369draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1191 PPCODE: 1370 CODE:
1192{ 1371{
1193 int vx, vy; 1372 int vx, vy;
1194 int x, y, z; 1373 int x, y, z;
1195 int last_name; 1374 int last_name;
1196 mapface face; 1375 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 1376
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; 1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1206 vy = self->y + (self->h - sh) / 2 - shift_y; 1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1207 1379
1208 /* 1380 /*
1209 int vx = self->vx = self->w >= sw 1381 int vx = self->vx = self->w >= sw
1210 ? self->x + (self->w - sw) / 2 1382 ? self->x + (self->w - sw) / 2
1211 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1383 : 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)); 1387 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1216 */ 1388 */
1217 1389
1218 glColor4ub (255, 255, 255, 255); 1390 glColor4ub (255, 255, 255, 255);
1219 1391
1392 glEnable (GL_BLEND);
1220 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221 glEnable (GL_BLEND);
1222 glEnable (GL_TEXTURE_2D); 1394 glEnable (GL_TEXTURE_2D);
1223 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1395 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224 1396
1225 glBegin (GL_QUADS); 1397 glBegin (GL_QUADS);
1226 1398
1234 1406
1235 for (x = 0; x < sw; x++) 1407 for (x = 0; x < sw; x++)
1236 if (row->c0 <= x + vx && x + vx < row->c1) 1408 if (row->c0 <= x + vx && x + vx < row->c1)
1237 { 1409 {
1238 mapcell *cell = row->col + (x + vx - row->c0); 1410 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 1411
1244 face = cell->face [z]; 1412 face = cell->face [z];
1245 1413
1246 if (face) 1414 if (face)
1247 { 1415 {
1268 1436
1269 glEnd (); 1437 glEnd ();
1270 1438
1271 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1272 glDisable (GL_BLEND); 1440 glDisable (GL_BLEND);
1441}
1442
1443void
1444draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1445 CODE:
1446{
1447 static float color[16][3] = {
1448 { 0.00F, 0.00F, 0.00F },
1449 { 1.00F, 1.00F, 1.00F },
1450 { 0.00F, 0.00F, 0.55F },
1451 { 1.00F, 0.00F, 0.00F },
1452
1453 { 1.00F, 0.54F, 0.00F },
1454 { 0.11F, 0.56F, 1.00F },
1455 { 0.93F, 0.46F, 0.00F },
1456 { 0.18F, 0.54F, 0.34F },
1457
1458 { 0.56F, 0.73F, 0.56F },
1459 { 0.80F, 0.80F, 0.80F },
1460 { 0.55F, 0.41F, 0.13F },
1461 { 0.99F, 0.77F, 0.26F },
1462
1463 { 0.74F, 0.65F, 0.41F },
1464
1465 { 0.00F, 1.00F, 1.00F },
1466 { 1.00F, 0.00F, 1.00F },
1467 { 1.00F, 1.00F, 0.00F },
1468 };
1469
1470 int x, y;
1471
1472 glEnable (GL_TEXTURE_2D);
1473 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1474 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1476 glBegin (GL_QUADS);
1477
1478 for (y = 0; y < h; y++)
1479 for (x = 0; x < w; x++)
1480 {
1481 unsigned char m = data [x + y * w];
1482
1483 if (m)
1484 {
1485 float *c = color [m & 15];
1486
1487 float tx1 = m & 0x40 ? 0.5 : 0.;
1488 float tx2 = tx1 + 0.5;
1489
1490 glColor4f (c[0], c[1], c[2], 0.75);
1491 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1492 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1493 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1494 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1495 }
1496 }
1497
1498 glEnd ();
1499 glDisable (GL_BLEND);
1500 glDisable (GL_TEXTURE_2D);
1501}
1502
1503void
1504fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1505 PPCODE:
1506{
1507 int vx, vy;
1508 int x, y;
1509 int sw4 = (sw + 3) & ~3;
1510 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1511 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1512
1513 memset (darkness, 255, sw4 * sh);
1514 SvPOK_only (darkness_sv);
1515 SvCUR_set (darkness_sv, sw4 * sh);
1516
1517 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1518 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1519
1520 for (y = 0; y < sh; y++)
1521 if (0 <= y + vy && y + vy < self->rows)
1522 {
1523 maprow *row = self->row + (y + vy);
1524
1525 for (x = 0; x < sw; x++)
1526 if (row->c0 <= x + vx && x + vx < row->c1)
1527 {
1528 mapcell *cell = row->col + (x + vx - row->c0);
1529
1530 darkness[y * sw4 + x] = cell->darkness < 0
1531 ? 255 - FOW_DARKNESS
1532 : 255 - cell->darkness;
1533 }
1534 }
1273 1535
1274 EXTEND (SP, 3); 1536 EXTEND (SP, 3);
1275 PUSHs (sv_2mortal (newSViv (sw4))); 1537 PUSHs (sv_2mortal (newSViv (sw4)));
1276 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1277 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1278} 1540}
1279 1541
1280SV * 1542SV *
1281get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1543get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1282 CODE: 1544 CODE:
1283{ 1545{
1284 int x, y, x1, y1; 1546 int x, y, x1, y1;
1285 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1286 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1348} 1610}
1349 OUTPUT: 1611 OUTPUT:
1350 RETVAL 1612 RETVAL
1351 1613
1352void 1614void
1353set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1354 PPCODE: 1616 PPCODE:
1355{ 1617{
1356 int x, y, z; 1618 int x, y, z;
1357 int w, h; 1619 int w, h;
1358 int x1, y1; 1620 int x1, y1;
1407 } 1669 }
1408 } 1670 }
1409 } 1671 }
1410} 1672}
1411 1673
1412MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413 1675
1414CFClient::MixChunk 1676CFPlus::MixChunk
1415new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1416 CODE: 1678 CODE:
1417 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1418 OUTPUT: 1680 OUTPUT:
1419 RETVAL 1681 RETVAL
1420 1682
1421void 1683void
1422DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1423 CODE: 1685 CODE:
1424 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1425 1687
1426int 1688int
1427volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1428 CODE: 1690 CODE:
1429 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1430 OUTPUT: 1692 OUTPUT:
1431 RETVAL 1693 RETVAL
1432 1694
1433int 1695int
1434play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1696play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1435 CODE: 1697 CODE:
1436 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437 OUTPUT: 1699 OUTPUT:
1438 RETVAL 1700 RETVAL
1439 1701
1440MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441 1703
1442int 1704int
1443volume (int volume = -1) 1705volume (int volume = -1)
1444 CODE: 1706 CODE:
1445 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1446 OUTPUT: 1708 OUTPUT:
1447 RETVAL 1709 RETVAL
1448 1710
1449CFClient::MixMusic 1711CFPlus::MixMusic
1450new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1451 CODE: 1713 CODE:
1452 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1453 OUTPUT: 1715 OUTPUT:
1454 RETVAL 1716 RETVAL
1455 1717
1456void 1718void
1457DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1458 CODE: 1720 CODE:
1459 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1460 1722
1461int 1723int
1462play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1463 CODE: 1725 CODE:
1464 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1465 OUTPUT: 1727 OUTPUT:
1466 RETVAL 1728 RETVAL
1467 1729
1468MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469 1731
1470BOOT: 1732BOOT:
1471{ 1733{
1472 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473 static const struct { 1735 static const struct {
1474 const char *name; 1736 const char *name;
1475 IV iv; 1737 IV iv;
1476 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1477# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }
1478 const_iv (GL_COLOR_MATERIAL), 1740 const_iv (GL_COLOR_MATERIAL),
1479 const_iv (GL_SMOOTH), 1741 const_iv (GL_SMOOTH),
1480 const_iv (GL_FLAT), 1742 const_iv (GL_FLAT),
1481 const_iv (GL_DITHER), 1743 const_iv (GL_DITHER),
1482 const_iv (GL_BLEND), 1744 const_iv (GL_BLEND),
1745 const_iv (GL_CULL_FACE),
1483 const_iv (GL_SCISSOR_TEST), 1746 const_iv (GL_SCISSOR_TEST),
1747 const_iv (GL_DEPTH_TEST),
1748 const_iv (GL_ALPHA_TEST),
1749 const_iv (GL_NORMALIZE),
1750 const_iv (GL_RESCALE_NORMAL),
1751 const_iv (GL_FRONT),
1752 const_iv (GL_BACK),
1484 const_iv (GL_AND), 1753 const_iv (GL_AND),
1485 const_iv (GL_ONE), 1754 const_iv (GL_ONE),
1486 const_iv (GL_ZERO), 1755 const_iv (GL_ZERO),
1487 const_iv (GL_SRC_ALPHA), 1756 const_iv (GL_SRC_ALPHA),
1488 const_iv (GL_SRC_ALPHA_SATURATE), 1757 const_iv (GL_DST_ALPHA),
1489 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1758 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490 const_iv (GL_ONE_MINUS_DST_ALPHA), 1759 const_iv (GL_ONE_MINUS_DST_ALPHA),
1760 const_iv (GL_SRC_ALPHA_SATURATE),
1491 const_iv (GL_RGB), 1761 const_iv (GL_RGB),
1492 const_iv (GL_RGBA), 1762 const_iv (GL_RGBA),
1763 const_iv (GL_RGBA4),
1764 const_iv (GL_RGBA8),
1765 const_iv (GL_RGB5_A1),
1493 const_iv (GL_UNSIGNED_BYTE), 1766 const_iv (GL_UNSIGNED_BYTE),
1767 const_iv (GL_UNSIGNED_SHORT),
1768 const_iv (GL_UNSIGNED_INT),
1494 const_iv (GL_ALPHA), 1769 const_iv (GL_ALPHA),
1770 const_iv (GL_INTENSITY),
1495 const_iv (GL_LUMINANCE), 1771 const_iv (GL_LUMINANCE),
1772 const_iv (GL_LUMINANCE_ALPHA),
1496 const_iv (GL_FLOAT), 1773 const_iv (GL_FLOAT),
1497 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1774 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498 const_iv (GL_COMPILE), 1775 const_iv (GL_COMPILE),
1499 const_iv (GL_TEXTURE_1D), 1776 const_iv (GL_TEXTURE_1D),
1500 const_iv (GL_TEXTURE_2D), 1777 const_iv (GL_TEXTURE_2D),
1502 const_iv (GL_TEXTURE_MAG_FILTER), 1779 const_iv (GL_TEXTURE_MAG_FILTER),
1503 const_iv (GL_TEXTURE_MIN_FILTER), 1780 const_iv (GL_TEXTURE_MIN_FILTER),
1504 const_iv (GL_TEXTURE_ENV_MODE), 1781 const_iv (GL_TEXTURE_ENV_MODE),
1505 const_iv (GL_TEXTURE_WRAP_S), 1782 const_iv (GL_TEXTURE_WRAP_S),
1506 const_iv (GL_TEXTURE_WRAP_T), 1783 const_iv (GL_TEXTURE_WRAP_T),
1784 const_iv (GL_REPEAT),
1507 const_iv (GL_CLAMP), 1785 const_iv (GL_CLAMP),
1508 const_iv (GL_REPEAT), 1786 const_iv (GL_CLAMP_TO_EDGE),
1509 const_iv (GL_NEAREST), 1787 const_iv (GL_NEAREST),
1510 const_iv (GL_LINEAR), 1788 const_iv (GL_LINEAR),
1511 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1789 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1790 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1791 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1792 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515 const_iv (GL_GENERATE_MIPMAP), 1793 const_iv (GL_GENERATE_MIPMAP),
1516 const_iv (GL_MODULATE), 1794 const_iv (GL_MODULATE),
1517 const_iv (GL_DECAL), 1795 const_iv (GL_DECAL),
1518 const_iv (GL_REPLACE), 1796 const_iv (GL_REPLACE),
1797 const_iv (GL_DEPTH_BUFFER_BIT),
1519 const_iv (GL_COLOR_BUFFER_BIT), 1798 const_iv (GL_COLOR_BUFFER_BIT),
1520 const_iv (GL_PROJECTION), 1799 const_iv (GL_PROJECTION),
1521 const_iv (GL_MODELVIEW), 1800 const_iv (GL_MODELVIEW),
1522 const_iv (GL_COLOR_LOGIC_OP), 1801 const_iv (GL_COLOR_LOGIC_OP),
1523 const_iv (GL_SEPARABLE_2D), 1802 const_iv (GL_SEPARABLE_2D),
1524 const_iv (GL_CONVOLUTION_2D), 1803 const_iv (GL_CONVOLUTION_2D),
1525 const_iv (GL_CONVOLUTION_BORDER_MODE), 1804 const_iv (GL_CONVOLUTION_BORDER_MODE),
1526 const_iv (GL_CONSTANT_BORDER), 1805 const_iv (GL_CONSTANT_BORDER),
1527 const_iv (GL_LINES), 1806 const_iv (GL_LINES),
1807 const_iv (GL_LINE_LOOP),
1528 const_iv (GL_QUADS), 1808 const_iv (GL_QUADS),
1529 const_iv (GL_LINE_LOOP), 1809 const_iv (GL_QUAD_STRIP),
1810 const_iv (GL_TRIANGLES),
1811 const_iv (GL_TRIANGLE_STRIP),
1812 const_iv (GL_TRIANGLE_FAN),
1530 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1813 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531 const_iv (GL_FASTEST), 1814 const_iv (GL_FASTEST),
1815 const_iv (GL_V2F),
1816 const_iv (GL_V3F),
1817 const_iv (GL_T2F_V3F),
1818 const_iv (GL_T2F_N3F_V3F),
1532# undef const_iv 1819# undef const_iv
1533 }; 1820 };
1534 1821
1535 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1822 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1536 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1823 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537} 1824}
1538 1825
1826char *
1827gl_vendor ()
1828 CODE:
1829 RETVAL = (char *)glGetString (GL_VENDOR);
1830 OUTPUT:
1831 RETVAL
1832
1833char *
1834gl_version ()
1835 CODE:
1836 RETVAL = (char *)glGetString (GL_VERSION);
1837 OUTPUT:
1838 RETVAL
1839
1840char *
1841gl_extensions ()
1842 CODE:
1843 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1844 OUTPUT:
1845 RETVAL
1846
1539int glGetError () 1847int glGetError ()
1848
1849void glFinish ()
1540 1850
1541void glClear (int mask) 1851void glClear (int mask)
1542 1852
1543void glClearColor (float r, float g, float b, float a = 1.0) 1853void glClearColor (float r, float g, float b, float a = 1.0)
1544 PROTOTYPE: @ 1854 PROTOTYPE: @
1551 1861
1552void glHint (int target, int mode) 1862void glHint (int target, int mode)
1553 1863
1554void glBlendFunc (int sfactor, int dfactor) 1864void glBlendFunc (int sfactor, int dfactor)
1555 1865
1866void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1867 CODE:
1868 gl_BlendFuncSeparate (sa, da, saa, daa);
1869
1870void glDepthMask (int flag)
1871
1556void glLogicOp (int opcode) 1872void glLogicOp (int opcode)
1557 1873
1558void glColorMask (int red, int green, int blue, int alpha) 1874void glColorMask (int red, int green, int blue, int alpha)
1559 1875
1560void glMatrixMode (int mode) 1876void glMatrixMode (int mode)
1563 1879
1564void glPopMatrix () 1880void glPopMatrix ()
1565 1881
1566void glLoadIdentity () 1882void glLoadIdentity ()
1567 1883
1884void glDrawBuffer (int buffer)
1885
1886void glReadBuffer (int buffer)
1887
1568# near and far are due to microsofts buggy c compiler 1888# near_ and far_ are due to microsofts buggy "c" compiler
1889void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1890
1891# near_ and far_ are due to microsofts buggy "c" compiler
1569void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1892void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1570 1893
1571void glViewport (int x, int y, int width, int height) 1894void glViewport (int x, int y, int width, int height)
1572 1895
1573void glScissor (int x, int y, int width, int height) 1896void glScissor (int x, int y, int width, int height)
1588 1911
1589void glEnd () 1912void glEnd ()
1590 1913
1591void glColor (float r, float g, float b, float a = 1.0) 1914void glColor (float r, float g, float b, float a = 1.0)
1592 PROTOTYPE: @ 1915 PROTOTYPE: @
1916 ALIAS:
1917 glColor_premultiply = 1
1593 CODE: 1918 CODE:
1594 // 255.999 is close enough to correctness (256 and clamp) 1919 if (ix)
1595 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1920 {
1921 r *= a;
1922 g *= a;
1923 b *= a;
1924 }
1925 // microsoft visual "c" rounds instead of truncating...
1926 glColor4f (r, g, b, a);
1927
1928void glInterleavedArrays (int format, int stride, char *data)
1929
1930void glDrawElements (int mode, int count, int type, char *indices)
1931
1932# 1.2 void glDrawRangeElements (int mode, int start, int end
1933
1934void glRasterPos (float x, float y, float z = 0.)
1935 CODE:
1936 glRasterPos3f (0, 0, z);
1937 glBitmap (0, 0, 0, 0, x, y, 0);
1596 1938
1597void glVertex (float x, float y, float z = 0.) 1939void glVertex (float x, float y, float z = 0.)
1598 CODE: 1940 CODE:
1599 glVertex3f (x, y, z); 1941 glVertex3f (x, y, z);
1600 1942
1612 1954
1613void glBindTexture (int target, int name) 1955void glBindTexture (int target, int name)
1614 1956
1615void glConvolutionParameter (int target, int pname, float params) 1957void glConvolutionParameter (int target, int pname, float params)
1616 CODE: 1958 CODE:
1617 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1959 if (gl.ConvolutionParameterf)
1960 gl.ConvolutionParameterf (target, pname, params);
1618 1961
1619void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1962void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1620 CODE: 1963 CODE:
1621 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1964 if (gl.ConvolutionFilter2D)
1622 (target, internalformat, width, height, format, type, data)); 1965 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623 1966
1624void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1967void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1625 CODE: 1968 CODE:
1626 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1969 if (gl.SeparableFilter2D)
1627 (target, internalformat, width, height, format, type, row, column)); 1970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628 1971
1629void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1972void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1630 1973
1631void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1974void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1632 1975
1633void glRasterPos (int x, int y) 1976void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634 CODE:
1635 glRasterPos2i (x, y);
1636 1977
1637void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1978void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1638 1979
1639int glGenTexture () 1980int glGenTexture ()
1640 CODE: 1981 CODE:
1667 2008
1668void glEndList () 2009void glEndList ()
1669 2010
1670void glCallList (int list) 2011void glCallList (int list)
1671 2012
2013

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines