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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines