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.80 by root, Sun May 14 22:58:24 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
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);
126#ifdef FC_HINT_STYLE
127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
128#endif
89 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
90} 130}
91 131
92static void 132static void
93layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
94{ 134{
95 /* 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
96 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
97 */ 137 */
98 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
102 142
103 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
104} 144}
105 145
106static void 146static void
107layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
108{ 148{
109 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
110 150
111 if (!*w) *w = 1; 151 if (!*w) *w = 1;
112 if (!*h) *h = 1; 152 if (!*h) *h = 1;
142 int texs; 182 int texs;
143 maptex *tex; 183 maptex *tex;
144 184
145 int32_t rows; 185 int32_t rows;
146 maprow *row; 186 maprow *row;
147} *CFClient__Map; 187} *CFPlus__Map;
148 188
149static char * 189static char *
150prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
151{ 191{
152 char *p; 192 char *p;
170 210
171#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))
172#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))
173 213
174static maprow * 214static maprow *
175map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
176{ 216{
177 if (0 > y) 217 if (0 > y)
178 { 218 {
179 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
180 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
218 258
219 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
220} 260}
221 261
222static mapcell * 262static mapcell *
223map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
224{ 264{
225 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
226} 266}
227 267
228static void 268static void
229map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
230{ 270{
231 int r; 271 int r;
232 272
233 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
234 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
242 self->row = 0; 282 self->row = 0;
243 self->rows = 0; 283 self->rows = 0;
244} 284}
245 285
246static void 286static void
247map_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)
248{ 288{
249 int x, y; 289 int x, y;
250 maprow *row; 290 maprow *row;
251 291
252 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
292 ev.data2 = 0; 332 ev.data2 = 0;
293 333
294 SDL_PushEvent ((SDL_Event *)&ev); 334 SDL_PushEvent ((SDL_Event *)&ev);
295} 335}
296 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
297MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
298 355
299PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
300 357
301BOOT: 358BOOT:
302{ 359{
303 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
304 static const struct { 361 static const struct {
305 const char *name; 362 const char *name;
306 IV iv; 363 IV iv;
307 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
308# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
409 466
410 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; )
411 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
412} 469}
413 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
414void 482void
415pango_init () 483pango_init ()
416 CODE: 484 CODE:
417{ 485{
418 // delayed, so it can pick up new fonts added by AddFontResourceEx
419 ft2_fontmap = pango_ft2_font_map_new (); 486 opengl_fontmap = pango_opengl_font_map_new ();
420 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);
421 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
422
423 cairo_fontmap = pango_cairo_font_map_get_default ();
424 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
425} 489}
426 490
427int 491int
428SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
429 493
430void 494void
431SDL_Quit () 495SDL_Quit ()
432 496
433void 497void
439 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443 507
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
510
444 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448 515
449 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
450 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
451 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
452 521
453 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
454 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455 524
456 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
465 534
466 ++m; 535 ++m;
467 } 536 }
468} 537}
469 538
539char *
540SDL_GetError ()
541
470int 542int
471SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
472 CODE: 544 CODE:
473 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
474 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
475 ); 547 );
548 if (RETVAL)
549 {
476 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 }
477 OUTPUT: 555 OUTPUT:
478 RETVAL 556 RETVAL
479 557
480void 558void
481SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
482 563
483void 564void
484SDL_PollEvent () 565SDL_PollEvent ()
485 PPCODE: 566 PPCODE:
486{ 567{
505 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507 break; 588 break;
508 589
509 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
510 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515 break; 598 break;
516 599
517 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
518 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
519 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523 break; 608 break;
527 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
528 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
529 break; 614 break;
530 } 615 }
531 616
532 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
533 } 618 }
534} 619}
535 620
536int 621int
537Mix_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)
550 CODE: 635 CODE:
551#ifndef _WIN32 636#ifndef _WIN32
552 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553#endif 638#endif
554 639
555char *
556gl_version ()
557 CODE:
558 RETVAL = (char *)glGetString (GL_VERSION);
559 OUTPUT:
560 RETVAL
561
562char *
563gl_extensions ()
564 CODE:
565 RETVAL = (char *)glGetString (GL_EXTENSIONS);
566 OUTPUT:
567 RETVAL
568
569void 640void
570add_font (char *file) 641add_font (char *file)
571 CODE: 642 CODE:
572 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
573#ifdef _WIN32
574 // cairo... sigh... requires win2000
575 AddFontResourceEx (file, FR_PRIVATE, 0);
576#endif
577 644
578void 645void
579load_image_inline (SV *image_) 646load_image_inline (SV *image_)
580 ALIAS: 647 ALIAS:
581 load_image_file = 1 648 load_image_file = 1
623 690
624 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
625 692
626 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
627 694
695 SDL_LockSurface (surface2);
628 EXTEND (SP, 5); 696 EXTEND (SP, 6);
629 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
630 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
631 SDL_LockSurface (surface2);
632 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
633 SDL_UnlockSurface (surface2);
634 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)));
635 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
636 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
637 704
638 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
639 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
640} 707}
641 708
665} 732}
666 733
667void 734void
668error (char *message) 735error (char *message)
669 CODE: 736 CODE:
737 fprintf (stderr, "ERROR: %s\n", message);
670#ifdef _WIN32 738#ifdef _WIN32
671 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 739 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
672#else
673 fprintf (stderr, "ERROR: %s\n", message);
674#endif 740#endif
675 741
676void 742void
677fatal (char *message) 743fatal (char *message)
678 CODE: 744 CODE:
745 fprintf (stderr, "FATAL: %s\n", message);
679#ifdef _WIN32 746#ifdef _WIN32
680 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
681#else
682 fprintf (stderr, "FATAL: %s\n", message);
683#endif 748#endif
684 exit (1); 749 _exit (1);
685 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
686MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
687 757
688CFClient::Font 758CFPlus::Font
689new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
690 CODE: 760 CODE:
691{ 761{
692 int count; 762 int count;
693 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
696} 766}
697 OUTPUT: 767 OUTPUT:
698 RETVAL 768 RETVAL
699 769
700void 770void
701DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
702 CODE: 772 CODE:
703 pango_font_description_free (self); 773 pango_font_description_free (self);
704 774
705void 775void
706make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
707 CODE: 777 CODE:
708 default_font = self; 778 default_font = self;
709 779
710MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
711 781
712CFClient::Layout 782void
713new (SV *class, int rgba = 0) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
714 CODE: 789 CODE:
715 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
716 791
717 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
718 RETVAL->rgba = rgba;
719 RETVAL->r = 1.; 793 RETVAL->r = 1.;
720 RETVAL->g = 1.; 794 RETVAL->g = 1.;
721 RETVAL->b = 1.; 795 RETVAL->b = 1.;
722 RETVAL->a = 1.; 796 RETVAL->a = 1.;
723 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
727 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
728 OUTPUT: 802 OUTPUT:
729 RETVAL 803 RETVAL
730 804
731void 805void
732DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
733 CODE: 807 CODE:
734 g_object_unref (self->pl); 808 g_object_unref (self->pl);
735 Safefree (self); 809 Safefree (self);
736 810
737int
738is_rgba (CFClient::Layout self)
739 CODE:
740 RETVAL = self->rgba;
741 OUTPUT:
742 RETVAL
743
744void 811void
745set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
746 CODE: 813 CODE:
747{ 814{
748 STRLEN textlen; 815 STRLEN textlen;
749 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
750 817
751 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
752} 819}
753 820
754void 821void
755set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
756 CODE: 823 CODE:
757{ 824{
758 STRLEN textlen; 825 STRLEN textlen;
759 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
760 827
761 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
762} 829}
763 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
764SV * 916SV *
765get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
766 CODE: 918 CODE:
767 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
769 OUTPUT: 921 OUTPUT:
770 RETVAL 922 RETVAL
771 923
772void 924void
773set_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.)
774 CODE: 926 CODE:
775 self->r = r; 927 self->r = r;
776 self->g = g; 928 self->g = g;
777 self->b = b; 929 self->b = b;
778 self->a = a; 930 self->a = a;
779 931
780void 932void
781set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
782 CODE: 934 CODE:
783 if (self->font != font) 935 if (self->font != font)
784 { 936 {
785 self->font = font; 937 self->font = font;
786 layout_update_font (self); 938 layout_update_font (self);
787 } 939 }
788 940
789void 941void
790set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
791 CODE: 943 CODE:
792 if (self->base_height != base_height) 944 if (self->base_height != base_height)
793 { 945 {
794 self->base_height = base_height; 946 self->base_height = base_height;
795 layout_update_font (self); 947 layout_update_font (self);
796 } 948 }
797 949
798void 950void
799set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
800 CODE: 952 CODE:
801 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);
802 954
803void 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
804size (CFClient::Layout self) 981size (CFPlus::Layout self)
805 PPCODE: 982 PPCODE:
806{ 983{
807 int w, h; 984 int w, h;
808 985
809 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
812 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
813 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
814} 991}
815 992
816int 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
817xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
818 CODE: 1007 CODE:
819{ 1008{
820 int index, trailing; 1009 int index, trailing;
821 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);
822 RETVAL = index; 1011 RETVAL = index;
823} 1012}
824 OUTPUT: 1013 OUTPUT:
825 RETVAL 1014 RETVAL
826 1015
827void 1016void
828cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
829 PPCODE: 1018 PPCODE:
830{ 1019{
831 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
832 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
833 1022
836 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
837 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
838} 1027}
839 1028
840void 1029void
841render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y)
842 PPCODE: 1031 PPCODE:
843{ 1032 pango_opengl_render_layout_subpixel (
844 SV *retval; 1033 self->pl,
845 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a
1036 );
846 1037
847 layout_get_pixel_size (self, &w, &h); 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
848 1039
849 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)
850 { 1048 {
851 cairo_surface_t *surface; 1049 int nw = minpot (ow);
852 cairo_t *cairo; 1050 int nh = minpot (oh);
853 1051
854 retval = newSV (w * h * 4); 1052 if (nw != ow || nh != oh)
855 SvPOK_only (retval);
856 SvCUR_set (retval, w * h * 4);
857
858 memset (SvPVX (retval), 0, w * h * 4);
859
860 surface = cairo_image_surface_create_for_data (
861 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
862 cairo = cairo_create (surface);
863 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
864
865 pango_cairo_show_layout (cairo, self->pl);
866
867 cairo_destroy (cairo);
868 cairo_surface_destroy (surface);
869
870 // what a mess, and its premultiplied, too :(
871 { 1053 {
872 uint32_t *p = (uint32_t *)SvPVX (retval); 1054 if (SvOK (data_))
873 uint32_t *e = p + w * h;
874
875 while (p < e)
876 { 1055 {
877 uint32_t rgba = *p; 1056 STRLEN datalen;
878 rgba = (rgba >> 24) | (rgba << 8); 1057 char *data = SvPVbyte (data_, datalen);
879 rgba = SDL_SwapBE32 (rgba); 1058 int bpp = datalen / (ow * oh);
880 *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_);
881 } 1069 }
1070
1071 sv_setiv (w_, nw);
1072 sv_setiv (h_, nh);
882 } 1073 }
883
884 EXTEND (SP, 5);
885 PUSHs (sv_2mortal (newSViv (w)));
886 PUSHs (sv_2mortal (newSViv (h)));
887 PUSHs (sv_2mortal (retval));
888 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890 } 1074 }
891 else
892 {
893 FT_Bitmap bitmap;
894
895 retval = newSV (w * h);
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h);
898
899 bitmap.rows = h;
900 bitmap.width = w;
901 bitmap.pitch = w;
902 bitmap.buffer = (unsigned char*)SvPVX (retval);
903 bitmap.num_grays = 256;
904 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
905
906 memset (bitmap.buffer, 0, w * h);
907
908 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
909
910 EXTEND (SP, 5);
911 PUSHs (sv_2mortal (newSViv (w)));
912 PUSHs (sv_2mortal (newSViv (h)));
913 PUSHs (sv_2mortal (retval));
914 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916 }
917} 1075}
918 1076
919MODULE = CFClient PACKAGE = CFClient::Texture
920
921void 1077void
922draw_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.)
923 PROTOTYPE: $$$;$$ 1079 PROTOTYPE: $$$;$$
924 ALIAS: 1080 ALIAS:
925 draw_quad_alpha = 1 1081 draw_quad_alpha = 1
926 draw_quad_alpha_premultiplied = 2 1082 draw_quad_alpha_premultiplied = 2
927 CODE: 1083 CODE:
928{ 1084{
929 HV *hv = (HV *)SvRV (self); 1085 HV *hv = (HV *)SvRV (self);
930 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1086 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1087 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1088 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934 1089
935 if (items < 5) 1090 if (items < 5)
936 { 1091 {
937 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1092 w = SvNV (*hv_fetch (hv, "w", 1, 1));
938 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1093 h = SvNV (*hv_fetch (hv, "h", 1, 1));
939 } 1094 }
940 1095
941 if (ix) 1096 if (ix)
942 { 1097 {
943 glEnable (GL_BLEND); 1098 glEnable (GL_BLEND);
1099
1100 if (ix == 2)
944 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);
945 } 1108 }
946 1109
947 glBindTexture (GL_TEXTURE_2D, name); 1110 glBindTexture (GL_TEXTURE_2D, name);
948
949 if (wrap_mode)
950 {
951 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953 }
954 1111
955 glBegin (GL_QUADS); 1112 glBegin (GL_QUADS);
956 glTexCoord2f (0, 0); glVertex2f (x , y ); 1113 glTexCoord2f (0, 0); glVertex2f (x , y );
957 glTexCoord2f (0, t); glVertex2f (x , y + h); 1114 glTexCoord2f (0, t); glVertex2f (x , y + h);
958 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1115 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1116 glTexCoord2f (s, 0); glVertex2f (x + w, y );
960 glEnd (); 1117 glEnd ();
961 1118
962 if (ix) 1119 if (ix)
1120 {
1121 glDisable (GL_ALPHA_TEST);
963 glDisable (GL_BLEND); 1122 glDisable (GL_BLEND);
1123 }
964} 1124}
965 1125
966MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
967 1127
968CFClient::Map 1128CFPlus::Map
969new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
970 CODE: 1130 CODE:
971 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
972 RETVAL->x = 0; 1132 RETVAL->x = 0;
973 RETVAL->y = 0; 1133 RETVAL->y = 0;
983 RETVAL->row = 0; 1143 RETVAL->row = 0;
984 OUTPUT: 1144 OUTPUT:
985 RETVAL 1145 RETVAL
986 1146
987void 1147void
988DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
989 CODE: 1149 CODE:
990{ 1150{
991 map_clear (self); 1151 map_clear (self);
992 Safefree (self->face); 1152 Safefree (self->face);
1153 Safefree (self->tex);
993 Safefree (self); 1154 Safefree (self);
994} 1155}
995 1156
996void 1157void
997clear (CFClient::Map self) 1158clear (CFPlus::Map self)
998 CODE: 1159 CODE:
999 map_clear (self); 1160 map_clear (self);
1000 1161
1001void 1162void
1002set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
1003 CODE: 1164 CODE:
1004{ 1165{
1005 while (self->faces <= face) 1166 while (self->faces <= face)
1006 { 1167 {
1007 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
1010 1171
1011 self->face [face] = texid; 1172 self->face [face] = texid;
1012} 1173}
1013 1174
1014void 1175void
1015set_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)
1016 CODE: 1177 CODE:
1017{ 1178{
1018 while (self->texs <= texid) 1179 while (self->texs <= texid)
1019 { 1180 {
1020 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
1032 tex->r = r; 1193 tex->r = r;
1033 tex->g = g; 1194 tex->g = g;
1034 tex->b = b; 1195 tex->b = b;
1035 tex->a = a; 1196 tex->a = a;
1036 } 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);
1037} 1207}
1038 1208
1039int 1209int
1040ox (CFClient::Map self) 1210ox (CFPlus::Map self)
1041 ALIAS: 1211 ALIAS:
1042 oy = 1 1212 oy = 1
1213 x = 2
1214 y = 3
1215 w = 4
1216 h = 5
1043 CODE: 1217 CODE:
1044 switch (ix) 1218 switch (ix)
1045 { 1219 {
1046 case 0: RETVAL = self->ox; break; 1220 case 0: RETVAL = self->ox; break;
1047 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;
1048 } 1226 }
1049 OUTPUT: 1227 OUTPUT:
1050 RETVAL 1228 RETVAL
1051 1229
1052void 1230void
1053scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
1054 CODE: 1232 CODE:
1055{ 1233{
1056 if (dx > 0) 1234 if (dx > 0)
1057 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
1058 else if (dx < 0) 1236 else if (dx < 0)
1074 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
1075 } 1253 }
1076} 1254}
1077 1255
1078void 1256void
1079map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
1080 CODE: 1258 CODE:
1081{ 1259{
1082 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1083 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
1084 mapcell *cell; 1262 mapcell *cell;
1086 1264
1087 while (data < data_end) 1265 while (data < data_end)
1088 { 1266 {
1089 flags = (data [0] << 8) + data [1]; data += 2; 1267 flags = (data [0] << 8) + data [1]; data += 2;
1090 1268
1091 x = ((flags >> 10) & 63) + self->x; 1269 x = self->x + ((flags >> 10) & 63);
1092 y = ((flags >> 4) & 63) + self->y; 1270 y = self->y + ((flags >> 4) & 63);
1093 1271
1094 cell = map_get_cell (self, x, y); 1272 cell = map_get_cell (self, x, y);
1095 1273
1096 if (flags & 15) 1274 if (flags & 15)
1097 { 1275 {
1126 cell->darkness = -1; 1304 cell->darkness = -1;
1127 } 1305 }
1128} 1306}
1129 1307
1130SV * 1308SV *
1131mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1132 CODE: 1310 CODE:
1133{ 1311{
1134 int x1, x; 1312 int x1, x;
1135 int y1, y; 1313 int y1, y;
1136 int z; 1314 int z;
1186} 1364}
1187 OUTPUT: 1365 OUTPUT:
1188 RETVAL 1366 RETVAL
1189 1367
1190void 1368void
1191draw (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)
1192 PPCODE: 1370 CODE:
1193{ 1371{
1194 int vx, vy; 1372 int vx, vy;
1195 int x, y, z; 1373 int x, y, z;
1196 int last_name; 1374 int last_name;
1197 mapface face; 1375 mapface face;
1198 int sw4 = (sw + 3) & ~3;
1199 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1200 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1201 1376
1202 memset (darkness, 255, sw4 * sh);
1203 SvPOK_only (darkness_sv);
1204 SvCUR_set (darkness_sv, sw4 * sh);
1205
1206 vx = self->x + (self->w - sw) / 2 - shift_x; 1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1207 vy = self->y + (self->h - sh) / 2 - shift_y; 1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1208 1379
1209 /* 1380 /*
1210 int vx = self->vx = self->w >= sw 1381 int vx = self->vx = self->w >= sw
1211 ? self->x + (self->w - sw) / 2 1382 ? self->x + (self->w - sw) / 2
1212 : 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));
1216 : 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));
1217 */ 1388 */
1218 1389
1219 glColor4ub (255, 255, 255, 255); 1390 glColor4ub (255, 255, 255, 255);
1220 1391
1392 glEnable (GL_BLEND);
1221 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1222 glEnable (GL_BLEND);
1223 glEnable (GL_TEXTURE_2D); 1394 glEnable (GL_TEXTURE_2D);
1224 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1395 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1225 1396
1226 glBegin (GL_QUADS); 1397 glBegin (GL_QUADS);
1227 1398
1235 1406
1236 for (x = 0; x < sw; x++) 1407 for (x = 0; x < sw; x++)
1237 if (row->c0 <= x + vx && x + vx < row->c1) 1408 if (row->c0 <= x + vx && x + vx < row->c1)
1238 { 1409 {
1239 mapcell *cell = row->col + (x + vx - row->c0); 1410 mapcell *cell = row->col + (x + vx - row->c0);
1240
1241 darkness[y * sw4 + x] = cell->darkness < 0
1242 ? 255 - FOW_DARKNESS
1243 : 255 - cell->darkness;
1244 1411
1245 face = cell->face [z]; 1412 face = cell->face [z];
1246 1413
1247 if (face) 1414 if (face)
1248 { 1415 {
1269 1436
1270 glEnd (); 1437 glEnd ();
1271 1438
1272 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1273 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 }
1274 1535
1275 EXTEND (SP, 3); 1536 EXTEND (SP, 3);
1276 PUSHs (sv_2mortal (newSViv (sw4))); 1537 PUSHs (sv_2mortal (newSViv (sw4)));
1277 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1278 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1279} 1540}
1280 1541
1281SV * 1542SV *
1282get_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)
1283 CODE: 1544 CODE:
1284{ 1545{
1285 int x, y, x1, y1; 1546 int x, y, x1, y1;
1286 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1287 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1349} 1610}
1350 OUTPUT: 1611 OUTPUT:
1351 RETVAL 1612 RETVAL
1352 1613
1353void 1614void
1354set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1355 PPCODE: 1616 PPCODE:
1356{ 1617{
1357 int x, y, z; 1618 int x, y, z;
1358 int w, h; 1619 int w, h;
1359 int x1, y1; 1620 int x1, y1;
1408 } 1669 }
1409 } 1670 }
1410 } 1671 }
1411} 1672}
1412 1673
1413MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1414 1675
1415CFClient::MixChunk 1676CFPlus::MixChunk
1416new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1417 CODE: 1678 CODE:
1418 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1419 OUTPUT: 1680 OUTPUT:
1420 RETVAL 1681 RETVAL
1421 1682
1422void 1683void
1423DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1424 CODE: 1685 CODE:
1425 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1426 1687
1427int 1688int
1428volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1429 CODE: 1690 CODE:
1430 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1431 OUTPUT: 1692 OUTPUT:
1432 RETVAL 1693 RETVAL
1433 1694
1434int 1695int
1435play (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)
1436 CODE: 1697 CODE:
1437 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1438 OUTPUT: 1699 OUTPUT:
1439 RETVAL 1700 RETVAL
1440 1701
1441MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1442 1703
1443int 1704int
1444volume (int volume = -1) 1705volume (int volume = -1)
1445 CODE: 1706 CODE:
1446 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1447 OUTPUT: 1708 OUTPUT:
1448 RETVAL 1709 RETVAL
1449 1710
1450CFClient::MixMusic 1711CFPlus::MixMusic
1451new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1452 CODE: 1713 CODE:
1453 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1454 OUTPUT: 1715 OUTPUT:
1455 RETVAL 1716 RETVAL
1456 1717
1457void 1718void
1458DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1459 CODE: 1720 CODE:
1460 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1461 1722
1462int 1723int
1463play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1464 CODE: 1725 CODE:
1465 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1466 OUTPUT: 1727 OUTPUT:
1467 RETVAL 1728 RETVAL
1468 1729
1469MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1470 1731
1471BOOT: 1732BOOT:
1472{ 1733{
1473 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1474 static const struct { 1735 static const struct {
1475 const char *name; 1736 const char *name;
1476 IV iv; 1737 IV iv;
1477 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1478# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }
1479 const_iv (GL_COLOR_MATERIAL), 1740 const_iv (GL_COLOR_MATERIAL),
1480 const_iv (GL_SMOOTH), 1741 const_iv (GL_SMOOTH),
1481 const_iv (GL_FLAT), 1742 const_iv (GL_FLAT),
1482 const_iv (GL_DITHER), 1743 const_iv (GL_DITHER),
1483 const_iv (GL_BLEND), 1744 const_iv (GL_BLEND),
1745 const_iv (GL_CULL_FACE),
1484 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),
1485 const_iv (GL_AND), 1753 const_iv (GL_AND),
1486 const_iv (GL_ONE), 1754 const_iv (GL_ONE),
1487 const_iv (GL_ZERO), 1755 const_iv (GL_ZERO),
1488 const_iv (GL_SRC_ALPHA), 1756 const_iv (GL_SRC_ALPHA),
1489 const_iv (GL_SRC_ALPHA_SATURATE), 1757 const_iv (GL_DST_ALPHA),
1490 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1758 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491 const_iv (GL_ONE_MINUS_DST_ALPHA), 1759 const_iv (GL_ONE_MINUS_DST_ALPHA),
1760 const_iv (GL_SRC_ALPHA_SATURATE),
1492 const_iv (GL_RGB), 1761 const_iv (GL_RGB),
1493 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),
1494 const_iv (GL_UNSIGNED_BYTE), 1766 const_iv (GL_UNSIGNED_BYTE),
1767 const_iv (GL_UNSIGNED_SHORT),
1768 const_iv (GL_UNSIGNED_INT),
1495 const_iv (GL_ALPHA), 1769 const_iv (GL_ALPHA),
1770 const_iv (GL_INTENSITY),
1496 const_iv (GL_LUMINANCE), 1771 const_iv (GL_LUMINANCE),
1772 const_iv (GL_LUMINANCE_ALPHA),
1497 const_iv (GL_FLOAT), 1773 const_iv (GL_FLOAT),
1498 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1774 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499 const_iv (GL_COMPILE), 1775 const_iv (GL_COMPILE),
1500 const_iv (GL_TEXTURE_1D), 1776 const_iv (GL_TEXTURE_1D),
1501 const_iv (GL_TEXTURE_2D), 1777 const_iv (GL_TEXTURE_2D),
1503 const_iv (GL_TEXTURE_MAG_FILTER), 1779 const_iv (GL_TEXTURE_MAG_FILTER),
1504 const_iv (GL_TEXTURE_MIN_FILTER), 1780 const_iv (GL_TEXTURE_MIN_FILTER),
1505 const_iv (GL_TEXTURE_ENV_MODE), 1781 const_iv (GL_TEXTURE_ENV_MODE),
1506 const_iv (GL_TEXTURE_WRAP_S), 1782 const_iv (GL_TEXTURE_WRAP_S),
1507 const_iv (GL_TEXTURE_WRAP_T), 1783 const_iv (GL_TEXTURE_WRAP_T),
1784 const_iv (GL_REPEAT),
1508 const_iv (GL_CLAMP), 1785 const_iv (GL_CLAMP),
1509 const_iv (GL_REPEAT), 1786 const_iv (GL_CLAMP_TO_EDGE),
1510 const_iv (GL_NEAREST), 1787 const_iv (GL_NEAREST),
1511 const_iv (GL_LINEAR), 1788 const_iv (GL_LINEAR),
1512 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1789 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1790 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1791 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1792 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516 const_iv (GL_GENERATE_MIPMAP), 1793 const_iv (GL_GENERATE_MIPMAP),
1517 const_iv (GL_MODULATE), 1794 const_iv (GL_MODULATE),
1518 const_iv (GL_DECAL), 1795 const_iv (GL_DECAL),
1519 const_iv (GL_REPLACE), 1796 const_iv (GL_REPLACE),
1797 const_iv (GL_DEPTH_BUFFER_BIT),
1520 const_iv (GL_COLOR_BUFFER_BIT), 1798 const_iv (GL_COLOR_BUFFER_BIT),
1521 const_iv (GL_PROJECTION), 1799 const_iv (GL_PROJECTION),
1522 const_iv (GL_MODELVIEW), 1800 const_iv (GL_MODELVIEW),
1523 const_iv (GL_COLOR_LOGIC_OP), 1801 const_iv (GL_COLOR_LOGIC_OP),
1524 const_iv (GL_SEPARABLE_2D), 1802 const_iv (GL_SEPARABLE_2D),
1525 const_iv (GL_CONVOLUTION_2D), 1803 const_iv (GL_CONVOLUTION_2D),
1526 const_iv (GL_CONVOLUTION_BORDER_MODE), 1804 const_iv (GL_CONVOLUTION_BORDER_MODE),
1527 const_iv (GL_CONSTANT_BORDER), 1805 const_iv (GL_CONSTANT_BORDER),
1528 const_iv (GL_LINES), 1806 const_iv (GL_LINES),
1807 const_iv (GL_LINE_LOOP),
1529 const_iv (GL_QUADS), 1808 const_iv (GL_QUADS),
1530 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),
1531 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1813 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532 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),
1533# undef const_iv 1819# undef const_iv
1534 }; 1820 };
1535 1821
1536 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; )
1537 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1823 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538} 1824}
1539 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
1540int glGetError () 1847int glGetError ()
1848
1849void glFinish ()
1541 1850
1542void glClear (int mask) 1851void glClear (int mask)
1543 1852
1544void glClearColor (float r, float g, float b, float a = 1.0) 1853void glClearColor (float r, float g, float b, float a = 1.0)
1545 PROTOTYPE: @ 1854 PROTOTYPE: @
1552 1861
1553void glHint (int target, int mode) 1862void glHint (int target, int mode)
1554 1863
1555void glBlendFunc (int sfactor, int dfactor) 1864void glBlendFunc (int sfactor, int dfactor)
1556 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
1557void glLogicOp (int opcode) 1872void glLogicOp (int opcode)
1558 1873
1559void glColorMask (int red, int green, int blue, int alpha) 1874void glColorMask (int red, int green, int blue, int alpha)
1560 1875
1561void glMatrixMode (int mode) 1876void glMatrixMode (int mode)
1564 1879
1565void glPopMatrix () 1880void glPopMatrix ()
1566 1881
1567void glLoadIdentity () 1882void glLoadIdentity ()
1568 1883
1884void glDrawBuffer (int buffer)
1885
1886void glReadBuffer (int buffer)
1887
1569# 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
1570void 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_)
1571 1893
1572void glViewport (int x, int y, int width, int height) 1894void glViewport (int x, int y, int width, int height)
1573 1895
1574void glScissor (int x, int y, int width, int height) 1896void glScissor (int x, int y, int width, int height)
1589 1911
1590void glEnd () 1912void glEnd ()
1591 1913
1592void glColor (float r, float g, float b, float a = 1.0) 1914void glColor (float r, float g, float b, float a = 1.0)
1593 PROTOTYPE: @ 1915 PROTOTYPE: @
1916 ALIAS:
1917 glColor_premultiply = 1
1594 CODE: 1918 CODE:
1595 glColor4ub (MIN ((int)r * 256., 255), 1919 if (ix)
1596 MIN ((int)g * 256., 255), 1920 {
1597 MIN ((int)b * 256., 255), 1921 r *= a;
1598 MIN ((int)a * 256., 255)); 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);
1599 1938
1600void glVertex (float x, float y, float z = 0.) 1939void glVertex (float x, float y, float z = 0.)
1601 CODE: 1940 CODE:
1602 glVertex3f (x, y, z); 1941 glVertex3f (x, y, z);
1603 1942
1615 1954
1616void glBindTexture (int target, int name) 1955void glBindTexture (int target, int name)
1617 1956
1618void glConvolutionParameter (int target, int pname, float params) 1957void glConvolutionParameter (int target, int pname, float params)
1619 CODE: 1958 CODE:
1620 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1959 if (gl.ConvolutionParameterf)
1960 gl.ConvolutionParameterf (target, pname, params);
1621 1961
1622void 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)
1623 CODE: 1963 CODE:
1624 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1964 if (gl.ConvolutionFilter2D)
1625 (target, internalformat, width, height, format, type, data)); 1965 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626 1966
1627void 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)
1628 CODE: 1968 CODE:
1629 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1969 if (gl.SeparableFilter2D)
1630 (target, internalformat, width, height, format, type, row, column)); 1970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631 1971
1632void 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)
1633 1973
1634void 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)
1635 1975
1636void glRasterPos (int x, int y) 1976void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637 CODE:
1638 glRasterPos2i (x, y);
1639 1977
1640void 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)
1641 1979
1642int glGenTexture () 1980int glGenTexture ()
1643 CODE: 1981 CODE:
1670 2008
1671void glEndList () 2009void glEndList ()
1672 2010
1673void glCallList (int list) 2011void glCallList (int list)
1674 2012
2013

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines