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.99 by root, Mon May 29 02:11:03 2006 UTC vs.
Revision 1.163 by root, Wed Oct 18 12:53:45 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>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
6#endif 9#endif
7 10
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
12#include <math.h> 19#include <math.h>
13#include <string.h> 20#include <string.h>
14#include <stdio.h> 21#include <stdio.h>
22#include <stdlib.h>
15 23
16#include <SDL.h> 24#include <SDL.h>
17#include <SDL_endian.h> 25#include <SDL_endian.h>
18#include <SDL_image.h> 26#include <SDL_image.h>
19#include <SDL_mixer.h> 27#include <SDL_mixer.h>
20#include <SDL_opengl.h> 28#include <SDL_opengl.h>
21 29
30#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS
32
22#include <glib/gmacros.h> 33#include <glib/gmacros.h>
23 34
24#include <pango/pango.h> 35#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 36
29#ifndef _WIN32 37#ifndef _WIN32
30# include <sys/types.h> 38# include <sys/types.h>
31# include <sys/socket.h> 39# include <sys/socket.h>
32# include <netinet/in.h> 40# include <netinet/in.h>
33# include <netinet/tcp.h> 41# include <netinet/tcp.h>
34# include <inttypes.h> 42# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 43#endif
43 44
44#include "glext.h" 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 46
46#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
47 48
48#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
50 51
51#define MIN_FONT_HEIGHT 10 52#define MIN_FONT_HEIGHT 10
52 53
53#define GL_CALL(type,func,args) \ 54#if 0
54 { \ 55# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 56#else
56 static type fptr_; \ 57# define PARACHUTE 0
57 \ 58#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 59
60static struct
61{
62#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h"
64#undef GL_FUNC
65} gl;
66
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{
69 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else
74 glBlendFunc (sa, da);
75}
76
77#include "texcache.c"
78
79#include "pango-font.c"
80#include "pango-fontmap.c"
81#include "pango-render.c"
82
68typedef Mix_Chunk *CFClient__MixChunk; 83typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 84typedef Mix_Music *CFPlus__MixMusic;
70 85
71typedef PangoFontDescription *CFClient__Font; 86typedef PangoFontDescription *CFPlus__Font;
87
88static int
89shape_attr_p (PangoLayoutRun *run)
90{
91 GSList *attrs = run->item->analysis.extra_attrs;
92
93 while (attrs)
94 {
95 PangoAttribute *attr = attrs->data;
96
97 if (attr->klass->type == PANGO_ATTR_SHAPE)
98 return 1;
99
100 attrs = attrs->next;
101 }
102
103 return 0;
104}
72 105
73typedef struct cf_layout { 106typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 107 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 108 float r, g, b, a; // default color for rgba mode
77 int base_height; 109 int base_height;
78 CFClient__Font font; 110 CFPlus__Font font;
79} *CFClient__Layout; 111} *CFPlus__Layout;
80 112
81static CFClient__Font default_font; 113static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 114static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 115static PangoFontMap *opengl_fontmap;
84 116
85static void 117static void
86substitute_func (FcPattern *pattern, gpointer data) 118substitute_func (FcPattern *pattern, gpointer data)
87{ 119{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 120 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 121#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 122 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 123#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 124 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 125}
95 126
96static void 127static void
97layout_update_font (CFClient__Layout self) 128layout_update_font (CFPlus__Layout self)
98{ 129{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 130 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 131 * reasonably well with bitstream vera
101 */ 132 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 133 PangoFontDescription *font = self->font ? self->font : default_font;
106 137
107 pango_layout_set_font_description (self->pl, font); 138 pango_layout_set_font_description (self->pl, font);
108} 139}
109 140
110static void 141static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
114 148
115 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 151
118 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
119} 157}
120 158
121typedef uint16_t mapface; 159typedef uint16_t mapface;
122 160
123typedef struct { 161typedef struct {
126 float s, t; 164 float s, t;
127 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
128} maptex; 166} maptex;
129 167
130typedef struct { 168typedef struct {
131 int16_t darkness; 169 uint32_t player;
132 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
133} mapcell; 173} mapcell;
134 174
135typedef struct { 175typedef struct {
136 int32_t c0, c1; 176 int32_t c0, c1;
137 mapcell *col; 177 mapcell *col;
146 int texs; 186 int texs;
147 maptex *tex; 187 maptex *tex;
148 188
149 int32_t rows; 189 int32_t rows;
150 maprow *row; 190 maprow *row;
151} *CFClient__Map; 191} *CFPlus__Map;
152 192
153static char * 193static char *
154prepend (char *ptr, int sze, int inc) 194prepend (char *ptr, int sze, int inc)
155{ 195{
156 char *p; 196 char *p;
174 214
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#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)) 216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 217
178static maprow * 218static maprow *
179map_get_row (CFClient__Map self, int y) 219map_get_row (CFPlus__Map self, int y)
180{ 220{
181 if (0 > y) 221 if (0 > y)
182 { 222 {
183 int extend = - y + MAP_EXTEND_Y; 223 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 224 Prepend (maprow, self->row, self->rows, extend);
222 262
223 return row->col + (x - row->c0); 263 return row->col + (x - row->c0);
224} 264}
225 265
226static mapcell * 266static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 267map_get_cell (CFPlus__Map self, int x, int y)
228{ 268{
229 return row_get_cell (map_get_row (self, y), x); 269 return row_get_cell (map_get_row (self, y), x);
230} 270}
231 271
232static void 272static void
233map_clear (CFClient__Map self) 273map_clear (CFPlus__Map self)
234{ 274{
235 int r; 275 int r;
236 276
237 for (r = 0; r < self->rows; r++) 277 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 278 Safefree (self->row[r].col);
246 self->row = 0; 286 self->row = 0;
247 self->rows = 0; 287 self->rows = 0;
248} 288}
249 289
250static void 290static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 292{
253 int x, y; 293 int x, y;
254 maprow *row; 294 maprow *row;
295 mapcell *cell;
255 296
256 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
257 if (y >= 0) 298 if (y >= 0)
258 { 299 {
259 if (y >= self->rows) 300 if (y >= self->rows)
265 if (x >= row->c0) 306 if (x >= row->c0)
266 { 307 {
267 if (x >= row->c1) 308 if (x >= row->c1)
268 break; 309 break;
269 310
270 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
271 } 317 }
272 } 318 }
273} 319}
274 320
275static void 321static void
296 ev.data2 = 0; 342 ev.data2 = 0;
297 343
298 SDL_PushEvent ((SDL_Event *)&ev); 344 SDL_PushEvent ((SDL_Event *)&ev);
299} 345}
300 346
347static unsigned int
348minpot (unsigned int n)
349{
350 if (!n)
351 return 0;
352
353 --n;
354
355 n |= n >> 1;
356 n |= n >> 2;
357 n |= n >> 4;
358 n |= n >> 8;
359 n |= n >> 16;
360
361 return n + 1;
362}
363
301MODULE = CFClient PACKAGE = CFClient 364MODULE = CFPlus PACKAGE = CFPlus
302 365
303PROTOTYPES: ENABLE 366PROTOTYPES: ENABLE
304 367
305BOOT: 368BOOT:
306{ 369{
307 HV *stash = gv_stashpv ("CFClient", 1); 370 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 371 static const struct {
309 const char *name; 372 const char *name;
310 IV iv; 373 IV iv;
311 } *civ, const_iv[] = { 374 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 375# define const_iv(name) { # name, (IV)name }
413 476
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 479}
417 480
481int
482in_destruct ()
483 CODE:
484 RETVAL = PL_main_cv == Nullcv;
485 OUTPUT:
486 RETVAL
487
488NV floor (NV x)
489
490NV ceil (NV x)
491
418void 492void
419pango_init () 493pango_init ()
420 CODE: 494 CODE:
421{ 495{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 496 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 497 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); 498 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} 499}
430 500
431int 501int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 502SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 503
434void 504void
435SDL_Quit () 505SDL_Quit ()
436 506
437void 507void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 514 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 516 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 517
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 519 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 520
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 525
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 526 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
527#if SDL_VERSION_ATLEAST(1,2,10)
528 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
529 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
530#endif
457 531
458 SDL_EnableUNICODE (1); 532 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 533 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 534
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 535 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 553SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 554 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 555 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 557 );
558 if (RETVAL)
559 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562# include "glfunc.h"
563# undef GL_FUNC
564 }
485 OUTPUT: 565 OUTPUT:
486 RETVAL 566 RETVAL
487 567
488void 568void
489SDL_GL_SwapBuffers () 569SDL_GL_SwapBuffers ()
542 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 622 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 623 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544 break; 624 break;
545 } 625 }
546 626
547 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 627 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548 } 628 }
549} 629}
550 630
551int 631int
552Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 632Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
566#ifndef _WIN32 646#ifndef _WIN32
567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568#endif 648#endif
569 649
570void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
571add_font (char *file) 680add_font (char *file)
572 CODE: 681 CODE:
573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
574#ifdef _WIN32
575 // cairo... sigh... requires win2000
576 AddFontResourceEx (file, FR_PRIVATE, 0);
577#endif
578 683
579void 684void
580load_image_inline (SV *image_) 685load_image_inline (SV *image_)
581 ALIAS: 686 ALIAS:
582 load_image_file = 1 687 load_image_file = 1
624 729
625 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 730 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
626 731
627 assert (surface2->pitch == surface2->w * 4); 732 assert (surface2->pitch == surface2->w * 4);
628 733
734 SDL_LockSurface (surface2);
629 EXTEND (SP, 5); 735 EXTEND (SP, 6);
630 PUSHs (sv_2mortal (newSViv (surface2->w))); 736 PUSHs (sv_2mortal (newSViv (surface2->w)));
631 PUSHs (sv_2mortal (newSViv (surface2->h))); 737 PUSHs (sv_2mortal (newSViv (surface2->h)));
632 SDL_LockSurface (surface2);
633 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 738 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
634 SDL_UnlockSurface (surface2);
635 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 739 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
636 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 740 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
637 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 741 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
742 SDL_UnlockSurface (surface2);
638 743
639 SDL_FreeSurface (surface); 744 SDL_FreeSurface (surface);
640 SDL_FreeSurface (surface2); 745 SDL_FreeSurface (surface2);
641} 746}
642 747
678 CODE: 783 CODE:
679 fprintf (stderr, "FATAL: %s\n", message); 784 fprintf (stderr, "FATAL: %s\n", message);
680#ifdef _WIN32 785#ifdef _WIN32
681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
682#endif 787#endif
683 exit (1); 788 _exit (1);
684 789
790void
791_exit (int retval = 0)
792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
796 _exit (retval);
797#endif
798
685MODULE = CFClient PACKAGE = CFClient::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
686 800
687CFClient::Font 801CFPlus::Font
688new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
689 CODE: 803 CODE:
690{ 804{
691 int count; 805 int count;
692 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 806 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
695} 809}
696 OUTPUT: 810 OUTPUT:
697 RETVAL 811 RETVAL
698 812
699void 813void
700DESTROY (CFClient::Font self) 814DESTROY (CFPlus::Font self)
701 CODE: 815 CODE:
702 pango_font_description_free (self); 816 pango_font_description_free (self);
703 817
704void 818void
705make_default (CFClient::Font self) 819make_default (CFPlus::Font self)
706 CODE: 820 CODE:
707 default_font = self; 821 default_font = self;
708 822
709MODULE = CFClient PACKAGE = CFClient::Layout 823MODULE = CFPlus PACKAGE = CFPlus::Layout
710 824
711CFClient::Layout 825void
712new (SV *class, int rgba = 0) 826reset_glyph_cache ()
713 CODE: 827 CODE:
714#if _WIN32 828 tc_clear ();
715 //rgba = 0;//D make stext nicer, breaks TextView 829
716#endif 830CFPlus::Layout
831new (SV *class)
832 CODE:
717 New (0, RETVAL, 1, struct cf_layout); 833 New (0, RETVAL, 1, struct cf_layout);
718 834
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 835 RETVAL->pl = pango_layout_new (opengl_context);
720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 836 RETVAL->r = 1.;
722 RETVAL->g = 1.; 837 RETVAL->g = 1.;
723 RETVAL->b = 1.; 838 RETVAL->b = 1.;
724 RETVAL->a = 1.; 839 RETVAL->a = 1.;
725 RETVAL->base_height = MIN_FONT_HEIGHT; 840 RETVAL->base_height = MIN_FONT_HEIGHT;
729 layout_update_font (RETVAL); 844 layout_update_font (RETVAL);
730 OUTPUT: 845 OUTPUT:
731 RETVAL 846 RETVAL
732 847
733void 848void
734DESTROY (CFClient::Layout self) 849DESTROY (CFPlus::Layout self)
735 CODE: 850 CODE:
736 g_object_unref (self->pl); 851 g_object_unref (self->pl);
737 Safefree (self); 852 Safefree (self);
738 853
739int
740is_rgba (CFClient::Layout self)
741 CODE:
742 RETVAL = self->rgba;
743 OUTPUT:
744 RETVAL
745
746void 854void
747set_text (CFClient::Layout self, SV *text_) 855set_text (CFPlus::Layout self, SV *text_)
748 CODE: 856 CODE:
749{ 857{
750 STRLEN textlen; 858 STRLEN textlen;
751 char *text = SvPVutf8 (text_, textlen); 859 char *text = SvPVutf8 (text_, textlen);
752 860
753 pango_layout_set_text (self->pl, text, textlen); 861 pango_layout_set_text (self->pl, text, textlen);
754} 862}
755 863
756void 864void
757set_markup (CFClient::Layout self, SV *text_) 865set_markup (CFPlus::Layout self, SV *text_)
758 CODE: 866 CODE:
759{ 867{
760 STRLEN textlen; 868 STRLEN textlen;
761 char *text = SvPVutf8 (text_, textlen); 869 char *text = SvPVutf8 (text_, textlen);
762 870
763 pango_layout_set_markup (self->pl, text, textlen); 871 pango_layout_set_markup (self->pl, text, textlen);
764} 872}
765 873
874void
875set_shapes (CFPlus::Layout self, ...)
876 CODE:
877{
878 PangoAttrList *attrs = 0;
879 const char *text = pango_layout_get_text (self->pl);
880 const char *pos = text;
881 int arg = 4;
882
883 while (arg < items && (pos = strstr (pos, OBJ_STR)))
884 {
885 PangoRectangle inkrect, rect;
886 PangoAttribute *attr;
887
888 int x = SvIV (ST (arg - 3));
889 int y = SvIV (ST (arg - 2));
890 int w = SvIV (ST (arg - 1));
891 int h = SvIV (ST (arg ));
892
893 inkrect.x = 0;
894 inkrect.y = 0;
895 inkrect.width = 0;
896 inkrect.height = 0;
897
898 rect.x = x * PANGO_SCALE;
899 rect.y = y * PANGO_SCALE;
900 rect.width = w * PANGO_SCALE;
901 rect.height = h * PANGO_SCALE;
902
903 if (!attrs)
904 attrs = pango_layout_get_attributes (self->pl);
905
906 attr = pango_attr_shape_new (&inkrect, &rect);
907 attr->start_index = pos - text;
908 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
909 pango_attr_list_insert (attrs, attr);
910
911 arg += 4;
912 pos += sizeof (OBJ_STR) - 1;
913 }
914
915 if (attrs)
916 pango_layout_set_attributes (self->pl, attrs);
917}
918
919void
920get_shapes (CFPlus::Layout self)
921 PPCODE:
922{
923 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
924
925 do
926 {
927 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
928
929 if (run && shape_attr_p (run))
930 {
931 PangoRectangle extents;
932 pango_layout_iter_get_run_extents (iter, 0, &extents);
933
934 EXTEND (SP, 2);
935 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
936 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
937 }
938 }
939 while (pango_layout_iter_next_run (iter));
940
941 pango_layout_iter_free (iter);
942}
943
944int
945has_wrapped (CFPlus::Layout self)
946 CODE:
947{
948 int lines = 1;
949 const char *text = pango_layout_get_text (self->pl);
950
951 while (*text)
952 lines += *text++ == '\n';
953
954 RETVAL = lines < pango_layout_get_line_count (self->pl);
955}
956 OUTPUT:
957 RETVAL
958
766SV * 959SV *
767get_text (CFClient::Layout self) 960get_text (CFPlus::Layout self)
768 CODE: 961 CODE:
769 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 962 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770 SvUTF8_on (RETVAL); 963 sv_utf8_decode (RETVAL);
771 OUTPUT: 964 OUTPUT:
772 RETVAL 965 RETVAL
773 966
774void 967void
775set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 968set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
776 CODE: 969 CODE:
777 self->r = r; 970 self->r = r;
778 self->g = g; 971 self->g = g;
779 self->b = b; 972 self->b = b;
780 self->a = a; 973 self->a = a;
781 974
782void 975void
783set_font (CFClient::Layout self, CFClient::Font font = 0) 976set_font (CFPlus::Layout self, CFPlus::Font font = 0)
784 CODE: 977 CODE:
785 if (self->font != font) 978 if (self->font != font)
786 { 979 {
787 self->font = font; 980 self->font = font;
788 layout_update_font (self); 981 layout_update_font (self);
789 } 982 }
790 983
791void 984void
792set_height (CFClient::Layout self, int base_height) 985set_height (CFPlus::Layout self, int base_height)
793 CODE: 986 CODE:
794 if (self->base_height != base_height) 987 if (self->base_height != base_height)
795 { 988 {
796 self->base_height = base_height; 989 self->base_height = base_height;
797 layout_update_font (self); 990 layout_update_font (self);
798 } 991 }
799 992
800void 993void
801set_width (CFClient::Layout self, int max_width = -1) 994set_width (CFPlus::Layout self, int max_width = -1)
802 CODE: 995 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 996 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 997
805void 998void
806set_indent (CFClient::Layout self, int indent) 999set_indent (CFPlus::Layout self, int indent)
807 CODE: 1000 CODE:
808 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1001 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809 1002
810void 1003void
811set_spacing (CFClient::Layout self, int spacing) 1004set_spacing (CFPlus::Layout self, int spacing)
812 CODE: 1005 CODE:
813 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1006 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814 1007
815void 1008void
816set_ellipsise (CFClient::Layout self, int ellipsise) 1009set_ellipsise (CFPlus::Layout self, int ellipsise)
817 CODE: 1010 CODE:
818 pango_layout_set_ellipsize (self->pl, 1011 pango_layout_set_ellipsize (self->pl,
819 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1012 ellipsise == 1 ? PANGO_ELLIPSIZE_START
820 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1013 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1014 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
822 : PANGO_ELLIPSIZE_NONE 1015 : PANGO_ELLIPSIZE_NONE
823 ); 1016 );
824 1017
825void 1018void
826set_single_paragraph_mode (CFClient::Layout self, int spm) 1019set_single_paragraph_mode (CFPlus::Layout self, int spm)
827 CODE: 1020 CODE:
828 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1021 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829 1022
830void 1023void
831size (CFClient::Layout self) 1024size (CFPlus::Layout self)
832 PPCODE: 1025 PPCODE:
833{ 1026{
834 int w, h; 1027 int w, h;
835 1028
836 layout_get_pixel_size (self, &w, &h); 1029 layout_get_pixel_size (self, &w, &h);
839 PUSHs (sv_2mortal (newSViv (w))); 1032 PUSHs (sv_2mortal (newSViv (w)));
840 PUSHs (sv_2mortal (newSViv (h))); 1033 PUSHs (sv_2mortal (newSViv (h)));
841} 1034}
842 1035
843int 1036int
1037descent (CFPlus::Layout self)
1038 CODE:
1039{
1040 PangoRectangle rect;
1041 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1042 pango_layout_line_get_pixel_extents (line, 0, &rect);
1043 RETVAL = PANGO_DESCENT (rect);
1044}
1045 OUTPUT:
1046 RETVAL
1047
1048int
844xy_to_index (CFClient::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
845 CODE: 1050 CODE:
846{ 1051{
847 int index, trailing; 1052 int index, trailing;
848 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
849 RETVAL = index; 1054 RETVAL = index;
850} 1055}
851 OUTPUT: 1056 OUTPUT:
852 RETVAL 1057 RETVAL
853 1058
854void 1059void
855cursor_pos (CFClient::Layout self, int index) 1060cursor_pos (CFPlus::Layout self, int index)
856 PPCODE: 1061 PPCODE:
857{ 1062{
858 PangoRectangle strong_pos; 1063 PangoRectangle strong_pos;
859 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1064 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
860 1065
863 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
864 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
865} 1070}
866 1071
867void 1072void
868render (CFClient::Layout self) 1073render (CFPlus::Layout self, float x, float y, int flags = 0)
869 PPCODE: 1074 PPCODE:
870{ 1075 pango_opengl_render_layout_subpixel (
871 SV *retval; 1076 self->pl,
872 int w, h; 1077 x * PANGO_SCALE, y * PANGO_SCALE,
1078 self->r, self->g, self->b, self->a,
1079 flags
1080 );
873 1081
874 layout_get_pixel_size (self, &w, &h); 1082MODULE = CFPlus PACKAGE = CFPlus::Texture
875 1083
876 if (self->rgba) 1084void
1085pad2pot (SV *data_, SV *w_, SV *h_)
1086 CODE:
1087{
1088 int ow = SvIV (w_);
1089 int oh = SvIV (h_);
1090
1091 if (ow && oh)
877 { 1092 {
878 cairo_surface_t *surface; 1093 int nw = minpot (ow);
879 cairo_t *cairo; 1094 int nh = minpot (oh);
880 1095
881 retval = newSV (w * h * 4); 1096 if (nw != ow || nh != oh)
882 SvPOK_only (retval);
883 SvCUR_set (retval, w * h * 4);
884
885 memset (SvPVX (retval), 0, w * h * 4);
886
887 surface = cairo_image_surface_create_for_data (
888 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
889 cairo = cairo_create (surface);
890 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
891
892 pango_cairo_show_layout (cairo, self->pl);
893
894 cairo_destroy (cairo);
895 cairo_surface_destroy (surface);
896
897 // what a mess, and its premultiplied, too :(
898 { 1097 {
899 uint32_t *p = (uint32_t *)SvPVX (retval); 1098 if (SvOK (data_))
900 uint32_t *e = p + w * h;
901
902 while (p < e)
903 { 1099 {
904 uint32_t rgba = *p; 1100 STRLEN datalen;
905 rgba = (rgba >> 24) | (rgba << 8); 1101 char *data = SvPVbyte (data_, datalen);
906#if 0 1102 int bpp = datalen / (ow * oh);
907#ifdef _WIN32 1103 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913 1104
914 rgba = (rgba & 0xffffff00) | a; 1105 SvPOK_only (result_);
1106 SvCUR_set (result_, nw * nh * bpp);
1107
1108 memset (SvPVX (result_), 0, nw * nh * bpp);
1109 while (oh--)
1110 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1111
1112 sv_setsv (data_, result_);
915 } 1113 }
916#endif 1114
917#endif 1115 sv_setiv (w_, nw);
918 rgba = SDL_SwapBE32 (rgba); 1116 sv_setiv (h_, nh);
919 *p++ = rgba;
920 } 1117 }
921 }
922
923 EXTEND (SP, 5);
924 PUSHs (sv_2mortal (newSViv (w)));
925 PUSHs (sv_2mortal (newSViv (h)));
926 PUSHs (sv_2mortal (retval));
927 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
928 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
929 } 1118 }
930 else
931 {
932 FT_Bitmap bitmap;
933
934 retval = newSV (w * h);
935 SvPOK_only (retval);
936 SvCUR_set (retval, w * h);
937
938 bitmap.rows = h;
939 bitmap.width = w;
940 bitmap.pitch = w;
941 bitmap.buffer = (unsigned char*)SvPVX (retval);
942 bitmap.num_grays = 256;
943 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
944
945 memset (bitmap.buffer, 0, w * h);
946
947 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
948
949 EXTEND (SP, 5);
950 PUSHs (sv_2mortal (newSViv (w)));
951 PUSHs (sv_2mortal (newSViv (h)));
952 PUSHs (sv_2mortal (retval));
953 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
954 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
955 }
956} 1119}
957 1120
958MODULE = CFClient PACKAGE = CFClient::Texture
959
960void 1121void
961draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1122draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962 PROTOTYPE: $$$;$$ 1123 PROTOTYPE: $$$;$$
963 ALIAS: 1124 ALIAS:
964 draw_quad_alpha = 1 1125 draw_quad_alpha = 1
965 draw_quad_alpha_premultiplied = 2 1126 draw_quad_alpha_premultiplied = 2
966 CODE: 1127 CODE:
977 } 1138 }
978 1139
979 if (ix) 1140 if (ix)
980 { 1141 {
981 glEnable (GL_BLEND); 1142 glEnable (GL_BLEND);
1143
1144 if (ix == 2)
982 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1145 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1146 else
1147 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1148 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1149
983 glEnable (GL_ALPHA_TEST); 1150 glEnable (GL_ALPHA_TEST);
984 glAlphaFunc (GL_GREATER, 0.01f); 1151 glAlphaFunc (GL_GREATER, 0.01f);
985 } 1152 }
986 1153
987 glBindTexture (GL_TEXTURE_2D, name); 1154 glBindTexture (GL_TEXTURE_2D, name);
998 glDisable (GL_ALPHA_TEST); 1165 glDisable (GL_ALPHA_TEST);
999 glDisable (GL_BLEND); 1166 glDisable (GL_BLEND);
1000 } 1167 }
1001} 1168}
1002 1169
1003MODULE = CFClient PACKAGE = CFClient::Map 1170MODULE = CFPlus PACKAGE = CFPlus::Map
1004 1171
1005CFClient::Map 1172CFPlus::Map
1006new (SV *class, int map_width, int map_height) 1173new (SV *class, int map_width, int map_height)
1007 CODE: 1174 CODE:
1008 New (0, RETVAL, 1, struct map); 1175 New (0, RETVAL, 1, struct map);
1009 RETVAL->x = 0; 1176 RETVAL->x = 0;
1010 RETVAL->y = 0; 1177 RETVAL->y = 0;
1020 RETVAL->row = 0; 1187 RETVAL->row = 0;
1021 OUTPUT: 1188 OUTPUT:
1022 RETVAL 1189 RETVAL
1023 1190
1024void 1191void
1025DESTROY (CFClient::Map self) 1192DESTROY (CFPlus::Map self)
1026 CODE: 1193 CODE:
1027{ 1194{
1028 map_clear (self); 1195 map_clear (self);
1029 Safefree (self->face); 1196 Safefree (self->face);
1197 Safefree (self->tex);
1030 Safefree (self); 1198 Safefree (self);
1031} 1199}
1032 1200
1033void 1201void
1034clear (CFClient::Map self) 1202clear (CFPlus::Map self)
1035 CODE: 1203 CODE:
1036 map_clear (self); 1204 map_clear (self);
1037 1205
1038void 1206void
1039set_face (CFClient::Map self, int face, int texid) 1207set_face (CFPlus::Map self, int face, int texid)
1040 CODE: 1208 CODE:
1041{ 1209{
1042 while (self->faces <= face) 1210 while (self->faces <= face)
1043 { 1211 {
1044 Append (mapface, self->face, self->faces, self->faces); 1212 Append (mapface, self->face, self->faces, self->faces);
1047 1215
1048 self->face [face] = texid; 1216 self->face [face] = texid;
1049} 1217}
1050 1218
1051void 1219void
1052set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1220set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1053 CODE: 1221 CODE:
1054{ 1222{
1055 while (self->texs <= texid) 1223 while (self->texs <= texid)
1056 { 1224 {
1057 Append (maptex, self->tex, self->texs, self->texs); 1225 Append (maptex, self->tex, self->texs, self->texs);
1081 // from transparent color bleeding and ugly wrapping effects. 1249 // from transparent color bleeding and ugly wrapping effects.
1082 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1250 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1083} 1251}
1084 1252
1085int 1253int
1086ox (CFClient::Map self) 1254ox (CFPlus::Map self)
1087 ALIAS: 1255 ALIAS:
1088 oy = 1 1256 oy = 1
1257 x = 2
1258 y = 3
1259 w = 4
1260 h = 5
1089 CODE: 1261 CODE:
1090 switch (ix) 1262 switch (ix)
1091 { 1263 {
1092 case 0: RETVAL = self->ox; break; 1264 case 0: RETVAL = self->ox; break;
1093 case 1: RETVAL = self->oy; break; 1265 case 1: RETVAL = self->oy; break;
1266 case 2: RETVAL = self->x; break;
1267 case 3: RETVAL = self->y; break;
1268 case 4: RETVAL = self->w; break;
1269 case 5: RETVAL = self->h; break;
1094 } 1270 }
1095 OUTPUT: 1271 OUTPUT:
1096 RETVAL 1272 RETVAL
1097 1273
1098void 1274void
1099scroll (CFClient::Map self, int dx, int dy) 1275scroll (CFPlus::Map self, int dx, int dy)
1100 CODE: 1276 CODE:
1101{ 1277{
1102 if (dx > 0) 1278 if (dx > 0)
1103 map_blank (self, self->x, self->y, dx - 1, self->h); 1279 map_blank (self, self->x, self->y, dx, self->h);
1104 else if (dx < 0) 1280 else if (dx < 0)
1105 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1281 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1106 1282
1107 if (dy > 0) 1283 if (dy > 0)
1108 map_blank (self, self->x, self->y, self->w, dy - 1); 1284 map_blank (self, self->x, self->y, self->w, dy);
1109 else if (dy < 0) 1285 else if (dy < 0)
1110 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1286 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1111 1287
1112 self->ox += dx; self->x += dx; 1288 self->ox += dx; self->x += dx;
1113 self->oy += dy; self->y += dy; 1289 self->oy += dy; self->y += dy;
1114 1290
1115 while (self->y < 0) 1291 while (self->y < 0)
1120 self->y += MAP_EXTEND_Y; 1296 self->y += MAP_EXTEND_Y;
1121 } 1297 }
1122} 1298}
1123 1299
1124void 1300void
1125map1a_update (CFClient::Map self, SV *data_) 1301map1a_update (CFPlus::Map self, SV *data_, int extmap)
1126 CODE: 1302 CODE:
1127{ 1303{
1128 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1304 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1129 uint8_t *data_end = (uint8_t *)SvEND (data_); 1305 uint8_t *data_end = (uint8_t *)SvEND (data_);
1130 mapcell *cell; 1306 mapcell *cell;
1131 int x, y, flags; 1307 int x, y, flags;
1132 1308
1133 while (data < data_end) 1309 while (data < data_end - 1)
1134 { 1310 {
1135 flags = (data [0] << 8) + data [1]; data += 2; 1311 flags = (data [0] << 8) + data [1]; data += 2;
1136 1312
1137 x = ((flags >> 10) & 63) + self->x; 1313 x = self->x + ((flags >> 10) & 63);
1138 y = ((flags >> 4) & 63) + self->y; 1314 y = self->y + ((flags >> 4) & 63);
1139 1315
1140 cell = map_get_cell (self, x, y); 1316 cell = map_get_cell (self, x, y);
1141 1317
1142 if (flags & 15) 1318 if (flags & 15)
1143 { 1319 {
1144 if (cell->darkness < 0) 1320 if (!cell->darkness)
1145 { 1321 {
1322 memset (cell, 0, sizeof (*cell));
1146 cell->darkness = 0; 1323 cell->darkness = 256;
1147 cell->face [0] = 0;
1148 cell->face [1] = 0;
1149 cell->face [2] = 0;
1150 } 1324 }
1151 1325
1152 cell->darkness = flags & 8 ? *data++ : 255;
1153
1154 //TODO: don't trust server data to be in-range(!) 1326 //TODO: don't trust server data to be in-range(!)
1327
1328 if (flags & 8)
1329 {
1330 if (extmap)
1331 {
1332 uint8_t ext, cmd;
1333
1334 do
1335 {
1336 ext = *data++;
1337 cmd = ext & 0x3f;
1338
1339 if (cmd < 4)
1340 cell->darkness = 255 - ext * 64 + 1;
1341 else if (cmd == 5) // health
1342 {
1343 cell->stat_width = 1;
1344 cell->stat_hp = *data++;
1345 }
1346 else if (cmd == 6) // monster width
1347 cell->stat_width = *data++ + 1;
1348 else if (cmd == 0x47) // monster width
1349 {
1350 if (*data == 4)
1351 ; // decode player tag
1352
1353 data += *data + 1;
1354 }
1355 else if (cmd == 8) // cell flags
1356 cell->flags = *data++;
1357 else if (ext & 0x40) // unknown, multibyte => skip
1358 data += *data + 1;
1359 else
1360 data++;
1361 }
1362 while (ext & 0x80);
1363 }
1364 else
1365 cell->darkness = *data++ + 1;
1366 }
1155 1367
1156 if (flags & 4) 1368 if (flags & 4)
1157 { 1369 {
1158 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1370 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1159 } 1371 }
1167 { 1379 {
1168 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1380 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1169 } 1381 }
1170 } 1382 }
1171 else 1383 else
1172 cell->darkness = -1; 1384 cell->darkness = 0;
1173 } 1385 }
1174} 1386}
1175 1387
1176SV * 1388SV *
1177mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1389mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1178 CODE: 1390 CODE:
1179{ 1391{
1180 int x1, x; 1392 int x1, x;
1181 int y1, y; 1393 int y1, y;
1182 int z; 1394 int z;
1232} 1444}
1233 OUTPUT: 1445 OUTPUT:
1234 RETVAL 1446 RETVAL
1235 1447
1236void 1448void
1237draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1449draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1238 PPCODE: 1450 CODE:
1239{ 1451{
1240 int vx, vy; 1452 int vx, vy;
1241 int x, y, z; 1453 int x, y, z;
1242 int last_name; 1454 int last_name;
1243 mapface face; 1455 mapface face;
1244 int sw4 = (sw + 3) & ~3;
1245 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1246 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1247 1456
1248 memset (darkness, 255, sw4 * sh);
1249 SvPOK_only (darkness_sv);
1250 SvCUR_set (darkness_sv, sw4 * sh);
1251
1252 vx = self->x + (self->w - sw) / 2 - shift_x; 1457 vx = self->x + ((self->w - sw) >> 1) - shift_x;
1253 vy = self->y + (self->h - sh) / 2 - shift_y; 1458 vy = self->y + ((self->h - sh) >> 1) - shift_y;
1254 1459
1255 /* 1460 /*
1256 int vx = self->vx = self->w >= sw 1461 int vx = self->vx = self->w >= sw
1257 ? self->x + (self->w - sw) / 2 1462 ? self->x + (self->w - sw) / 2
1258 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1463 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1262 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1467 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1263 */ 1468 */
1264 1469
1265 glColor4ub (255, 255, 255, 255); 1470 glColor4ub (255, 255, 255, 255);
1266 1471
1472 glEnable (GL_BLEND);
1267 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1268 glEnable (GL_BLEND);
1269 glEnable (GL_TEXTURE_2D); 1474 glEnable (GL_TEXTURE_2D);
1270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1475 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1271 1476
1272 glBegin (GL_QUADS); 1477 glBegin (GL_QUADS);
1273 1478
1282 for (x = 0; x < sw; x++) 1487 for (x = 0; x < sw; x++)
1283 if (row->c0 <= x + vx && x + vx < row->c1) 1488 if (row->c0 <= x + vx && x + vx < row->c1)
1284 { 1489 {
1285 mapcell *cell = row->col + (x + vx - row->c0); 1490 mapcell *cell = row->col + (x + vx - row->c0);
1286 1491
1287 darkness[y * sw4 + x] = cell->darkness < 0
1288 ? 255 - FOW_DARKNESS
1289 : 255 - cell->darkness;
1290
1291 face = cell->face [z]; 1492 face = cell->face [z];
1292 1493
1293 if (face) 1494 if (face && face < self->texs)
1294 { 1495 {
1295 maptex tex = self->tex [face]; 1496 maptex tex = self->tex [face];
1296
1297 int px = (x + 1) * 32 - tex.w; 1497 int px = (x + 1) * 32 - tex.w;
1298 int py = (y + 1) * 32 - tex.h; 1498 int py = (y + 1) * 32 - tex.h;
1299 1499
1300 if (last_name != tex.name) 1500 if (last_name != tex.name)
1301 { 1501 {
1302 glEnd (); 1502 glEnd ();
1303 last_name = tex.name;
1304 glBindTexture (GL_TEXTURE_2D, last_name); 1503 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1305 glBegin (GL_QUADS); 1504 glBegin (GL_QUADS);
1306 } 1505 }
1307 1506
1308 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1507 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1309 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1508 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1310 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1509 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1311 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1510 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1312 } 1511 }
1512
1513 if (cell->flags && z == 2)
1514 {
1515 if (cell->flags & 1)
1516 {
1517 maptex tex = self->tex [1];
1518 int px = (x + 1) * 32 - tex.w + 2;
1519 int py = (y + 1) * 32 - tex.h - 6;
1520
1521 glEnd ();
1522 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1523 glBegin (GL_QUADS);
1524
1525 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1526 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1527 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1528 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1529 }
1530 }
1313 } 1531 }
1314 } 1532 }
1315 1533
1316 glEnd (); 1534 glEnd ();
1317 1535
1318 glDisable (GL_TEXTURE_2D); 1536 glDisable (GL_TEXTURE_2D);
1319 glDisable (GL_BLEND); 1537 glDisable (GL_BLEND);
1538
1539 // top layer: overlays such as the health bar
1540 for (y = 0; y < sh; y++)
1541 if (0 <= y + vy && y + vy < self->rows)
1542 {
1543 maprow *row = self->row + (y + vy);
1544
1545 for (x = 0; x < sw; x++)
1546 if (row->c0 <= x + vx && x + vx < row->c1)
1547 {
1548 mapcell *cell = row->col + (x + vx - row->c0);
1549
1550 int px = x * 32;
1551 int py = y * 32;
1552
1553 if (cell->stat_hp)
1554 {
1555 int width = cell->stat_width * 32;
1556 int thick = sh / 28 + 1 + cell->stat_width;
1557
1558 glColor3ub (0, 0, 0);
1559 glRectf (px + 1, py - thick - 2,
1560 px + width - 1, py);
1561
1562 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1563 glRectf (px + 2,
1564 py - thick - 1,
1565 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1566 }
1567 }
1568 }
1569}
1570
1571void
1572draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1573 CODE:
1574{
1575 static float color[16][3] = {
1576 { 0.00F, 0.00F, 0.00F },
1577 { 1.00F, 1.00F, 1.00F },
1578 { 0.00F, 0.00F, 0.55F },
1579 { 1.00F, 0.00F, 0.00F },
1580
1581 { 1.00F, 0.54F, 0.00F },
1582 { 0.11F, 0.56F, 1.00F },
1583 { 0.93F, 0.46F, 0.00F },
1584 { 0.18F, 0.54F, 0.34F },
1585
1586 { 0.56F, 0.73F, 0.56F },
1587 { 0.80F, 0.80F, 0.80F },
1588 { 0.55F, 0.41F, 0.13F },
1589 { 0.99F, 0.77F, 0.26F },
1590
1591 { 0.74F, 0.65F, 0.41F },
1592
1593 { 0.00F, 1.00F, 1.00F },
1594 { 1.00F, 0.00F, 1.00F },
1595 { 1.00F, 1.00F, 0.00F },
1596 };
1597
1598 int x, y;
1599
1600 glEnable (GL_TEXTURE_2D);
1601 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1602 glEnable (GL_BLEND);
1603 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1604 glBegin (GL_QUADS);
1605
1606 for (y = 0; y < h; y++)
1607 for (x = 0; x < w; x++)
1608 {
1609 unsigned char m = data [x + y * w];
1610
1611 if (m)
1612 {
1613 float *c = color [m & 15];
1614
1615 float tx1 = m & 0x40 ? 0.5 : 0.;
1616 float tx2 = tx1 + 0.5;
1617
1618 glColor4f (c[0], c[1], c[2], 0.75);
1619 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1620 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1621 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1622 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1623 }
1624 }
1625
1626 glEnd ();
1627 glDisable (GL_BLEND);
1628 glDisable (GL_TEXTURE_2D);
1629}
1630
1631void
1632fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1633 PPCODE:
1634{
1635 int vx, vy;
1636 int x, y;
1637 int sw4 = (sw + 3) & ~3;
1638 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1639 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1640
1641 memset (darkness, 255, sw4 * sh);
1642 SvPOK_only (darkness_sv);
1643 SvCUR_set (darkness_sv, sw4 * sh);
1644
1645 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1646 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1647
1648 for (y = 0; y < sh; y++)
1649 if (0 <= y + vy && y + vy < self->rows)
1650 {
1651 maprow *row = self->row + (y + vy);
1652
1653 for (x = 0; x < sw; x++)
1654 if (row->c0 <= x + vx && x + vx < row->c1)
1655 {
1656 mapcell *cell = row->col + (x + vx - row->c0);
1657
1658 darkness[y * sw4 + x] = cell->darkness
1659 ? 255 - (cell->darkness - 1)
1660 : 255 - FOW_DARKNESS;
1661 }
1662 }
1320 1663
1321 EXTEND (SP, 3); 1664 EXTEND (SP, 3);
1322 PUSHs (sv_2mortal (newSViv (sw4))); 1665 PUSHs (sv_2mortal (newSViv (sw4)));
1323 PUSHs (sv_2mortal (newSViv (sh))); 1666 PUSHs (sv_2mortal (newSViv (sh)));
1324 PUSHs (darkness_sv); 1667 PUSHs (darkness_sv);
1325} 1668}
1326 1669
1327SV * 1670SV *
1328get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1671get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1329 CODE: 1672 CODE:
1330{ 1673{
1331 int x, y, x1, y1; 1674 int x, y, x1, y1;
1332 SV *data_sv = newSV (w * h * 7 + 5); 1675 SV *data_sv = newSV (w * h * 7 + 5);
1333 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1676 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1395} 1738}
1396 OUTPUT: 1739 OUTPUT:
1397 RETVAL 1740 RETVAL
1398 1741
1399void 1742void
1400set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1743set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1401 PPCODE: 1744 PPCODE:
1402{ 1745{
1403 int x, y, z; 1746 int x, y, z;
1404 int w, h; 1747 int w, h;
1405 int x1, y1; 1748 int x1, y1;
1437 1780
1438 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1781 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1439 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1782 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1440 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1783 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1441 1784
1442 if (cell->darkness <= 0) 1785 if (cell->darkness == 0)
1443 { 1786 {
1444 cell->darkness = -1; 1787 cell->darkness = 0;
1445 1788
1446 for (z = 0; z <= 2; z++) 1789 for (z = 0; z <= 2; z++)
1447 { 1790 {
1448 cell->face[z] = face[z]; 1791 cell->face[z] = face[z];
1449 1792
1454 } 1797 }
1455 } 1798 }
1456 } 1799 }
1457} 1800}
1458 1801
1459MODULE = CFClient PACKAGE = CFClient::MixChunk 1802MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1460 1803
1461CFClient::MixChunk 1804CFPlus::MixChunk
1462new_from_file (SV *class, char *path) 1805new_from_file (SV *class, char *path)
1463 CODE: 1806 CODE:
1464 RETVAL = Mix_LoadWAV (path); 1807 RETVAL = Mix_LoadWAV (path);
1465 OUTPUT: 1808 OUTPUT:
1466 RETVAL 1809 RETVAL
1467 1810
1468void 1811void
1469DESTROY (CFClient::MixChunk self) 1812DESTROY (CFPlus::MixChunk self)
1470 CODE: 1813 CODE:
1471 Mix_FreeChunk (self); 1814 Mix_FreeChunk (self);
1472 1815
1473int 1816int
1474volume (CFClient::MixChunk self, int volume = -1) 1817volume (CFPlus::MixChunk self, int volume = -1)
1475 CODE: 1818 CODE:
1476 RETVAL = Mix_VolumeChunk (self, volume); 1819 RETVAL = Mix_VolumeChunk (self, volume);
1477 OUTPUT: 1820 OUTPUT:
1478 RETVAL 1821 RETVAL
1479 1822
1480int 1823int
1481play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1824play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1482 CODE: 1825 CODE:
1483 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1826 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1484 OUTPUT: 1827 OUTPUT:
1485 RETVAL 1828 RETVAL
1486 1829
1487MODULE = CFClient PACKAGE = CFClient::MixMusic 1830MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1488 1831
1489int 1832int
1490volume (int volume = -1) 1833volume (int volume = -1)
1491 CODE: 1834 CODE:
1492 RETVAL = Mix_VolumeMusic (volume); 1835 RETVAL = Mix_VolumeMusic (volume);
1493 OUTPUT: 1836 OUTPUT:
1494 RETVAL 1837 RETVAL
1495 1838
1496CFClient::MixMusic 1839CFPlus::MixMusic
1497new_from_file (SV *class, char *path) 1840new_from_file (SV *class, char *path)
1498 CODE: 1841 CODE:
1499 RETVAL = Mix_LoadMUS (path); 1842 RETVAL = Mix_LoadMUS (path);
1500 OUTPUT: 1843 OUTPUT:
1501 RETVAL 1844 RETVAL
1502 1845
1503void 1846void
1504DESTROY (CFClient::MixMusic self) 1847DESTROY (CFPlus::MixMusic self)
1505 CODE: 1848 CODE:
1506 Mix_FreeMusic (self); 1849 Mix_FreeMusic (self);
1507 1850
1508int 1851int
1509play (CFClient::MixMusic self, int loops = -1) 1852play (CFPlus::MixMusic self, int loops = -1)
1510 CODE: 1853 CODE:
1511 RETVAL = Mix_PlayMusic (self, loops); 1854 RETVAL = Mix_PlayMusic (self, loops);
1512 OUTPUT: 1855 OUTPUT:
1513 RETVAL 1856 RETVAL
1514 1857
1515MODULE = CFClient PACKAGE = CFClient::OpenGL 1858MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1516 1859
1517BOOT: 1860BOOT:
1518{ 1861{
1519 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1862 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1520 static const struct { 1863 static const struct {
1521 const char *name; 1864 const char *name;
1522 IV iv; 1865 IV iv;
1523 } *civ, const_iv[] = { 1866 } *civ, const_iv[] = {
1524# define const_iv(name) { # name, (IV)name } 1867# define const_iv(name) { # name, (IV)name }
1531 const_iv (GL_SCISSOR_TEST), 1874 const_iv (GL_SCISSOR_TEST),
1532 const_iv (GL_DEPTH_TEST), 1875 const_iv (GL_DEPTH_TEST),
1533 const_iv (GL_ALPHA_TEST), 1876 const_iv (GL_ALPHA_TEST),
1534 const_iv (GL_NORMALIZE), 1877 const_iv (GL_NORMALIZE),
1535 const_iv (GL_RESCALE_NORMAL), 1878 const_iv (GL_RESCALE_NORMAL),
1879 const_iv (GL_FRONT),
1880 const_iv (GL_BACK),
1536 const_iv (GL_AND), 1881 const_iv (GL_AND),
1537 const_iv (GL_ONE), 1882 const_iv (GL_ONE),
1538 const_iv (GL_ZERO), 1883 const_iv (GL_ZERO),
1539 const_iv (GL_SRC_ALPHA), 1884 const_iv (GL_SRC_ALPHA),
1540 const_iv (GL_SRC_ALPHA_SATURATE), 1885 const_iv (GL_DST_ALPHA),
1541 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1886 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542 const_iv (GL_ONE_MINUS_DST_ALPHA), 1887 const_iv (GL_ONE_MINUS_DST_ALPHA),
1888 const_iv (GL_SRC_ALPHA_SATURATE),
1543 const_iv (GL_RGB), 1889 const_iv (GL_RGB),
1544 const_iv (GL_RGBA), 1890 const_iv (GL_RGBA),
1891 const_iv (GL_RGBA4),
1892 const_iv (GL_RGBA8),
1893 const_iv (GL_RGB5_A1),
1545 const_iv (GL_UNSIGNED_BYTE), 1894 const_iv (GL_UNSIGNED_BYTE),
1546 const_iv (GL_UNSIGNED_SHORT), 1895 const_iv (GL_UNSIGNED_SHORT),
1547 const_iv (GL_UNSIGNED_INT), 1896 const_iv (GL_UNSIGNED_INT),
1548 const_iv (GL_ALPHA), 1897 const_iv (GL_ALPHA),
1549 const_iv (GL_INTENSITY), 1898 const_iv (GL_INTENSITY),
1581 const_iv (GL_SEPARABLE_2D), 1930 const_iv (GL_SEPARABLE_2D),
1582 const_iv (GL_CONVOLUTION_2D), 1931 const_iv (GL_CONVOLUTION_2D),
1583 const_iv (GL_CONVOLUTION_BORDER_MODE), 1932 const_iv (GL_CONVOLUTION_BORDER_MODE),
1584 const_iv (GL_CONSTANT_BORDER), 1933 const_iv (GL_CONSTANT_BORDER),
1585 const_iv (GL_LINES), 1934 const_iv (GL_LINES),
1935 const_iv (GL_LINE_STRIP),
1586 const_iv (GL_LINE_LOOP), 1936 const_iv (GL_LINE_LOOP),
1587 const_iv (GL_QUADS), 1937 const_iv (GL_QUADS),
1588 const_iv (GL_QUAD_STRIP), 1938 const_iv (GL_QUAD_STRIP),
1589 const_iv (GL_TRIANGLES), 1939 const_iv (GL_TRIANGLES),
1590 const_iv (GL_TRIANGLE_STRIP), 1940 const_iv (GL_TRIANGLE_STRIP),
1623 OUTPUT: 1973 OUTPUT:
1624 RETVAL 1974 RETVAL
1625 1975
1626int glGetError () 1976int glGetError ()
1627 1977
1978void glFinish ()
1979
1628void glClear (int mask) 1980void glClear (int mask)
1629 1981
1630void glClearColor (float r, float g, float b, float a = 1.0) 1982void glClearColor (float r, float g, float b, float a = 1.0)
1631 PROTOTYPE: @ 1983 PROTOTYPE: @
1632 1984
1638 1990
1639void glHint (int target, int mode) 1991void glHint (int target, int mode)
1640 1992
1641void glBlendFunc (int sfactor, int dfactor) 1993void glBlendFunc (int sfactor, int dfactor)
1642 1994
1995void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1996 CODE:
1997 gl_BlendFuncSeparate (sa, da, saa, daa);
1998
1643void glDepthMask (int flag) 1999void glDepthMask (int flag)
1644 2000
1645void glLogicOp (int opcode) 2001void glLogicOp (int opcode)
1646 2002
1647void glColorMask (int red, int green, int blue, int alpha) 2003void glColorMask (int red, int green, int blue, int alpha)
1651void glPushMatrix () 2007void glPushMatrix ()
1652 2008
1653void glPopMatrix () 2009void glPopMatrix ()
1654 2010
1655void glLoadIdentity () 2011void glLoadIdentity ()
2012
2013void glDrawBuffer (int buffer)
2014
2015void glReadBuffer (int buffer)
1656 2016
1657# near_ and far_ are due to microsofts buggy "c" compiler 2017# near_ and far_ are due to microsofts buggy "c" compiler
1658void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2018void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1659 2019
1660# near_ and far_ are due to microsofts buggy "c" compiler 2020# near_ and far_ are due to microsofts buggy "c" compiler
1680 2040
1681void glEnd () 2041void glEnd ()
1682 2042
1683void glColor (float r, float g, float b, float a = 1.0) 2043void glColor (float r, float g, float b, float a = 1.0)
1684 PROTOTYPE: @ 2044 PROTOTYPE: @
2045 ALIAS:
2046 glColor_premultiply = 1
1685 CODE: 2047 CODE:
2048 if (ix)
2049 {
2050 r *= a;
2051 g *= a;
2052 b *= a;
2053 }
1686 // microsoft visual "c" rounds instead of truncating... 2054 // microsoft visual "c" rounds instead of truncating...
1687 glColor4ub (MIN ((int)(r * 255.f), 255), 2055 glColor4f (r, g, b, a);
1688 MIN ((int)(g * 255.f), 255),
1689 MIN ((int)(b * 255.f), 255),
1690 MIN ((int)(a * 255.f), 255));
1691 2056
1692void glInterleavedArrays (int format, int stride, char *data) 2057void glInterleavedArrays (int format, int stride, char *data)
1693 2058
1694void glDrawElements (int mode, int count, int type, char *indices) 2059void glDrawElements (int mode, int count, int type, char *indices)
1695 2060
1718 2083
1719void glBindTexture (int target, int name) 2084void glBindTexture (int target, int name)
1720 2085
1721void glConvolutionParameter (int target, int pname, float params) 2086void glConvolutionParameter (int target, int pname, float params)
1722 CODE: 2087 CODE:
1723 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2088 if (gl.ConvolutionParameterf)
2089 gl.ConvolutionParameterf (target, pname, params);
1724 2090
1725void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2091void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1726 CODE: 2092 CODE:
1727 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2093 if (gl.ConvolutionFilter2D)
1728 (target, internalformat, width, height, format, type, data)); 2094 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1729 2095
1730void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2096void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1731 CODE: 2097 CODE:
1732 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2098 if (gl.SeparableFilter2D)
1733 (target, internalformat, width, height, format, type, row, column)); 2099 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1734 2100
1735void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2101void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1736 2102
1737void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2103void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1738 2104
1771 2137
1772void glEndList () 2138void glEndList ()
1773 2139
1774void glCallList (int list) 2140void glCallList (int list)
1775 2141
1776

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines