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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines