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.85 by root, Fri May 19 03:49:47 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);
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
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 515
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
457 521
458 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 524
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
470 534
471 ++m; 535 ++m;
472 } 536 }
473} 537}
474 538
539char *
540SDL_GetError ()
541
475int 542int
476SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
477 CODE: 544 CODE:
478 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
479 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480 ); 547 );
548 if (RETVAL)
549 {
481 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 }
482 OUTPUT: 555 OUTPUT:
483 RETVAL 556 RETVAL
484 557
485void 558void
486SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
487 563
488void 564void
489SDL_PollEvent () 565SDL_PollEvent ()
490 PPCODE: 566 PPCODE:
491{ 567{
510 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512 break; 588 break;
513 589
514 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
515 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520 break; 598 break;
521 599
522 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
523 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
524 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528 break; 608 break;
532 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 612 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 613 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534 break; 614 break;
535 } 615 }
536 616
537 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538 } 618 }
539} 619}
540 620
541int 621int
542Mix_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)
555 CODE: 635 CODE:
556#ifndef _WIN32 636#ifndef _WIN32
557 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558#endif 638#endif
559 639
560char *
561gl_version ()
562 CODE:
563 RETVAL = (char *)glGetString (GL_VERSION);
564 OUTPUT:
565 RETVAL
566
567char *
568gl_extensions ()
569 CODE:
570 RETVAL = (char *)glGetString (GL_EXTENSIONS);
571 OUTPUT:
572 RETVAL
573
574void 640void
575add_font (char *file) 641add_font (char *file)
576 CODE: 642 CODE:
577 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578#ifdef _WIN32
579 // cairo... sigh... requires win2000
580 AddFontResourceEx (file, FR_PRIVATE, 0);
581#endif
582 644
583void 645void
584load_image_inline (SV *image_) 646load_image_inline (SV *image_)
585 ALIAS: 647 ALIAS:
586 load_image_file = 1 648 load_image_file = 1
628 690
629 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630 692
631 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
632 694
695 SDL_LockSurface (surface2);
633 EXTEND (SP, 5); 696 EXTEND (SP, 6);
634 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
635 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
636 SDL_LockSurface (surface2);
637 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638 SDL_UnlockSurface (surface2);
639 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)));
640 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
642 704
643 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
644 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
645} 707}
646 708
670} 732}
671 733
672void 734void
673error (char *message) 735error (char *message)
674 CODE: 736 CODE:
737 fprintf (stderr, "ERROR: %s\n", message);
675#ifdef _WIN32 738#ifdef _WIN32
676 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 739 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677#else
678 fprintf (stderr, "ERROR: %s\n", message);
679#endif 740#endif
680 741
681void 742void
682fatal (char *message) 743fatal (char *message)
683 CODE: 744 CODE:
745 fprintf (stderr, "FATAL: %s\n", message);
684#ifdef _WIN32 746#ifdef _WIN32
685 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686#else
687 fprintf (stderr, "FATAL: %s\n", message);
688#endif 748#endif
689 exit (1); 749 _exit (1);
690 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
691MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
692 757
693CFClient::Font 758CFPlus::Font
694new_from_file (SV *class, char *path, int id = 0) 759new_from_file (SV *class, char *path, int id = 0)
695 CODE: 760 CODE:
696{ 761{
697 int count; 762 int count;
698 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
701} 766}
702 OUTPUT: 767 OUTPUT:
703 RETVAL 768 RETVAL
704 769
705void 770void
706DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
707 CODE: 772 CODE:
708 pango_font_description_free (self); 773 pango_font_description_free (self);
709 774
710void 775void
711make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
712 CODE: 777 CODE:
713 default_font = self; 778 default_font = self;
714 779
715MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
716 781
717CFClient::Layout 782void
718new (SV *class, int rgba = 0) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
719 CODE: 789 CODE:
720 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
721 791
722 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 792 RETVAL->pl = pango_layout_new (opengl_context);
723 RETVAL->rgba = rgba;
724 RETVAL->r = 1.; 793 RETVAL->r = 1.;
725 RETVAL->g = 1.; 794 RETVAL->g = 1.;
726 RETVAL->b = 1.; 795 RETVAL->b = 1.;
727 RETVAL->a = 1.; 796 RETVAL->a = 1.;
728 RETVAL->base_height = MIN_FONT_HEIGHT; 797 RETVAL->base_height = MIN_FONT_HEIGHT;
732 layout_update_font (RETVAL); 801 layout_update_font (RETVAL);
733 OUTPUT: 802 OUTPUT:
734 RETVAL 803 RETVAL
735 804
736void 805void
737DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
738 CODE: 807 CODE:
739 g_object_unref (self->pl); 808 g_object_unref (self->pl);
740 Safefree (self); 809 Safefree (self);
741 810
742int
743is_rgba (CFClient::Layout self)
744 CODE:
745 RETVAL = self->rgba;
746 OUTPUT:
747 RETVAL
748
749void 811void
750set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
751 CODE: 813 CODE:
752{ 814{
753 STRLEN textlen; 815 STRLEN textlen;
754 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
755 817
756 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
757} 819}
758 820
759void 821void
760set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
761 CODE: 823 CODE:
762{ 824{
763 STRLEN textlen; 825 STRLEN textlen;
764 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
765 827
766 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
767} 829}
768 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
769SV * 916SV *
770get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
771 CODE: 918 CODE:
772 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
774 OUTPUT: 921 OUTPUT:
775 RETVAL 922 RETVAL
776 923
777void 924void
778set_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.)
779 CODE: 926 CODE:
780 self->r = r; 927 self->r = r;
781 self->g = g; 928 self->g = g;
782 self->b = b; 929 self->b = b;
783 self->a = a; 930 self->a = a;
784 931
785void 932void
786set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
787 CODE: 934 CODE:
788 if (self->font != font) 935 if (self->font != font)
789 { 936 {
790 self->font = font; 937 self->font = font;
791 layout_update_font (self); 938 layout_update_font (self);
792 } 939 }
793 940
794void 941void
795set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
796 CODE: 943 CODE:
797 if (self->base_height != base_height) 944 if (self->base_height != base_height)
798 { 945 {
799 self->base_height = base_height; 946 self->base_height = base_height;
800 layout_update_font (self); 947 layout_update_font (self);
801 } 948 }
802 949
803void 950void
804set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
805 CODE: 952 CODE:
806 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);
807 954
808void 955void
809set_indent (CFClient::Layout self, int indent) 956set_indent (CFPlus::Layout self, int indent)
810 CODE: 957 CODE:
811 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 958 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812 959
813void 960void
814set_spacing (CFClient::Layout self, int spacing) 961set_spacing (CFPlus::Layout self, int spacing)
815 CODE: 962 CODE:
816 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 963 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817 964
818void 965void
819set_ellipsise (CFClient::Layout self, int ellipsise) 966set_ellipsise (CFPlus::Layout self, int ellipsise)
820 CODE: 967 CODE:
821 pango_layout_set_ellipsize (self->pl, 968 pango_layout_set_ellipsize (self->pl,
822 ellipsise == 1 ? PANGO_ELLIPSIZE_START 969 ellipsise == 1 ? PANGO_ELLIPSIZE_START
823 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 970 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 971 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
825 : PANGO_ELLIPSIZE_NONE 972 : PANGO_ELLIPSIZE_NONE
826 ); 973 );
827 974
828void 975void
829set_single_paragraph_mode (CFClient::Layout self, int spm) 976set_single_paragraph_mode (CFPlus::Layout self, int spm)
830 CODE: 977 CODE:
831 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 978 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
832 979
833void 980void
834size (CFClient::Layout self) 981size (CFPlus::Layout self)
835 PPCODE: 982 PPCODE:
836{ 983{
837 int w, h; 984 int w, h;
838 985
839 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
842 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
843 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
844} 991}
845 992
846int 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
847xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
848 CODE: 1007 CODE:
849{ 1008{
850 int index, trailing; 1009 int index, trailing;
851 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);
852 RETVAL = index; 1011 RETVAL = index;
853} 1012}
854 OUTPUT: 1013 OUTPUT:
855 RETVAL 1014 RETVAL
856 1015
857void 1016void
858cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
859 PPCODE: 1018 PPCODE:
860{ 1019{
861 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
862 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
863 1022
866 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
867 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
868} 1027}
869 1028
870void 1029void
871render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y)
872 PPCODE: 1031 PPCODE:
873{ 1032 pango_opengl_render_layout_subpixel (
874 SV *retval; 1033 self->pl,
875 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a
1036 );
876 1037
877 layout_get_pixel_size (self, &w, &h); 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
878 1039
879 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)
880 { 1048 {
881 cairo_surface_t *surface; 1049 int nw = minpot (ow);
882 cairo_t *cairo; 1050 int nh = minpot (oh);
883 1051
884 retval = newSV (w * h * 4); 1052 if (nw != ow || nh != oh)
885 SvPOK_only (retval);
886 SvCUR_set (retval, w * h * 4);
887
888 memset (SvPVX (retval), 0, w * h * 4);
889
890 surface = cairo_image_surface_create_for_data (
891 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
892 cairo = cairo_create (surface);
893 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
894
895 pango_cairo_show_layout (cairo, self->pl);
896
897 cairo_destroy (cairo);
898 cairo_surface_destroy (surface);
899
900 // what a mess, and its premultiplied, too :(
901 { 1053 {
902 uint32_t *p = (uint32_t *)SvPVX (retval); 1054 if (SvOK (data_))
903 uint32_t *e = p + w * h;
904
905 while (p < e)
906 { 1055 {
907 uint32_t rgba = *p; 1056 STRLEN datalen;
908 rgba = (rgba >> 24) | (rgba << 8); 1057 char *data = SvPVbyte (data_, datalen);
909 rgba = SDL_SwapBE32 (rgba); 1058 int bpp = datalen / (ow * oh);
910 *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_);
911 } 1069 }
1070
1071 sv_setiv (w_, nw);
1072 sv_setiv (h_, nh);
912 } 1073 }
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_RGBA)));
919 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
920 } 1074 }
921 else
922 {
923 FT_Bitmap bitmap;
924
925 retval = newSV (w * h);
926 SvPOK_only (retval);
927 SvCUR_set (retval, w * h);
928
929 bitmap.rows = h;
930 bitmap.width = w;
931 bitmap.pitch = w;
932 bitmap.buffer = (unsigned char*)SvPVX (retval);
933 bitmap.num_grays = 256;
934 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
935
936 memset (bitmap.buffer, 0, w * h);
937
938 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
939
940 EXTEND (SP, 5);
941 PUSHs (sv_2mortal (newSViv (w)));
942 PUSHs (sv_2mortal (newSViv (h)));
943 PUSHs (sv_2mortal (retval));
944 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
946 }
947} 1075}
948 1076
949MODULE = CFClient PACKAGE = CFClient::Texture
950
951void 1077void
952draw_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.)
953 PROTOTYPE: $$$;$$ 1079 PROTOTYPE: $$$;$$
954 ALIAS: 1080 ALIAS:
955 draw_quad_alpha = 1 1081 draw_quad_alpha = 1
956 draw_quad_alpha_premultiplied = 2 1082 draw_quad_alpha_premultiplied = 2
957 CODE: 1083 CODE:
958{ 1084{
959 HV *hv = (HV *)SvRV (self); 1085 HV *hv = (HV *)SvRV (self);
960 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1086 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1087 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1088 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964 1089
965 if (items < 5) 1090 if (items < 5)
966 { 1091 {
967 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1092 w = SvNV (*hv_fetch (hv, "w", 1, 1));
968 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1093 h = SvNV (*hv_fetch (hv, "h", 1, 1));
969 } 1094 }
970 1095
971 if (ix) 1096 if (ix)
972 { 1097 {
973 glEnable (GL_BLEND); 1098 glEnable (GL_BLEND);
1099
1100 if (ix == 2)
974 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);
975 } 1108 }
976 1109
977 glBindTexture (GL_TEXTURE_2D, name); 1110 glBindTexture (GL_TEXTURE_2D, name);
978
979 if (wrap_mode)
980 {
981 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983 }
984 1111
985 glBegin (GL_QUADS); 1112 glBegin (GL_QUADS);
986 glTexCoord2f (0, 0); glVertex2f (x , y ); 1113 glTexCoord2f (0, 0); glVertex2f (x , y );
987 glTexCoord2f (0, t); glVertex2f (x , y + h); 1114 glTexCoord2f (0, t); glVertex2f (x , y + h);
988 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1115 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1116 glTexCoord2f (s, 0); glVertex2f (x + w, y );
990 glEnd (); 1117 glEnd ();
991 1118
992 if (ix) 1119 if (ix)
1120 {
1121 glDisable (GL_ALPHA_TEST);
993 glDisable (GL_BLEND); 1122 glDisable (GL_BLEND);
1123 }
994} 1124}
995 1125
996MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
997 1127
998CFClient::Map 1128CFPlus::Map
999new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
1000 CODE: 1130 CODE:
1001 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
1002 RETVAL->x = 0; 1132 RETVAL->x = 0;
1003 RETVAL->y = 0; 1133 RETVAL->y = 0;
1013 RETVAL->row = 0; 1143 RETVAL->row = 0;
1014 OUTPUT: 1144 OUTPUT:
1015 RETVAL 1145 RETVAL
1016 1146
1017void 1147void
1018DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
1019 CODE: 1149 CODE:
1020{ 1150{
1021 map_clear (self); 1151 map_clear (self);
1022 Safefree (self->face); 1152 Safefree (self->face);
1153 Safefree (self->tex);
1023 Safefree (self); 1154 Safefree (self);
1024} 1155}
1025 1156
1026void 1157void
1027clear (CFClient::Map self) 1158clear (CFPlus::Map self)
1028 CODE: 1159 CODE:
1029 map_clear (self); 1160 map_clear (self);
1030 1161
1031void 1162void
1032set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
1033 CODE: 1164 CODE:
1034{ 1165{
1035 while (self->faces <= face) 1166 while (self->faces <= face)
1036 { 1167 {
1037 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
1040 1171
1041 self->face [face] = texid; 1172 self->face [face] = texid;
1042} 1173}
1043 1174
1044void 1175void
1045set_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)
1046 CODE: 1177 CODE:
1047{ 1178{
1048 while (self->texs <= texid) 1179 while (self->texs <= texid)
1049 { 1180 {
1050 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
1062 tex->r = r; 1193 tex->r = r;
1063 tex->g = g; 1194 tex->g = g;
1064 tex->b = b; 1195 tex->b = b;
1065 tex->a = a; 1196 tex->a = a;
1066 } 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);
1067} 1207}
1068 1208
1069int 1209int
1070ox (CFClient::Map self) 1210ox (CFPlus::Map self)
1071 ALIAS: 1211 ALIAS:
1072 oy = 1 1212 oy = 1
1213 x = 2
1214 y = 3
1215 w = 4
1216 h = 5
1073 CODE: 1217 CODE:
1074 switch (ix) 1218 switch (ix)
1075 { 1219 {
1076 case 0: RETVAL = self->ox; break; 1220 case 0: RETVAL = self->ox; break;
1077 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;
1078 } 1226 }
1079 OUTPUT: 1227 OUTPUT:
1080 RETVAL 1228 RETVAL
1081 1229
1082void 1230void
1083scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
1084 CODE: 1232 CODE:
1085{ 1233{
1086 if (dx > 0) 1234 if (dx > 0)
1087 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
1088 else if (dx < 0) 1236 else if (dx < 0)
1104 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
1105 } 1253 }
1106} 1254}
1107 1255
1108void 1256void
1109map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
1110 CODE: 1258 CODE:
1111{ 1259{
1112 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1113 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
1114 mapcell *cell; 1262 mapcell *cell;
1116 1264
1117 while (data < data_end) 1265 while (data < data_end)
1118 { 1266 {
1119 flags = (data [0] << 8) + data [1]; data += 2; 1267 flags = (data [0] << 8) + data [1]; data += 2;
1120 1268
1121 x = ((flags >> 10) & 63) + self->x; 1269 x = self->x + ((flags >> 10) & 63);
1122 y = ((flags >> 4) & 63) + self->y; 1270 y = self->y + ((flags >> 4) & 63);
1123 1271
1124 cell = map_get_cell (self, x, y); 1272 cell = map_get_cell (self, x, y);
1125 1273
1126 if (flags & 15) 1274 if (flags & 15)
1127 { 1275 {
1156 cell->darkness = -1; 1304 cell->darkness = -1;
1157 } 1305 }
1158} 1306}
1159 1307
1160SV * 1308SV *
1161mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1162 CODE: 1310 CODE:
1163{ 1311{
1164 int x1, x; 1312 int x1, x;
1165 int y1, y; 1313 int y1, y;
1166 int z; 1314 int z;
1216} 1364}
1217 OUTPUT: 1365 OUTPUT:
1218 RETVAL 1366 RETVAL
1219 1367
1220void 1368void
1221draw (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)
1222 PPCODE: 1370 CODE:
1223{ 1371{
1224 int vx, vy; 1372 int vx, vy;
1225 int x, y, z; 1373 int x, y, z;
1226 int last_name; 1374 int last_name;
1227 mapface face; 1375 mapface face;
1228 int sw4 = (sw + 3) & ~3;
1229 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1230 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1231 1376
1232 memset (darkness, 255, sw4 * sh);
1233 SvPOK_only (darkness_sv);
1234 SvCUR_set (darkness_sv, sw4 * sh);
1235
1236 vx = self->x + (self->w - sw) / 2 - shift_x; 1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1237 vy = self->y + (self->h - sh) / 2 - shift_y; 1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1238 1379
1239 /* 1380 /*
1240 int vx = self->vx = self->w >= sw 1381 int vx = self->vx = self->w >= sw
1241 ? self->x + (self->w - sw) / 2 1382 ? self->x + (self->w - sw) / 2
1242 : 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));
1246 : 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));
1247 */ 1388 */
1248 1389
1249 glColor4ub (255, 255, 255, 255); 1390 glColor4ub (255, 255, 255, 255);
1250 1391
1392 glEnable (GL_BLEND);
1251 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252 glEnable (GL_BLEND);
1253 glEnable (GL_TEXTURE_2D); 1394 glEnable (GL_TEXTURE_2D);
1254 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1395 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255 1396
1256 glBegin (GL_QUADS); 1397 glBegin (GL_QUADS);
1257 1398
1265 1406
1266 for (x = 0; x < sw; x++) 1407 for (x = 0; x < sw; x++)
1267 if (row->c0 <= x + vx && x + vx < row->c1) 1408 if (row->c0 <= x + vx && x + vx < row->c1)
1268 { 1409 {
1269 mapcell *cell = row->col + (x + vx - row->c0); 1410 mapcell *cell = row->col + (x + vx - row->c0);
1270
1271 darkness[y * sw4 + x] = cell->darkness < 0
1272 ? 255 - FOW_DARKNESS
1273 : 255 - cell->darkness;
1274 1411
1275 face = cell->face [z]; 1412 face = cell->face [z];
1276 1413
1277 if (face) 1414 if (face)
1278 { 1415 {
1299 1436
1300 glEnd (); 1437 glEnd ();
1301 1438
1302 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1303 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 }
1304 1535
1305 EXTEND (SP, 3); 1536 EXTEND (SP, 3);
1306 PUSHs (sv_2mortal (newSViv (sw4))); 1537 PUSHs (sv_2mortal (newSViv (sw4)));
1307 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1308 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1309} 1540}
1310 1541
1311SV * 1542SV *
1312get_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)
1313 CODE: 1544 CODE:
1314{ 1545{
1315 int x, y, x1, y1; 1546 int x, y, x1, y1;
1316 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1317 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1379} 1610}
1380 OUTPUT: 1611 OUTPUT:
1381 RETVAL 1612 RETVAL
1382 1613
1383void 1614void
1384set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1385 PPCODE: 1616 PPCODE:
1386{ 1617{
1387 int x, y, z; 1618 int x, y, z;
1388 int w, h; 1619 int w, h;
1389 int x1, y1; 1620 int x1, y1;
1438 } 1669 }
1439 } 1670 }
1440 } 1671 }
1441} 1672}
1442 1673
1443MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1444 1675
1445CFClient::MixChunk 1676CFPlus::MixChunk
1446new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1447 CODE: 1678 CODE:
1448 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1449 OUTPUT: 1680 OUTPUT:
1450 RETVAL 1681 RETVAL
1451 1682
1452void 1683void
1453DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1454 CODE: 1685 CODE:
1455 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1456 1687
1457int 1688int
1458volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1459 CODE: 1690 CODE:
1460 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1461 OUTPUT: 1692 OUTPUT:
1462 RETVAL 1693 RETVAL
1463 1694
1464int 1695int
1465play (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)
1466 CODE: 1697 CODE:
1467 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1468 OUTPUT: 1699 OUTPUT:
1469 RETVAL 1700 RETVAL
1470 1701
1471MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1472 1703
1473int 1704int
1474volume (int volume = -1) 1705volume (int volume = -1)
1475 CODE: 1706 CODE:
1476 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1477 OUTPUT: 1708 OUTPUT:
1478 RETVAL 1709 RETVAL
1479 1710
1480CFClient::MixMusic 1711CFPlus::MixMusic
1481new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1482 CODE: 1713 CODE:
1483 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1484 OUTPUT: 1715 OUTPUT:
1485 RETVAL 1716 RETVAL
1486 1717
1487void 1718void
1488DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1489 CODE: 1720 CODE:
1490 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1491 1722
1492int 1723int
1493play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1494 CODE: 1725 CODE:
1495 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1496 OUTPUT: 1727 OUTPUT:
1497 RETVAL 1728 RETVAL
1498 1729
1499MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1500 1731
1501BOOT: 1732BOOT:
1502{ 1733{
1503 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1504 static const struct { 1735 static const struct {
1505 const char *name; 1736 const char *name;
1506 IV iv; 1737 IV iv;
1507 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1508# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }
1509 const_iv (GL_COLOR_MATERIAL), 1740 const_iv (GL_COLOR_MATERIAL),
1510 const_iv (GL_SMOOTH), 1741 const_iv (GL_SMOOTH),
1511 const_iv (GL_FLAT), 1742 const_iv (GL_FLAT),
1512 const_iv (GL_DITHER), 1743 const_iv (GL_DITHER),
1513 const_iv (GL_BLEND), 1744 const_iv (GL_BLEND),
1745 const_iv (GL_CULL_FACE),
1514 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),
1515 const_iv (GL_AND), 1753 const_iv (GL_AND),
1516 const_iv (GL_ONE), 1754 const_iv (GL_ONE),
1517 const_iv (GL_ZERO), 1755 const_iv (GL_ZERO),
1518 const_iv (GL_SRC_ALPHA), 1756 const_iv (GL_SRC_ALPHA),
1519 const_iv (GL_SRC_ALPHA_SATURATE), 1757 const_iv (GL_DST_ALPHA),
1520 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1758 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521 const_iv (GL_ONE_MINUS_DST_ALPHA), 1759 const_iv (GL_ONE_MINUS_DST_ALPHA),
1760 const_iv (GL_SRC_ALPHA_SATURATE),
1522 const_iv (GL_RGB), 1761 const_iv (GL_RGB),
1523 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),
1524 const_iv (GL_UNSIGNED_BYTE), 1766 const_iv (GL_UNSIGNED_BYTE),
1767 const_iv (GL_UNSIGNED_SHORT),
1768 const_iv (GL_UNSIGNED_INT),
1525 const_iv (GL_ALPHA), 1769 const_iv (GL_ALPHA),
1770 const_iv (GL_INTENSITY),
1526 const_iv (GL_LUMINANCE), 1771 const_iv (GL_LUMINANCE),
1772 const_iv (GL_LUMINANCE_ALPHA),
1527 const_iv (GL_FLOAT), 1773 const_iv (GL_FLOAT),
1528 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1774 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529 const_iv (GL_COMPILE), 1775 const_iv (GL_COMPILE),
1530 const_iv (GL_TEXTURE_1D), 1776 const_iv (GL_TEXTURE_1D),
1531 const_iv (GL_TEXTURE_2D), 1777 const_iv (GL_TEXTURE_2D),
1533 const_iv (GL_TEXTURE_MAG_FILTER), 1779 const_iv (GL_TEXTURE_MAG_FILTER),
1534 const_iv (GL_TEXTURE_MIN_FILTER), 1780 const_iv (GL_TEXTURE_MIN_FILTER),
1535 const_iv (GL_TEXTURE_ENV_MODE), 1781 const_iv (GL_TEXTURE_ENV_MODE),
1536 const_iv (GL_TEXTURE_WRAP_S), 1782 const_iv (GL_TEXTURE_WRAP_S),
1537 const_iv (GL_TEXTURE_WRAP_T), 1783 const_iv (GL_TEXTURE_WRAP_T),
1784 const_iv (GL_REPEAT),
1538 const_iv (GL_CLAMP), 1785 const_iv (GL_CLAMP),
1539 const_iv (GL_REPEAT), 1786 const_iv (GL_CLAMP_TO_EDGE),
1540 const_iv (GL_NEAREST), 1787 const_iv (GL_NEAREST),
1541 const_iv (GL_LINEAR), 1788 const_iv (GL_LINEAR),
1542 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1789 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1790 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1791 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1792 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546 const_iv (GL_GENERATE_MIPMAP), 1793 const_iv (GL_GENERATE_MIPMAP),
1547 const_iv (GL_MODULATE), 1794 const_iv (GL_MODULATE),
1548 const_iv (GL_DECAL), 1795 const_iv (GL_DECAL),
1549 const_iv (GL_REPLACE), 1796 const_iv (GL_REPLACE),
1797 const_iv (GL_DEPTH_BUFFER_BIT),
1550 const_iv (GL_COLOR_BUFFER_BIT), 1798 const_iv (GL_COLOR_BUFFER_BIT),
1551 const_iv (GL_PROJECTION), 1799 const_iv (GL_PROJECTION),
1552 const_iv (GL_MODELVIEW), 1800 const_iv (GL_MODELVIEW),
1553 const_iv (GL_COLOR_LOGIC_OP), 1801 const_iv (GL_COLOR_LOGIC_OP),
1554 const_iv (GL_SEPARABLE_2D), 1802 const_iv (GL_SEPARABLE_2D),
1555 const_iv (GL_CONVOLUTION_2D), 1803 const_iv (GL_CONVOLUTION_2D),
1556 const_iv (GL_CONVOLUTION_BORDER_MODE), 1804 const_iv (GL_CONVOLUTION_BORDER_MODE),
1557 const_iv (GL_CONSTANT_BORDER), 1805 const_iv (GL_CONSTANT_BORDER),
1558 const_iv (GL_LINES), 1806 const_iv (GL_LINES),
1807 const_iv (GL_LINE_LOOP),
1559 const_iv (GL_QUADS), 1808 const_iv (GL_QUADS),
1560 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),
1561 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1813 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562 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),
1563# undef const_iv 1819# undef const_iv
1564 }; 1820 };
1565 1821
1566 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; )
1567 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1823 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568} 1824}
1569 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
1570int glGetError () 1847int glGetError ()
1848
1849void glFinish ()
1571 1850
1572void glClear (int mask) 1851void glClear (int mask)
1573 1852
1574void glClearColor (float r, float g, float b, float a = 1.0) 1853void glClearColor (float r, float g, float b, float a = 1.0)
1575 PROTOTYPE: @ 1854 PROTOTYPE: @
1582 1861
1583void glHint (int target, int mode) 1862void glHint (int target, int mode)
1584 1863
1585void glBlendFunc (int sfactor, int dfactor) 1864void glBlendFunc (int sfactor, int dfactor)
1586 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
1587void glLogicOp (int opcode) 1872void glLogicOp (int opcode)
1588 1873
1589void glColorMask (int red, int green, int blue, int alpha) 1874void glColorMask (int red, int green, int blue, int alpha)
1590 1875
1591void glMatrixMode (int mode) 1876void glMatrixMode (int mode)
1594 1879
1595void glPopMatrix () 1880void glPopMatrix ()
1596 1881
1597void glLoadIdentity () 1882void glLoadIdentity ()
1598 1883
1884void glDrawBuffer (int buffer)
1885
1886void glReadBuffer (int buffer)
1887
1599# 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
1600void 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_)
1601 1893
1602void glViewport (int x, int y, int width, int height) 1894void glViewport (int x, int y, int width, int height)
1603 1895
1604void glScissor (int x, int y, int width, int height) 1896void glScissor (int x, int y, int width, int height)
1619 1911
1620void glEnd () 1912void glEnd ()
1621 1913
1622void glColor (float r, float g, float b, float a = 1.0) 1914void glColor (float r, float g, float b, float a = 1.0)
1623 PROTOTYPE: @ 1915 PROTOTYPE: @
1916 ALIAS:
1917 glColor_premultiply = 1
1624 CODE: 1918 CODE:
1625 glColor4ub (MIN ((int)(r * 255.f), 255), 1919 if (ix)
1626 MIN ((int)(g * 255.f), 255), 1920 {
1627 MIN ((int)(b * 255.f), 255), 1921 r *= a;
1628 MIN ((int)(a * 255.f), 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);
1629 1938
1630void glVertex (float x, float y, float z = 0.) 1939void glVertex (float x, float y, float z = 0.)
1631 CODE: 1940 CODE:
1632 glVertex3f (x, y, z); 1941 glVertex3f (x, y, z);
1633 1942
1645 1954
1646void glBindTexture (int target, int name) 1955void glBindTexture (int target, int name)
1647 1956
1648void glConvolutionParameter (int target, int pname, float params) 1957void glConvolutionParameter (int target, int pname, float params)
1649 CODE: 1958 CODE:
1650 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1959 if (gl.ConvolutionParameterf)
1960 gl.ConvolutionParameterf (target, pname, params);
1651 1961
1652void 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)
1653 CODE: 1963 CODE:
1654 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1964 if (gl.ConvolutionFilter2D)
1655 (target, internalformat, width, height, format, type, data)); 1965 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656 1966
1657void 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)
1658 CODE: 1968 CODE:
1659 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1969 if (gl.SeparableFilter2D)
1660 (target, internalformat, width, height, format, type, row, column)); 1970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661 1971
1662void 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)
1663 1973
1664void 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)
1665 1975
1666void glRasterPos (int x, int y) 1976void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667 CODE:
1668 glRasterPos2i (x, y);
1669 1977
1670void 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)
1671 1979
1672int glGenTexture () 1980int glGenTexture ()
1673 CODE: 1981 CODE:
1700 2008
1701void glEndList () 2009void glEndList ()
1702 2010
1703void glCallList (int list) 2011void glCallList (int list)
1704 2012
2013

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines