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.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 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{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
114 153
115 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 156
118 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
119} 162}
120 163
121typedef uint16_t mapface; 164typedef uint16_t mapface;
122 165
123typedef struct { 166typedef struct {
126 float s, t; 169 float s, t;
127 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
128} maptex; 171} maptex;
129 172
130typedef struct { 173typedef struct {
131 int16_t darkness; 174 uint16_t darkness;
132 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
133} mapcell; 177} mapcell;
134 178
135typedef struct { 179typedef struct {
136 int32_t c0, c1; 180 int32_t c0, c1;
137 mapcell *col; 181 mapcell *col;
146 int texs; 190 int texs;
147 maptex *tex; 191 maptex *tex;
148 192
149 int32_t rows; 193 int32_t rows;
150 maprow *row; 194 maprow *row;
151} *CFClient__Map; 195} *CFPlus__Map;
152 196
153static char * 197static char *
154prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
155{ 199{
156 char *p; 200 char *p;
174 218
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#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)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 221
178static maprow * 222static maprow *
179map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
180{ 224{
181 if (0 > y) 225 if (0 > y)
182 { 226 {
183 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
222 266
223 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
224} 268}
225 269
226static mapcell * 270static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
228{ 272{
229 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
230} 274}
231 275
232static void 276static void
233map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
234{ 278{
235 int r; 279 int r;
236 280
237 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
246 self->row = 0; 290 self->row = 0;
247 self->rows = 0; 291 self->rows = 0;
248} 292}
249 293
250static void 294static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 296{
253 int x, y; 297 int x, y;
254 maprow *row; 298 maprow *row;
255 299
256 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
265 if (x >= row->c0) 309 if (x >= row->c0)
266 { 310 {
267 if (x >= row->c1) 311 if (x >= row->c1)
268 break; 312 break;
269 313
270 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
271 } 315 }
272 } 316 }
273} 317}
274 318
275static void 319static void
296 ev.data2 = 0; 340 ev.data2 = 0;
297 341
298 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
299} 343}
300 344
345static unsigned int
346minpot (unsigned int n)
347{
348 if (!n)
349 return 0;
350
351 --n;
352
353 n |= n >> 1;
354 n |= n >> 2;
355 n |= n >> 4;
356 n |= n >> 8;
357 n |= n >> 16;
358
359 return n + 1;
360}
361
301MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
302 363
303PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
304 365
305BOOT: 366BOOT:
306{ 367{
307 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 369 static const struct {
309 const char *name; 370 const char *name;
310 IV iv; 371 IV iv;
311 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
413 474
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 477}
417 478
479int
480in_destruct ()
481 CODE:
482 RETVAL = PL_main_cv == Nullcv;
483 OUTPUT:
484 RETVAL
485
486NV floor (NV x)
487
488NV ceil (NV x)
489
418void 490void
419pango_init () 491pango_init ()
420 CODE: 492 CODE:
421{ 493{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 495 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); 496 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} 497}
430 498
431int 499int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 501
434void 502void
435SDL_Quit () 503SDL_Quit ()
436 504
437void 505void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 515
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 518
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 523
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
457 529
458 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 532
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 551SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 552 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 553 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 555 );
556 if (RETVAL)
557 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 558 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
559# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
560# include "glfunc.h"
561# undef GL_FUNC
562 }
485 OUTPUT: 563 OUTPUT:
486 RETVAL 564 RETVAL
487 565
488void 566void
489SDL_GL_SwapBuffers () 567SDL_GL_SwapBuffers ()
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 622 break;
545 } 623 }
546 624
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 626 }
549} 627}
550 628
551int 629int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 630Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
565 CODE: 643 CODE:
566#ifndef _WIN32 644#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 646#endif
569 647
570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_version ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_VERSION);
581 OUTPUT:
582 RETVAL
583
584char *
585gl_extensions ()
586 CODE:
587 RETVAL = (char *)glGetString (GL_EXTENSIONS);
588 OUTPUT:
589 RETVAL
590
591void 648void
592add_font (char *file) 649add_font (char *file)
593 CODE: 650 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 652
600void 653void
601load_image_inline (SV *image_) 654load_image_inline (SV *image_)
602 ALIAS: 655 ALIAS:
603 load_image_file = 1 656 load_image_file = 1
645 698
646 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647 700
648 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
649 702
703 SDL_LockSurface (surface2);
650 EXTEND (SP, 5); 704 EXTEND (SP, 6);
651 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
652 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
653 SDL_LockSurface (surface2);
654 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655 SDL_UnlockSurface (surface2);
656 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
659 712
660 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
661 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
662} 715}
663 716
699 CODE: 752 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 754#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 756#endif
704 exit (1); 757 _exit (1);
705 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
706MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
707 765
708CFClient::Font 766CFPlus::Font
709new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
710 CODE: 768 CODE:
711{ 769{
712 int count; 770 int count;
713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
716} 774}
717 OUTPUT: 775 OUTPUT:
718 RETVAL 776 RETVAL
719 777
720void 778void
721DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
722 CODE: 780 CODE:
723 pango_font_description_free (self); 781 pango_font_description_free (self);
724 782
725void 783void
726make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
727 CODE: 785 CODE:
728 default_font = self; 786 default_font = self;
729 787
730MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
731 789
732CFClient::Layout 790void
733new (SV *class, int rgba = 0) 791reset_glyph_cache ()
734 CODE: 792 CODE:
735#if _WIN32 793 tc_clear ();
736 rgba = 0;//D 794
737#endif 795CFPlus::Layout
796new (SV *class)
797 CODE:
738 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
739 799
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 801 RETVAL->r = 1.;
743 RETVAL->g = 1.; 802 RETVAL->g = 1.;
744 RETVAL->b = 1.; 803 RETVAL->b = 1.;
745 RETVAL->a = 1.; 804 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
750 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
751 OUTPUT: 810 OUTPUT:
752 RETVAL 811 RETVAL
753 812
754void 813void
755DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
756 CODE: 815 CODE:
757 g_object_unref (self->pl); 816 g_object_unref (self->pl);
758 Safefree (self); 817 Safefree (self);
759 818
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 819void
768set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
769 CODE: 821 CODE:
770{ 822{
771 STRLEN textlen; 823 STRLEN textlen;
772 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
773 825
774 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
775} 827}
776 828
777void 829void
778set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
779 CODE: 831 CODE:
780{ 832{
781 STRLEN textlen; 833 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
783 835
784 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
785} 837}
786 838
839void
840set_shapes (CFPlus::Layout self, ...)
841 CODE:
842{
843 PangoAttrList *attrs = 0;
844 const char *text = pango_layout_get_text (self->pl);
845 const char *pos = text;
846 int arg = 4;
847
848 while (arg < items && (pos = strstr (pos, OBJ_STR)))
849 {
850 PangoRectangle inkrect, rect;
851 PangoAttribute *attr;
852
853 int x = SvIV (ST (arg - 3));
854 int y = SvIV (ST (arg - 2));
855 int w = SvIV (ST (arg - 1));
856 int h = SvIV (ST (arg ));
857
858 inkrect.x = 0;
859 inkrect.y = 0;
860 inkrect.width = 0;
861 inkrect.height = 0;
862
863 rect.x = x * PANGO_SCALE;
864 rect.y = y * PANGO_SCALE;
865 rect.width = w * PANGO_SCALE;
866 rect.height = h * PANGO_SCALE;
867
868 if (!attrs)
869 attrs = pango_layout_get_attributes (self->pl);
870
871 attr = pango_attr_shape_new (&inkrect, &rect);
872 attr->start_index = pos - text;
873 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
874 pango_attr_list_insert (attrs, attr);
875
876 arg += 4;
877 pos += sizeof (OBJ_STR) - 1;
878 }
879
880 if (attrs)
881 pango_layout_set_attributes (self->pl, attrs);
882}
883
884void
885get_shapes (CFPlus::Layout self)
886 PPCODE:
887{
888 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
889
890 do
891 {
892 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
893
894 if (run && shape_attr_p (run))
895 {
896 PangoRectangle extents;
897 pango_layout_iter_get_run_extents (iter, 0, &extents);
898
899 EXTEND (SP, 2);
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
902 }
903 }
904 while (pango_layout_iter_next_run (iter));
905
906 pango_layout_iter_free (iter);
907}
908
909int
910has_wrapped (CFPlus::Layout self)
911 CODE:
912{
913 int lines = 1;
914 const char *text = pango_layout_get_text (self->pl);
915
916 while (*text)
917 lines += *text++ == '\n';
918
919 RETVAL = lines < pango_layout_get_line_count (self->pl);
920}
921 OUTPUT:
922 RETVAL
923
787SV * 924SV *
788get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
789 CODE: 926 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
792 OUTPUT: 929 OUTPUT:
793 RETVAL 930 RETVAL
794 931
795void 932void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 933set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797 CODE: 934 CODE:
798 self->r = r; 935 self->r = r;
799 self->g = g; 936 self->g = g;
800 self->b = b; 937 self->b = b;
801 self->a = a; 938 self->a = a;
802 939
803void 940void
804set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805 CODE: 942 CODE:
806 if (self->font != font) 943 if (self->font != font)
807 { 944 {
808 self->font = font; 945 self->font = font;
809 layout_update_font (self); 946 layout_update_font (self);
810 } 947 }
811 948
812void 949void
813set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
814 CODE: 951 CODE:
815 if (self->base_height != base_height) 952 if (self->base_height != base_height)
816 { 953 {
817 self->base_height = base_height; 954 self->base_height = base_height;
818 layout_update_font (self); 955 layout_update_font (self);
819 } 956 }
820 957
821void 958void
822set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
823 CODE: 960 CODE:
824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 961 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825 962
826void 963void
827set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
828 CODE: 965 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830 967
831void 968void
832set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
833 CODE: 970 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835 972
836void 973void
837set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
838 CODE: 975 CODE:
839 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
844 ); 981 );
845 982
846void 983void
847set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
848 CODE: 985 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850 987
851void 988void
852size (CFClient::Layout self) 989size (CFPlus::Layout self)
853 PPCODE: 990 PPCODE:
854{ 991{
855 int w, h; 992 int w, h;
856 993
857 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
860 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
862} 999}
863 1000
864int 1001int
1002descent (CFPlus::Layout self)
1003 CODE:
1004{
1005 PangoRectangle rect;
1006 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1007 pango_layout_line_get_pixel_extents (line, 0, &rect);
1008 RETVAL = PANGO_DESCENT (rect);
1009}
1010 OUTPUT:
1011 RETVAL
1012
1013int
865xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
866 CODE: 1015 CODE:
867{ 1016{
868 int index, trailing; 1017 int index, trailing;
869 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870 RETVAL = index; 1019 RETVAL = index;
871} 1020}
872 OUTPUT: 1021 OUTPUT:
873 RETVAL 1022 RETVAL
874 1023
875void 1024void
876cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
877 PPCODE: 1026 PPCODE:
878{ 1027{
879 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
880 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881 1030
884 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1035}
887 1036
888void 1037void
889render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
890 PPCODE: 1039 PPCODE:
891{ 1040 pango_opengl_render_layout_subpixel (
892 SV *retval; 1041 self->pl,
893 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
894 1046
895 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
896 1048
897 if (self->rgba) 1049void
1050pad2pot (SV *data_, SV *w_, SV *h_)
1051 CODE:
1052{
1053 int ow = SvIV (w_);
1054 int oh = SvIV (h_);
1055
1056 if (ow && oh)
898 { 1057 {
899 cairo_surface_t *surface; 1058 int nw = minpot (ow);
900 cairo_t *cairo; 1059 int nh = minpot (oh);
901 1060
902 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 { 1062 {
920 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 { 1064 {
925 uint32_t rgba = *p; 1065 STRLEN datalen;
926 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
927#if 0 1067 int bpp = datalen / (ow * oh);
928#ifdef _WIN32 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934 1069
935 rgba = (rgba & 0xffffff00) | a; 1070 SvPOK_only (result_);
1071 SvCUR_set (result_, nw * nh * bpp);
1072
1073 memset (SvPVX (result_), 0, nw * nh * bpp);
1074 while (oh--)
1075 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1076
1077 sv_setsv (data_, result_);
936 } 1078 }
937#endif 1079
938#endif 1080 sv_setiv (w_, nw);
939 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
940 *p++ = rgba;
941 } 1082 }
942 }
943
944 EXTEND (SP, 5);
945 PUSHs (sv_2mortal (newSViv (w)));
946 PUSHs (sv_2mortal (newSViv (h)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 } 1083 }
951 else
952 {
953 FT_Bitmap bitmap;
954
955 retval = newSV (w * h);
956 SvPOK_only (retval);
957 SvCUR_set (retval, w * h);
958
959 bitmap.rows = h;
960 bitmap.width = w;
961 bitmap.pitch = w;
962 bitmap.buffer = (unsigned char*)SvPVX (retval);
963 bitmap.num_grays = 256;
964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966 memset (bitmap.buffer, 0, w * h);
967
968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970 EXTEND (SP, 5);
971 PUSHs (sv_2mortal (newSViv (w)));
972 PUSHs (sv_2mortal (newSViv (h)));
973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
977} 1084}
978 1085
979MODULE = CFClient PACKAGE = CFClient::Texture
980
981void 1086void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1087draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
984 ALIAS: 1089 ALIAS:
985 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
987 CODE: 1092 CODE:
988{ 1093{
989 HV *hv = (HV *)SvRV (self); 1094 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1095 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1096 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1097 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1098
995 if (items < 5) 1099 if (items < 5)
996 { 1100 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1101 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1102 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1103 }
1000 1104
1001 if (ix) 1105 if (ix)
1002 { 1106 {
1003 glEnable (GL_BLEND); 1107 glEnable (GL_BLEND);
1108
1109 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1110 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1111 else
1112 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1113 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1114
1005 glEnable (GL_ALPHA_TEST); 1115 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1116 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1117 }
1008 1118
1009 glBindTexture (GL_TEXTURE_2D, name); 1119 glBindTexture (GL_TEXTURE_2D, name);
1010
1011 if (wrap_mode)
1012 {
1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015 }
1016 1120
1017 glBegin (GL_QUADS); 1121 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1122 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1123 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1124 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1026 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1028 } 1132 }
1029} 1133}
1030 1134
1031MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1136
1033CFClient::Map 1137CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1035 CODE: 1139 CODE:
1036 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1141 RETVAL->x = 0;
1038 RETVAL->y = 0; 1142 RETVAL->y = 0;
1048 RETVAL->row = 0; 1152 RETVAL->row = 0;
1049 OUTPUT: 1153 OUTPUT:
1050 RETVAL 1154 RETVAL
1051 1155
1052void 1156void
1053DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1054 CODE: 1158 CODE:
1055{ 1159{
1056 map_clear (self); 1160 map_clear (self);
1057 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1058 Safefree (self); 1163 Safefree (self);
1059} 1164}
1060 1165
1061void 1166void
1062clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1063 CODE: 1168 CODE:
1064 map_clear (self); 1169 map_clear (self);
1065 1170
1066void 1171void
1067set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1173 CODE:
1069{ 1174{
1070 while (self->faces <= face) 1175 while (self->faces <= face)
1071 { 1176 {
1072 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1075 1180
1076 self->face [face] = texid; 1181 self->face [face] = texid;
1077} 1182}
1078 1183
1079void 1184void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1186 CODE:
1082{ 1187{
1083 while (self->texs <= texid) 1188 while (self->texs <= texid)
1084 { 1189 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1097 tex->r = r; 1202 tex->r = r;
1098 tex->g = g; 1203 tex->g = g;
1099 tex->b = b; 1204 tex->b = b;
1100 tex->a = a; 1205 tex->a = a;
1101 } 1206 }
1207
1208 // somewhat hackish, but for textures that require it, it really
1209 // improves the look, and most others don't suffer.
1210 glBindTexture (GL_TEXTURE_2D, name);
1211 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1212 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1213 // use uglier nearest interpolation because linear suffers
1214 // from transparent color bleeding and ugly wrapping effects.
1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102} 1216}
1103 1217
1104int 1218int
1105ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1106 ALIAS: 1220 ALIAS:
1107 oy = 1 1221 oy = 1
1222 x = 2
1223 y = 3
1224 w = 4
1225 h = 5
1108 CODE: 1226 CODE:
1109 switch (ix) 1227 switch (ix)
1110 { 1228 {
1111 case 0: RETVAL = self->ox; break; 1229 case 0: RETVAL = self->ox; break;
1112 case 1: RETVAL = self->oy; break; 1230 case 1: RETVAL = self->oy; break;
1231 case 2: RETVAL = self->x; break;
1232 case 3: RETVAL = self->y; break;
1233 case 4: RETVAL = self->w; break;
1234 case 5: RETVAL = self->h; break;
1113 } 1235 }
1114 OUTPUT: 1236 OUTPUT:
1115 RETVAL 1237 RETVAL
1116 1238
1117void 1239void
1118scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1119 CODE: 1241 CODE:
1120{ 1242{
1121 if (dx > 0) 1243 if (dx > 0)
1122 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1123 else if (dx < 0) 1245 else if (dx < 0)
1139 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1140 } 1262 }
1141} 1263}
1142 1264
1143void 1265void
1144map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1145 CODE: 1267 CODE:
1146{ 1268{
1147 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1148 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1149 mapcell *cell; 1271 mapcell *cell;
1151 1273
1152 while (data < data_end) 1274 while (data < data_end)
1153 { 1275 {
1154 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1155 1277
1156 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1157 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1158 1280
1159 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1160 1282
1161 if (flags & 15) 1283 if (flags & 15)
1162 { 1284 {
1163 if (cell->darkness < 0) 1285 if (!cell->darkness)
1164 { 1286 {
1165 cell->darkness = 0; 1287 cell->darkness = 256;
1166 cell->face [0] = 0; 1288 cell->face [0] = 0;
1167 cell->face [1] = 0; 1289 cell->face [1] = 0;
1168 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1169 } 1292 }
1170 1293
1171 cell->darkness = flags & 8 ? *data++ : 255;
1172
1173 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x7f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 }
1312 while (cmd & 0x80);
1313 }
1314 else
1315 cell->darkness = *data++ + 1;
1316 }
1174 1317
1175 if (flags & 4) 1318 if (flags & 4)
1176 { 1319 {
1177 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1178 } 1321 }
1186 { 1329 {
1187 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1188 } 1331 }
1189 } 1332 }
1190 else 1333 else
1191 cell->darkness = -1; 1334 cell->darkness = 0;
1192 } 1335 }
1193} 1336}
1194 1337
1195SV * 1338SV *
1196mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1197 CODE: 1340 CODE:
1198{ 1341{
1199 int x1, x; 1342 int x1, x;
1200 int y1, y; 1343 int y1, y;
1201 int z; 1344 int z;
1251} 1394}
1252 OUTPUT: 1395 OUTPUT:
1253 RETVAL 1396 RETVAL
1254 1397
1255void 1398void
1256draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1399draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257 PPCODE: 1400 CODE:
1258{ 1401{
1259 int vx, vy; 1402 int vx, vy;
1260 int x, y, z; 1403 int x, y, z;
1261 int last_name; 1404 int last_name;
1262 mapface face; 1405 mapface face;
1263 int sw4 = (sw + 3) & ~3;
1264 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1265 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1266 1406
1267 memset (darkness, 255, sw4 * sh);
1268 SvPOK_only (darkness_sv);
1269 SvCUR_set (darkness_sv, sw4 * sh);
1270
1271 vx = self->x + (self->w - sw) / 2 - shift_x; 1407 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272 vy = self->y + (self->h - sh) / 2 - shift_y; 1408 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273 1409
1274 /* 1410 /*
1275 int vx = self->vx = self->w >= sw 1411 int vx = self->vx = self->w >= sw
1276 ? self->x + (self->w - sw) / 2 1412 ? self->x + (self->w - sw) / 2
1277 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1413 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1417 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282 */ 1418 */
1283 1419
1284 glColor4ub (255, 255, 255, 255); 1420 glColor4ub (255, 255, 255, 255);
1285 1421
1422 glEnable (GL_BLEND);
1286 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1423 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287 glEnable (GL_BLEND);
1288 glEnable (GL_TEXTURE_2D); 1424 glEnable (GL_TEXTURE_2D);
1289 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1425 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290 1426
1291 glBegin (GL_QUADS); 1427 glBegin (GL_QUADS);
1292 1428
1300 1436
1301 for (x = 0; x < sw; x++) 1437 for (x = 0; x < sw; x++)
1302 if (row->c0 <= x + vx && x + vx < row->c1) 1438 if (row->c0 <= x + vx && x + vx < row->c1)
1303 { 1439 {
1304 mapcell *cell = row->col + (x + vx - row->c0); 1440 mapcell *cell = row->col + (x + vx - row->c0);
1305
1306 darkness[y * sw4 + x] = cell->darkness < 0
1307 ? 255 - FOW_DARKNESS
1308 : 255 - cell->darkness;
1309 1441
1310 face = cell->face [z]; 1442 face = cell->face [z];
1311 1443
1312 if (face) 1444 if (face)
1313 { 1445 {
1335 glEnd (); 1467 glEnd ();
1336 1468
1337 glDisable (GL_TEXTURE_2D); 1469 glDisable (GL_TEXTURE_2D);
1338 glDisable (GL_BLEND); 1470 glDisable (GL_BLEND);
1339 1471
1472 for (y = 0; y < sh; y++)
1473 if (0 <= y + vy && y + vy < self->rows)
1474 {
1475 maprow *row = self->row + (y + vy);
1476
1477 for (x = 0; x < sw; x++)
1478 if (row->c0 <= x + vx && x + vx < row->c1)
1479 {
1480 mapcell *cell = row->col + (x + vx - row->c0);
1481
1482 int px = x * 32;
1483 int py = y * 32;
1484
1485 if (cell->stat_hp)
1486 {
1487 glColor3ub (0, 0, 0);
1488 glRectf (px + 1, py + 1, px + 31, py + 4);
1489
1490 glColor3ub (0, 255, 0);
1491 glBegin (GL_LINES);
1492 glVertex2f (px + 2, py + 2.5f);
1493 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1494 glEnd ();
1495 }
1496 }
1497 }
1498}
1499
1500void
1501draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1502 CODE:
1503{
1504 static float color[16][3] = {
1505 { 0.00F, 0.00F, 0.00F },
1506 { 1.00F, 1.00F, 1.00F },
1507 { 0.00F, 0.00F, 0.55F },
1508 { 1.00F, 0.00F, 0.00F },
1509
1510 { 1.00F, 0.54F, 0.00F },
1511 { 0.11F, 0.56F, 1.00F },
1512 { 0.93F, 0.46F, 0.00F },
1513 { 0.18F, 0.54F, 0.34F },
1514
1515 { 0.56F, 0.73F, 0.56F },
1516 { 0.80F, 0.80F, 0.80F },
1517 { 0.55F, 0.41F, 0.13F },
1518 { 0.99F, 0.77F, 0.26F },
1519
1520 { 0.74F, 0.65F, 0.41F },
1521
1522 { 0.00F, 1.00F, 1.00F },
1523 { 1.00F, 0.00F, 1.00F },
1524 { 1.00F, 1.00F, 0.00F },
1525 };
1526
1527 int x, y;
1528
1529 glEnable (GL_TEXTURE_2D);
1530 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1531 glEnable (GL_BLEND);
1532 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1533 glBegin (GL_QUADS);
1534
1535 for (y = 0; y < h; y++)
1536 for (x = 0; x < w; x++)
1537 {
1538 unsigned char m = data [x + y * w];
1539
1540 if (m)
1541 {
1542 float *c = color [m & 15];
1543
1544 float tx1 = m & 0x40 ? 0.5 : 0.;
1545 float tx2 = tx1 + 0.5;
1546
1547 glColor4f (c[0], c[1], c[2], 0.75);
1548 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1549 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1550 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1551 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1552 }
1553 }
1554
1555 glEnd ();
1556 glDisable (GL_BLEND);
1557 glDisable (GL_TEXTURE_2D);
1558}
1559
1560void
1561fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1562 PPCODE:
1563{
1564 int vx, vy;
1565 int x, y;
1566 int sw4 = (sw + 3) & ~3;
1567 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1568 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1569
1570 memset (darkness, 255, sw4 * sh);
1571 SvPOK_only (darkness_sv);
1572 SvCUR_set (darkness_sv, sw4 * sh);
1573
1574 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1575 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1576
1577 for (y = 0; y < sh; y++)
1578 if (0 <= y + vy && y + vy < self->rows)
1579 {
1580 maprow *row = self->row + (y + vy);
1581
1582 for (x = 0; x < sw; x++)
1583 if (row->c0 <= x + vx && x + vx < row->c1)
1584 {
1585 mapcell *cell = row->col + (x + vx - row->c0);
1586
1587 darkness[y * sw4 + x] = cell->darkness
1588 ? 255 - (cell->darkness - 1)
1589 : 255 - FOW_DARKNESS;
1590 }
1591 }
1592
1340 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1341 PUSHs (sv_2mortal (newSViv (sw4))); 1594 PUSHs (sv_2mortal (newSViv (sw4)));
1342 PUSHs (sv_2mortal (newSViv (sh))); 1595 PUSHs (sv_2mortal (newSViv (sh)));
1343 PUSHs (darkness_sv); 1596 PUSHs (darkness_sv);
1344} 1597}
1345 1598
1346SV * 1599SV *
1347get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1600get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1348 CODE: 1601 CODE:
1349{ 1602{
1350 int x, y, x1, y1; 1603 int x, y, x1, y1;
1351 SV *data_sv = newSV (w * h * 7 + 5); 1604 SV *data_sv = newSV (w * h * 7 + 5);
1352 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1605 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1414} 1667}
1415 OUTPUT: 1668 OUTPUT:
1416 RETVAL 1669 RETVAL
1417 1670
1418void 1671void
1419set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1672set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1420 PPCODE: 1673 PPCODE:
1421{ 1674{
1422 int x, y, z; 1675 int x, y, z;
1423 int w, h; 1676 int w, h;
1424 int x1, y1; 1677 int x1, y1;
1456 1709
1457 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1710 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1458 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1711 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1459 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1712 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1460 1713
1461 if (cell->darkness <= 0) 1714 if (cell->darkness == 0)
1462 { 1715 {
1463 cell->darkness = -1; 1716 cell->darkness = 0;
1464 1717
1465 for (z = 0; z <= 2; z++) 1718 for (z = 0; z <= 2; z++)
1466 { 1719 {
1467 cell->face[z] = face[z]; 1720 cell->face[z] = face[z];
1468 1721
1473 } 1726 }
1474 } 1727 }
1475 } 1728 }
1476} 1729}
1477 1730
1478MODULE = CFClient PACKAGE = CFClient::MixChunk 1731MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1479 1732
1480CFClient::MixChunk 1733CFPlus::MixChunk
1481new_from_file (SV *class, char *path) 1734new_from_file (SV *class, char *path)
1482 CODE: 1735 CODE:
1483 RETVAL = Mix_LoadWAV (path); 1736 RETVAL = Mix_LoadWAV (path);
1484 OUTPUT: 1737 OUTPUT:
1485 RETVAL 1738 RETVAL
1486 1739
1487void 1740void
1488DESTROY (CFClient::MixChunk self) 1741DESTROY (CFPlus::MixChunk self)
1489 CODE: 1742 CODE:
1490 Mix_FreeChunk (self); 1743 Mix_FreeChunk (self);
1491 1744
1492int 1745int
1493volume (CFClient::MixChunk self, int volume = -1) 1746volume (CFPlus::MixChunk self, int volume = -1)
1494 CODE: 1747 CODE:
1495 RETVAL = Mix_VolumeChunk (self, volume); 1748 RETVAL = Mix_VolumeChunk (self, volume);
1496 OUTPUT: 1749 OUTPUT:
1497 RETVAL 1750 RETVAL
1498 1751
1499int 1752int
1500play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1753play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1501 CODE: 1754 CODE:
1502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1755 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1503 OUTPUT: 1756 OUTPUT:
1504 RETVAL 1757 RETVAL
1505 1758
1506MODULE = CFClient PACKAGE = CFClient::MixMusic 1759MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1507 1760
1508int 1761int
1509volume (int volume = -1) 1762volume (int volume = -1)
1510 CODE: 1763 CODE:
1511 RETVAL = Mix_VolumeMusic (volume); 1764 RETVAL = Mix_VolumeMusic (volume);
1512 OUTPUT: 1765 OUTPUT:
1513 RETVAL 1766 RETVAL
1514 1767
1515CFClient::MixMusic 1768CFPlus::MixMusic
1516new_from_file (SV *class, char *path) 1769new_from_file (SV *class, char *path)
1517 CODE: 1770 CODE:
1518 RETVAL = Mix_LoadMUS (path); 1771 RETVAL = Mix_LoadMUS (path);
1519 OUTPUT: 1772 OUTPUT:
1520 RETVAL 1773 RETVAL
1521 1774
1522void 1775void
1523DESTROY (CFClient::MixMusic self) 1776DESTROY (CFPlus::MixMusic self)
1524 CODE: 1777 CODE:
1525 Mix_FreeMusic (self); 1778 Mix_FreeMusic (self);
1526 1779
1527int 1780int
1528play (CFClient::MixMusic self, int loops = -1) 1781play (CFPlus::MixMusic self, int loops = -1)
1529 CODE: 1782 CODE:
1530 RETVAL = Mix_PlayMusic (self, loops); 1783 RETVAL = Mix_PlayMusic (self, loops);
1531 OUTPUT: 1784 OUTPUT:
1532 RETVAL 1785 RETVAL
1533 1786
1534MODULE = CFClient PACKAGE = CFClient::OpenGL 1787MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1535 1788
1536BOOT: 1789BOOT:
1537{ 1790{
1538 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1791 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1539 static const struct { 1792 static const struct {
1540 const char *name; 1793 const char *name;
1541 IV iv; 1794 IV iv;
1542 } *civ, const_iv[] = { 1795 } *civ, const_iv[] = {
1543# define const_iv(name) { # name, (IV)name } 1796# define const_iv(name) { # name, (IV)name }
1550 const_iv (GL_SCISSOR_TEST), 1803 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST), 1804 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST), 1805 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE), 1806 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL), 1807 const_iv (GL_RESCALE_NORMAL),
1808 const_iv (GL_FRONT),
1809 const_iv (GL_BACK),
1555 const_iv (GL_AND), 1810 const_iv (GL_AND),
1556 const_iv (GL_ONE), 1811 const_iv (GL_ONE),
1557 const_iv (GL_ZERO), 1812 const_iv (GL_ZERO),
1558 const_iv (GL_SRC_ALPHA), 1813 const_iv (GL_SRC_ALPHA),
1559 const_iv (GL_SRC_ALPHA_SATURATE), 1814 const_iv (GL_DST_ALPHA),
1560 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1815 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561 const_iv (GL_ONE_MINUS_DST_ALPHA), 1816 const_iv (GL_ONE_MINUS_DST_ALPHA),
1817 const_iv (GL_SRC_ALPHA_SATURATE),
1562 const_iv (GL_RGB), 1818 const_iv (GL_RGB),
1563 const_iv (GL_RGBA), 1819 const_iv (GL_RGBA),
1820 const_iv (GL_RGBA4),
1821 const_iv (GL_RGBA8),
1822 const_iv (GL_RGB5_A1),
1564 const_iv (GL_UNSIGNED_BYTE), 1823 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT), 1824 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT), 1825 const_iv (GL_UNSIGNED_INT),
1567 const_iv (GL_ALPHA), 1826 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY), 1827 const_iv (GL_INTENSITY),
1577 const_iv (GL_TEXTURE_MAG_FILTER), 1836 const_iv (GL_TEXTURE_MAG_FILTER),
1578 const_iv (GL_TEXTURE_MIN_FILTER), 1837 const_iv (GL_TEXTURE_MIN_FILTER),
1579 const_iv (GL_TEXTURE_ENV_MODE), 1838 const_iv (GL_TEXTURE_ENV_MODE),
1580 const_iv (GL_TEXTURE_WRAP_S), 1839 const_iv (GL_TEXTURE_WRAP_S),
1581 const_iv (GL_TEXTURE_WRAP_T), 1840 const_iv (GL_TEXTURE_WRAP_T),
1841 const_iv (GL_REPEAT),
1582 const_iv (GL_CLAMP), 1842 const_iv (GL_CLAMP),
1583 const_iv (GL_REPEAT), 1843 const_iv (GL_CLAMP_TO_EDGE),
1584 const_iv (GL_NEAREST), 1844 const_iv (GL_NEAREST),
1585 const_iv (GL_LINEAR), 1845 const_iv (GL_LINEAR),
1586 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1846 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1847 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1848 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1599 const_iv (GL_SEPARABLE_2D), 1859 const_iv (GL_SEPARABLE_2D),
1600 const_iv (GL_CONVOLUTION_2D), 1860 const_iv (GL_CONVOLUTION_2D),
1601 const_iv (GL_CONVOLUTION_BORDER_MODE), 1861 const_iv (GL_CONVOLUTION_BORDER_MODE),
1602 const_iv (GL_CONSTANT_BORDER), 1862 const_iv (GL_CONSTANT_BORDER),
1603 const_iv (GL_LINES), 1863 const_iv (GL_LINES),
1864 const_iv (GL_LINE_STRIP),
1604 const_iv (GL_LINE_LOOP), 1865 const_iv (GL_LINE_LOOP),
1605 const_iv (GL_QUADS), 1866 const_iv (GL_QUADS),
1606 const_iv (GL_QUAD_STRIP), 1867 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES), 1868 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP), 1869 const_iv (GL_TRIANGLE_STRIP),
1618 1879
1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1880 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1881 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621} 1882}
1622 1883
1884char *
1885gl_vendor ()
1886 CODE:
1887 RETVAL = (char *)glGetString (GL_VENDOR);
1888 OUTPUT:
1889 RETVAL
1890
1891char *
1892gl_version ()
1893 CODE:
1894 RETVAL = (char *)glGetString (GL_VERSION);
1895 OUTPUT:
1896 RETVAL
1897
1898char *
1899gl_extensions ()
1900 CODE:
1901 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1902 OUTPUT:
1903 RETVAL
1904
1623int glGetError () 1905int glGetError ()
1906
1907void glFinish ()
1624 1908
1625void glClear (int mask) 1909void glClear (int mask)
1626 1910
1627void glClearColor (float r, float g, float b, float a = 1.0) 1911void glClearColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1912 PROTOTYPE: @
1635 1919
1636void glHint (int target, int mode) 1920void glHint (int target, int mode)
1637 1921
1638void glBlendFunc (int sfactor, int dfactor) 1922void glBlendFunc (int sfactor, int dfactor)
1639 1923
1924void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1925 CODE:
1926 gl_BlendFuncSeparate (sa, da, saa, daa);
1927
1640void glDepthMask (int flag) 1928void glDepthMask (int flag)
1641 1929
1642void glLogicOp (int opcode) 1930void glLogicOp (int opcode)
1643 1931
1644void glColorMask (int red, int green, int blue, int alpha) 1932void glColorMask (int red, int green, int blue, int alpha)
1648void glPushMatrix () 1936void glPushMatrix ()
1649 1937
1650void glPopMatrix () 1938void glPopMatrix ()
1651 1939
1652void glLoadIdentity () 1940void glLoadIdentity ()
1941
1942void glDrawBuffer (int buffer)
1943
1944void glReadBuffer (int buffer)
1653 1945
1654# near_ and far_ are due to microsofts buggy "c" compiler 1946# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1947void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656 1948
1657# near_ and far_ are due to microsofts buggy "c" compiler 1949# near_ and far_ are due to microsofts buggy "c" compiler
1677 1969
1678void glEnd () 1970void glEnd ()
1679 1971
1680void glColor (float r, float g, float b, float a = 1.0) 1972void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 1973 PROTOTYPE: @
1974 ALIAS:
1975 glColor_premultiply = 1
1682 CODE: 1976 CODE:
1977 if (ix)
1978 {
1979 r *= a;
1980 g *= a;
1981 b *= a;
1982 }
1683 // microsoft visual "c" rounds instead of truncating... 1983 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 1984 glColor4f (r, g, b, a);
1685 MIN ((int)(g * 255.f), 255),
1686 MIN ((int)(b * 255.f), 255),
1687 MIN ((int)(a * 255.f), 255));
1688 1985
1689void glInterleavedArrays (int format, int stride, char *data) 1986void glInterleavedArrays (int format, int stride, char *data)
1690 1987
1691void glDrawElements (int mode, int count, int type, char *indices) 1988void glDrawElements (int mode, int count, int type, char *indices)
1692 1989
1715 2012
1716void glBindTexture (int target, int name) 2013void glBindTexture (int target, int name)
1717 2014
1718void glConvolutionParameter (int target, int pname, float params) 2015void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 2016 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2017 if (gl.ConvolutionParameterf)
2018 gl.ConvolutionParameterf (target, pname, params);
1721 2019
1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2020void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE: 2021 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2022 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 2023 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 2024
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2025void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE: 2026 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2027 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 2028 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 2029
1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2030void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733 2031
1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2032void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735 2033
1768 2066
1769void glEndList () 2067void glEndList ()
1770 2068
1771void glCallList (int list) 2069void glCallList (int list)
1772 2070
1773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines