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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines