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.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines