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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.138 by root, Mon Aug 14 01:21:01 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines