ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 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)
565 CODE: 651 CODE:
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
570char * 656void
571gl_vendor () 657win32_proxy_info ()
572 CODE: 658 PPCODE:
573 RETVAL = (char *)glGetString (GL_VENDOR); 659{
574 OUTPUT: 660#ifdef _WIN32
575 RETVAL 661 char buffer[2048];
662 DWORD buflen;
576 663
577char * 664 EXTEND (SP, 3);
578gl_version () 665
579 CODE: 666 buflen = sizeof (buffer);
580 RETVAL = (char *)glGetString (GL_VERSION); 667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
581 OUTPUT: 668 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
582 RETVAL 669 {
670 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
583 671
584char * 672 buflen = sizeof (buffer);
585gl_extensions () 673 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
586 CODE: 674 {
587 RETVAL = (char *)glGetString (GL_EXTENSIONS); 675 PUSHs (newSVpv (buffer, 0));
588 OUTPUT: 676
589 RETVAL 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}
590 684
591void 685void
592add_font (char *file) 686add_font (char *file)
593 CODE: 687 CODE:
594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 688 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
599 689
600void 690void
601load_image_inline (SV *image_) 691load_image_inline (SV *image_)
602 ALIAS: 692 ALIAS:
603 load_image_file = 1 693 load_image_file = 1
645 735
646 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 736 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647 737
648 assert (surface2->pitch == surface2->w * 4); 738 assert (surface2->pitch == surface2->w * 4);
649 739
740 SDL_LockSurface (surface2);
650 EXTEND (SP, 5); 741 EXTEND (SP, 6);
651 PUSHs (sv_2mortal (newSViv (surface2->w))); 742 PUSHs (sv_2mortal (newSViv (surface2->w)));
652 PUSHs (sv_2mortal (newSViv (surface2->h))); 743 PUSHs (sv_2mortal (newSViv (surface2->h)));
653 SDL_LockSurface (surface2);
654 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 744 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655 SDL_UnlockSurface (surface2);
656 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 745 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 746 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 747 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
748 SDL_UnlockSurface (surface2);
659 749
660 SDL_FreeSurface (surface); 750 SDL_FreeSurface (surface);
661 SDL_FreeSurface (surface2); 751 SDL_FreeSurface (surface2);
662} 752}
663 753
699 CODE: 789 CODE:
700 fprintf (stderr, "FATAL: %s\n", message); 790 fprintf (stderr, "FATAL: %s\n", message);
701#ifdef _WIN32 791#ifdef _WIN32
702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703#endif 793#endif
704 exit (1); 794 _exit (1);
705 795
796void
797_exit (int retval = 0)
798 CODE:
799 _exit (retval);
800
706MODULE = CFClient PACKAGE = CFClient::Font 801MODULE = CFPlus PACKAGE = CFPlus::Font
707 802
708CFClient::Font 803CFPlus::Font
709new_from_file (SV *class, char *path, int id = 0) 804new_from_file (SV *class, char *path, int id = 0)
710 CODE: 805 CODE:
711{ 806{
712 int count; 807 int count;
713 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
716} 811}
717 OUTPUT: 812 OUTPUT:
718 RETVAL 813 RETVAL
719 814
720void 815void
721DESTROY (CFClient::Font self) 816DESTROY (CFPlus::Font self)
722 CODE: 817 CODE:
723 pango_font_description_free (self); 818 pango_font_description_free (self);
724 819
725void 820void
726make_default (CFClient::Font self) 821make_default (CFPlus::Font self)
727 CODE: 822 CODE:
728 default_font = self; 823 default_font = self;
729 824
730MODULE = CFClient PACKAGE = CFClient::Layout 825MODULE = CFPlus PACKAGE = CFPlus::Layout
731 826
732CFClient::Layout 827void
733new (SV *class, int rgba = 0) 828reset_glyph_cache ()
734 CODE: 829 CODE:
735#if _WIN32 830 tc_clear ();
736 rgba = 0;//D 831
737#endif 832CFPlus::Layout
833new (SV *class)
834 CODE:
738 New (0, RETVAL, 1, struct cf_layout); 835 New (0, RETVAL, 1, struct cf_layout);
739 836
740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 837 RETVAL->pl = pango_layout_new (opengl_context);
741 RETVAL->rgba = rgba;
742 RETVAL->r = 1.; 838 RETVAL->r = 1.;
743 RETVAL->g = 1.; 839 RETVAL->g = 1.;
744 RETVAL->b = 1.; 840 RETVAL->b = 1.;
745 RETVAL->a = 1.; 841 RETVAL->a = 1.;
746 RETVAL->base_height = MIN_FONT_HEIGHT; 842 RETVAL->base_height = MIN_FONT_HEIGHT;
750 layout_update_font (RETVAL); 846 layout_update_font (RETVAL);
751 OUTPUT: 847 OUTPUT:
752 RETVAL 848 RETVAL
753 849
754void 850void
755DESTROY (CFClient::Layout self) 851DESTROY (CFPlus::Layout self)
756 CODE: 852 CODE:
757 g_object_unref (self->pl); 853 g_object_unref (self->pl);
758 Safefree (self); 854 Safefree (self);
759 855
760int
761is_rgba (CFClient::Layout self)
762 CODE:
763 RETVAL = self->rgba;
764 OUTPUT:
765 RETVAL
766
767void 856void
768set_text (CFClient::Layout self, SV *text_) 857set_text (CFPlus::Layout self, SV *text_)
769 CODE: 858 CODE:
770{ 859{
771 STRLEN textlen; 860 STRLEN textlen;
772 char *text = SvPVutf8 (text_, textlen); 861 char *text = SvPVutf8 (text_, textlen);
773 862
774 pango_layout_set_text (self->pl, text, textlen); 863 pango_layout_set_text (self->pl, text, textlen);
775} 864}
776 865
777void 866void
778set_markup (CFClient::Layout self, SV *text_) 867set_markup (CFPlus::Layout self, SV *text_)
779 CODE: 868 CODE:
780{ 869{
781 STRLEN textlen; 870 STRLEN textlen;
782 char *text = SvPVutf8 (text_, textlen); 871 char *text = SvPVutf8 (text_, textlen);
783 872
784 pango_layout_set_markup (self->pl, text, textlen); 873 pango_layout_set_markup (self->pl, text, textlen);
785} 874}
786 875
876void
877set_shapes (CFPlus::Layout self, ...)
878 CODE:
879{
880 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text;
883 int arg = 4;
884
885 while (arg < items && (pos = strstr (pos, OBJ_STR)))
886 {
887 PangoRectangle inkrect, rect;
888 PangoAttribute *attr;
889
890 int x = SvIV (ST (arg - 3));
891 int y = SvIV (ST (arg - 2));
892 int w = SvIV (ST (arg - 1));
893 int h = SvIV (ST (arg ));
894
895 inkrect.x = 0;
896 inkrect.y = 0;
897 inkrect.width = 0;
898 inkrect.height = 0;
899
900 rect.x = x * PANGO_SCALE;
901 rect.y = y * PANGO_SCALE;
902 rect.width = w * PANGO_SCALE;
903 rect.height = h * PANGO_SCALE;
904
905 if (!attrs)
906 attrs = pango_layout_get_attributes (self->pl);
907
908 attr = pango_attr_shape_new (&inkrect, &rect);
909 attr->start_index = pos - text;
910 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
911 pango_attr_list_insert (attrs, attr);
912
913 arg += 4;
914 pos += sizeof (OBJ_STR) - 1;
915 }
916
917 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs);
919}
920
921void
922get_shapes (CFPlus::Layout self)
923 PPCODE:
924{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926
927 do
928 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
930
931 if (run && shape_attr_p (run))
932 {
933 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents);
935
936 EXTEND (SP, 2);
937 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
938 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
939 }
940 }
941 while (pango_layout_iter_next_run (iter));
942
943 pango_layout_iter_free (iter);
944}
945
946int
947has_wrapped (CFPlus::Layout self)
948 CODE:
949{
950 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl);
952
953 while (*text)
954 lines += *text++ == '\n';
955
956 RETVAL = lines < pango_layout_get_line_count (self->pl);
957}
958 OUTPUT:
959 RETVAL
960
787SV * 961SV *
788get_text (CFClient::Layout self) 962get_text (CFPlus::Layout self)
789 CODE: 963 CODE:
790 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791 SvUTF8_on (RETVAL); 965 sv_utf8_decode (RETVAL);
792 OUTPUT: 966 OUTPUT:
793 RETVAL 967 RETVAL
794 968
795void 969void
796set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 970set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797 CODE: 971 CODE:
798 self->r = r; 972 self->r = r;
799 self->g = g; 973 self->g = g;
800 self->b = b; 974 self->b = b;
801 self->a = a; 975 self->a = a;
802 976
803void 977void
804set_font (CFClient::Layout self, CFClient::Font font = 0) 978set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805 CODE: 979 CODE:
806 if (self->font != font) 980 if (self->font != font)
807 { 981 {
808 self->font = font; 982 self->font = font;
809 layout_update_font (self); 983 layout_update_font (self);
810 } 984 }
811 985
812void 986void
813set_height (CFClient::Layout self, int base_height) 987set_height (CFPlus::Layout self, int base_height)
814 CODE: 988 CODE:
815 if (self->base_height != base_height) 989 if (self->base_height != base_height)
816 { 990 {
817 self->base_height = base_height; 991 self->base_height = base_height;
818 layout_update_font (self); 992 layout_update_font (self);
819 } 993 }
820 994
821void 995void
822set_width (CFClient::Layout self, int max_width = -1) 996set_width (CFPlus::Layout self, int max_width = -1)
823 CODE: 997 CODE:
824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 998 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825 999
826void 1000void
827set_indent (CFClient::Layout self, int indent) 1001set_indent (CFPlus::Layout self, int indent)
828 CODE: 1002 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830 1004
831void 1005void
832set_spacing (CFClient::Layout self, int spacing) 1006set_spacing (CFPlus::Layout self, int spacing)
833 CODE: 1007 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835 1009
836void 1010void
837set_ellipsise (CFClient::Layout self, int ellipsise) 1011set_ellipsise (CFPlus::Layout self, int ellipsise)
838 CODE: 1012 CODE:
839 pango_layout_set_ellipsize (self->pl, 1013 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE 1017 : PANGO_ELLIPSIZE_NONE
844 ); 1018 );
845 1019
846void 1020void
847set_single_paragraph_mode (CFClient::Layout self, int spm) 1021set_single_paragraph_mode (CFPlus::Layout self, int spm)
848 CODE: 1022 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850 1024
851void 1025void
852size (CFClient::Layout self) 1026size (CFPlus::Layout self)
853 PPCODE: 1027 PPCODE:
854{ 1028{
855 int w, h; 1029 int w, h;
856 1030
857 layout_get_pixel_size (self, &w, &h); 1031 layout_get_pixel_size (self, &w, &h);
860 PUSHs (sv_2mortal (newSViv (w))); 1034 PUSHs (sv_2mortal (newSViv (w)));
861 PUSHs (sv_2mortal (newSViv (h))); 1035 PUSHs (sv_2mortal (newSViv (h)));
862} 1036}
863 1037
864int 1038int
1039descent (CFPlus::Layout self)
1040 CODE:
1041{
1042 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect);
1046}
1047 OUTPUT:
1048 RETVAL
1049
1050int
865xy_to_index (CFClient::Layout self, int x, int y) 1051xy_to_index (CFPlus::Layout self, int x, int y)
866 CODE: 1052 CODE:
867{ 1053{
868 int index, trailing; 1054 int index, trailing;
869 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870 RETVAL = index; 1056 RETVAL = index;
871} 1057}
872 OUTPUT: 1058 OUTPUT:
873 RETVAL 1059 RETVAL
874 1060
875void 1061void
876cursor_pos (CFClient::Layout self, int index) 1062cursor_pos (CFPlus::Layout self, int index)
877 PPCODE: 1063 PPCODE:
878{ 1064{
879 PangoRectangle strong_pos; 1065 PangoRectangle strong_pos;
880 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881 1067
884 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886} 1072}
887 1073
888void 1074void
889render (CFClient::Layout self) 1075render (CFPlus::Layout self, float x, float y, int flags = 0)
890 PPCODE: 1076 PPCODE:
891{ 1077 pango_opengl_render_layout_subpixel (
892 SV *retval; 1078 self->pl,
893 int w, h; 1079 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a,
1081 flags
1082 );
894 1083
895 layout_get_pixel_size (self, &w, &h); 1084MODULE = CFPlus PACKAGE = CFPlus::Texture
896 1085
897 if (self->rgba) 1086void
1087pad2pot (SV *data_, SV *w_, SV *h_)
1088 CODE:
1089{
1090 int ow = SvIV (w_);
1091 int oh = SvIV (h_);
1092
1093 if (ow && oh)
898 { 1094 {
899 cairo_surface_t *surface; 1095 int nw = minpot (ow);
900 cairo_t *cairo; 1096 int nh = minpot (oh);
901 1097
902 retval = newSV (w * h * 4); 1098 if (nw != ow || nh != oh)
903 SvPOK_only (retval);
904 SvCUR_set (retval, w * h * 4);
905
906 memset (SvPVX (retval), 0, w * h * 4);
907
908 surface = cairo_image_surface_create_for_data (
909 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910 cairo = cairo_create (surface);
911 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913 pango_cairo_show_layout (cairo, self->pl);
914
915 cairo_destroy (cairo);
916 cairo_surface_destroy (surface);
917
918 // what a mess, and its premultiplied, too :(
919 { 1099 {
920 uint32_t *p = (uint32_t *)SvPVX (retval); 1100 if (SvOK (data_))
921 uint32_t *e = p + w * h;
922
923 while (p < e)
924 { 1101 {
925 uint32_t rgba = *p; 1102 STRLEN datalen;
926 rgba = (rgba >> 24) | (rgba << 8); 1103 char *data = SvPVbyte (data_, datalen);
927#if 0 1104 int bpp = datalen / (ow * oh);
928#ifdef _WIN32 1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934 1106
935 rgba = (rgba & 0xffffff00) | a; 1107 SvPOK_only (result_);
1108 SvCUR_set (result_, nw * nh * bpp);
1109
1110 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--)
1112 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1113
1114 sv_setsv (data_, result_);
936 } 1115 }
937#endif 1116
938#endif 1117 sv_setiv (w_, nw);
939 rgba = SDL_SwapBE32 (rgba); 1118 sv_setiv (h_, nh);
940 *p++ = rgba;
941 } 1119 }
942 }
943
944 EXTEND (SP, 5);
945 PUSHs (sv_2mortal (newSViv (w)));
946 PUSHs (sv_2mortal (newSViv (h)));
947 PUSHs (sv_2mortal (retval));
948 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950 } 1120 }
951 else
952 {
953 FT_Bitmap bitmap;
954
955 retval = newSV (w * h);
956 SvPOK_only (retval);
957 SvCUR_set (retval, w * h);
958
959 bitmap.rows = h;
960 bitmap.width = w;
961 bitmap.pitch = w;
962 bitmap.buffer = (unsigned char*)SvPVX (retval);
963 bitmap.num_grays = 256;
964 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966 memset (bitmap.buffer, 0, w * h);
967
968 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970 EXTEND (SP, 5);
971 PUSHs (sv_2mortal (newSViv (w)));
972 PUSHs (sv_2mortal (newSViv (h)));
973 PUSHs (sv_2mortal (retval));
974 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976 }
977} 1121}
978 1122
979MODULE = CFClient PACKAGE = CFClient::Texture
980
981void 1123void
982draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1124draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983 PROTOTYPE: $$$;$$ 1125 PROTOTYPE: $$$;$$
984 ALIAS: 1126 ALIAS:
985 draw_quad_alpha = 1 1127 draw_quad_alpha = 1
986 draw_quad_alpha_premultiplied = 2 1128 draw_quad_alpha_premultiplied = 2
987 CODE: 1129 CODE:
988{ 1130{
989 HV *hv = (HV *)SvRV (self); 1131 HV *hv = (HV *)SvRV (self);
990 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1132 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1133 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1134 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994 1135
995 if (items < 5) 1136 if (items < 5)
996 { 1137 {
997 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1138 w = SvNV (*hv_fetch (hv, "w", 1, 1));
998 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1139 h = SvNV (*hv_fetch (hv, "h", 1, 1));
999 } 1140 }
1000 1141
1001 if (ix) 1142 if (ix)
1002 { 1143 {
1003 glEnable (GL_BLEND); 1144 glEnable (GL_BLEND);
1145
1146 if (ix == 2)
1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1147 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1148 else
1149 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1150 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1151
1005 glEnable (GL_ALPHA_TEST); 1152 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f); 1153 glAlphaFunc (GL_GREATER, 0.01f);
1007 } 1154 }
1008 1155
1009 glBindTexture (GL_TEXTURE_2D, name); 1156 glBindTexture (GL_TEXTURE_2D, name);
1010
1011 if (wrap_mode)
1012 {
1013 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015 }
1016 1157
1017 glBegin (GL_QUADS); 1158 glBegin (GL_QUADS);
1018 glTexCoord2f (0, 0); glVertex2f (x , y ); 1159 glTexCoord2f (0, 0); glVertex2f (x , y );
1019 glTexCoord2f (0, t); glVertex2f (x , y + h); 1160 glTexCoord2f (0, t); glVertex2f (x , y + h);
1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1161 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1026 glDisable (GL_ALPHA_TEST); 1167 glDisable (GL_ALPHA_TEST);
1027 glDisable (GL_BLEND); 1168 glDisable (GL_BLEND);
1028 } 1169 }
1029} 1170}
1030 1171
1031MODULE = CFClient PACKAGE = CFClient::Map 1172MODULE = CFPlus PACKAGE = CFPlus::Map
1032 1173
1033CFClient::Map 1174CFPlus::Map
1034new (SV *class, int map_width, int map_height) 1175new (SV *class, int map_width, int map_height)
1035 CODE: 1176 CODE:
1036 New (0, RETVAL, 1, struct map); 1177 New (0, RETVAL, 1, struct map);
1037 RETVAL->x = 0; 1178 RETVAL->x = 0;
1038 RETVAL->y = 0; 1179 RETVAL->y = 0;
1048 RETVAL->row = 0; 1189 RETVAL->row = 0;
1049 OUTPUT: 1190 OUTPUT:
1050 RETVAL 1191 RETVAL
1051 1192
1052void 1193void
1053DESTROY (CFClient::Map self) 1194DESTROY (CFPlus::Map self)
1054 CODE: 1195 CODE:
1055{ 1196{
1056 map_clear (self); 1197 map_clear (self);
1057 Safefree (self->face); 1198 Safefree (self->face);
1199 Safefree (self->tex);
1058 Safefree (self); 1200 Safefree (self);
1059} 1201}
1060 1202
1061void 1203void
1062clear (CFClient::Map self) 1204clear (CFPlus::Map self)
1063 CODE: 1205 CODE:
1064 map_clear (self); 1206 map_clear (self);
1065 1207
1066void 1208void
1067set_face (CFClient::Map self, int face, int texid) 1209set_face (CFPlus::Map self, int face, int texid)
1068 CODE: 1210 CODE:
1069{ 1211{
1070 while (self->faces <= face) 1212 while (self->faces <= face)
1071 { 1213 {
1072 Append (mapface, self->face, self->faces, self->faces); 1214 Append (mapface, self->face, self->faces, self->faces);
1075 1217
1076 self->face [face] = texid; 1218 self->face [face] = texid;
1077} 1219}
1078 1220
1079void 1221void
1080set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1222set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1081 CODE: 1223 CODE:
1082{ 1224{
1083 while (self->texs <= texid) 1225 while (self->texs <= texid)
1084 { 1226 {
1085 Append (maptex, self->tex, self->texs, self->texs); 1227 Append (maptex, self->tex, self->texs, self->texs);
1097 tex->r = r; 1239 tex->r = r;
1098 tex->g = g; 1240 tex->g = g;
1099 tex->b = b; 1241 tex->b = b;
1100 tex->a = a; 1242 tex->a = a;
1101 } 1243 }
1244
1245 // somewhat hackish, but for textures that require it, it really
1246 // improves the look, and most others don't suffer.
1247 glBindTexture (GL_TEXTURE_2D, name);
1248 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1249 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1250 // use uglier nearest interpolation because linear suffers
1251 // from transparent color bleeding and ugly wrapping effects.
1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102} 1253}
1103 1254
1104int 1255int
1105ox (CFClient::Map self) 1256ox (CFPlus::Map self)
1106 ALIAS: 1257 ALIAS:
1107 oy = 1 1258 oy = 1
1259 x = 2
1260 y = 3
1261 w = 4
1262 h = 5
1108 CODE: 1263 CODE:
1109 switch (ix) 1264 switch (ix)
1110 { 1265 {
1111 case 0: RETVAL = self->ox; break; 1266 case 0: RETVAL = self->ox; break;
1112 case 1: RETVAL = self->oy; break; 1267 case 1: RETVAL = self->oy; break;
1268 case 2: RETVAL = self->x; break;
1269 case 3: RETVAL = self->y; break;
1270 case 4: RETVAL = self->w; break;
1271 case 5: RETVAL = self->h; break;
1113 } 1272 }
1114 OUTPUT: 1273 OUTPUT:
1115 RETVAL 1274 RETVAL
1116 1275
1117void 1276void
1118scroll (CFClient::Map self, int dx, int dy) 1277scroll (CFPlus::Map self, int dx, int dy)
1119 CODE: 1278 CODE:
1120{ 1279{
1121 if (dx > 0) 1280 if (dx > 0)
1122 map_blank (self, self->x, self->y, dx - 1, self->h); 1281 map_blank (self, self->x, self->y, dx, self->h);
1123 else if (dx < 0) 1282 else if (dx < 0)
1124 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1125 1284
1126 if (dy > 0) 1285 if (dy > 0)
1127 map_blank (self, self->x, self->y, self->w, dy - 1); 1286 map_blank (self, self->x, self->y, self->w, dy);
1128 else if (dy < 0) 1287 else if (dy < 0)
1129 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1130 1289
1131 self->ox += dx; self->x += dx; 1290 self->ox += dx; self->x += dx;
1132 self->oy += dy; self->y += dy; 1291 self->oy += dy; self->y += dy;
1133 1292
1134 while (self->y < 0) 1293 while (self->y < 0)
1139 self->y += MAP_EXTEND_Y; 1298 self->y += MAP_EXTEND_Y;
1140 } 1299 }
1141} 1300}
1142 1301
1143void 1302void
1144map1a_update (CFClient::Map self, SV *data_) 1303map1a_update (CFPlus::Map self, SV *data_, int extmap)
1145 CODE: 1304 CODE:
1146{ 1305{
1147 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1148 uint8_t *data_end = (uint8_t *)SvEND (data_); 1307 uint8_t *data_end = (uint8_t *)SvEND (data_);
1149 mapcell *cell; 1308 mapcell *cell;
1150 int x, y, flags; 1309 int x, y, flags;
1151 1310
1152 while (data < data_end) 1311 while (data < data_end - 1)
1153 { 1312 {
1154 flags = (data [0] << 8) + data [1]; data += 2; 1313 flags = (data [0] << 8) + data [1]; data += 2;
1155 1314
1156 x = ((flags >> 10) & 63) + self->x; 1315 x = self->x + ((flags >> 10) & 63);
1157 y = ((flags >> 4) & 63) + self->y; 1316 y = self->y + ((flags >> 4) & 63);
1158 1317
1159 cell = map_get_cell (self, x, y); 1318 cell = map_get_cell (self, x, y);
1160 1319
1161 if (flags & 15) 1320 if (flags & 15)
1162 { 1321 {
1163 if (cell->darkness < 0) 1322 if (!cell->darkness)
1164 { 1323 {
1324 memset (cell, 0, sizeof (*cell));
1165 cell->darkness = 0; 1325 cell->darkness = 256;
1166 cell->face [0] = 0;
1167 cell->face [1] = 0;
1168 cell->face [2] = 0;
1169 } 1326 }
1170 1327
1171 cell->darkness = flags & 8 ? *data++ : 255;
1172
1173 //TODO: don't trust server data to be in-range(!) 1328 //TODO: don't trust server data to be in-range(!)
1329
1330 if (flags & 8)
1331 {
1332 if (extmap)
1333 {
1334 uint8_t ext, cmd;
1335
1336 do
1337 {
1338 ext = *data++;
1339 cmd = ext & 0x3f;
1340
1341 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health
1344 {
1345 cell->stat_width = 1;
1346 cell->stat_hp = *data++;
1347 }
1348 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width
1351 {
1352 if (*data == 4)
1353 ; // decode player tag
1354
1355 data += *data + 1;
1356 }
1357 else if (cmd == 8) // cell flags
1358 cell->flags = *data++;
1359 else if (ext & 0x40) // unknown, multibyte => skip
1360 data += *data + 1;
1361 else
1362 data++;
1363 }
1364 while (ext & 0x80);
1365 }
1366 else
1367 cell->darkness = *data++ + 1;
1368 }
1174 1369
1175 if (flags & 4) 1370 if (flags & 4)
1176 { 1371 {
1177 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1178 } 1373 }
1186 { 1381 {
1187 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1188 } 1383 }
1189 } 1384 }
1190 else 1385 else
1191 cell->darkness = -1; 1386 cell->darkness = 0;
1192 } 1387 }
1193} 1388}
1194 1389
1195SV * 1390SV *
1196mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1197 CODE: 1392 CODE:
1198{ 1393{
1199 int x1, x; 1394 int x1, x;
1200 int y1, y; 1395 int y1, y;
1201 int z; 1396 int z;
1251} 1446}
1252 OUTPUT: 1447 OUTPUT:
1253 RETVAL 1448 RETVAL
1254 1449
1255void 1450void
1256draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257 PPCODE: 1452 CODE:
1258{ 1453{
1259 int vx, vy; 1454 int vx, vy;
1260 int x, y, z; 1455 int x, y, z;
1261 int last_name; 1456 int last_name;
1262 mapface face; 1457 mapface face;
1263 int sw4 = (sw + 3) & ~3;
1264 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1265 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1266 1458
1267 memset (darkness, 255, sw4 * sh);
1268 SvPOK_only (darkness_sv);
1269 SvCUR_set (darkness_sv, sw4 * sh);
1270
1271 vx = self->x + (self->w - sw) / 2 - shift_x; 1459 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272 vy = self->y + (self->h - sh) / 2 - shift_y; 1460 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273 1461
1274 /* 1462 /*
1275 int vx = self->vx = self->w >= sw 1463 int vx = self->vx = self->w >= sw
1276 ? self->x + (self->w - sw) / 2 1464 ? self->x + (self->w - sw) / 2
1277 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1281 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282 */ 1470 */
1283 1471
1284 glColor4ub (255, 255, 255, 255); 1472 glColor4ub (255, 255, 255, 255);
1285 1473
1474 glEnable (GL_BLEND);
1286 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287 glEnable (GL_BLEND);
1288 glEnable (GL_TEXTURE_2D); 1476 glEnable (GL_TEXTURE_2D);
1289 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290 1478
1291 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1292 1480
1301 for (x = 0; x < sw; x++) 1489 for (x = 0; x < sw; x++)
1302 if (row->c0 <= x + vx && x + vx < row->c1) 1490 if (row->c0 <= x + vx && x + vx < row->c1)
1303 { 1491 {
1304 mapcell *cell = row->col + (x + vx - row->c0); 1492 mapcell *cell = row->col + (x + vx - row->c0);
1305 1493
1306 darkness[y * sw4 + x] = cell->darkness < 0
1307 ? 255 - FOW_DARKNESS
1308 : 255 - cell->darkness;
1309
1310 face = cell->face [z]; 1494 face = cell->face [z];
1311 1495
1312 if (face) 1496 if (face && face < self->texs)
1313 { 1497 {
1314 maptex tex = self->tex [face]; 1498 maptex tex = self->tex [face];
1315
1316 int px = (x + 1) * 32 - tex.w; 1499 int px = (x + 1) * 32 - tex.w;
1317 int py = (y + 1) * 32 - tex.h; 1500 int py = (y + 1) * 32 - tex.h;
1318 1501
1319 if (last_name != tex.name) 1502 if (last_name != tex.name)
1320 { 1503 {
1321 glEnd (); 1504 glEnd ();
1322 last_name = tex.name;
1323 glBindTexture (GL_TEXTURE_2D, last_name); 1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1324 glBegin (GL_QUADS); 1506 glBegin (GL_QUADS);
1325 } 1507 }
1326 1508
1327 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1328 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1329 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1330 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1331 } 1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 }
1532 }
1332 } 1533 }
1333 } 1534 }
1334 1535
1335 glEnd (); 1536 glEnd ();
1336 1537
1337 glDisable (GL_TEXTURE_2D); 1538 glDisable (GL_TEXTURE_2D);
1338 glDisable (GL_BLEND); 1539 glDisable (GL_BLEND);
1540
1541 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows)
1544 {
1545 maprow *row = self->row + (y + vy);
1546
1547 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1)
1549 {
1550 mapcell *cell = row->col + (x + vx - row->c0);
1551
1552 int px = x * 32;
1553 int py = y * 32;
1554
1555 if (cell->stat_hp)
1556 {
1557 int width = cell->stat_width * 32;
1558 int thick = sh / 28 + 1 + cell->stat_width;
1559
1560 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py);
1563
1564 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1565 glRectf (px + 2,
1566 py - thick - 1,
1567 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1568 }
1569 }
1570 }
1571}
1572
1573void
1574draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1575 CODE:
1576{
1577 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F },
1580 { 0.00F, 0.00F, 0.55F },
1581 { 1.00F, 0.00F, 0.00F },
1582
1583 { 1.00F, 0.54F, 0.00F },
1584 { 0.11F, 0.56F, 1.00F },
1585 { 0.93F, 0.46F, 0.00F },
1586 { 0.18F, 0.54F, 0.34F },
1587
1588 { 0.56F, 0.73F, 0.56F },
1589 { 0.80F, 0.80F, 0.80F },
1590 { 0.55F, 0.41F, 0.13F },
1591 { 0.99F, 0.77F, 0.26F },
1592
1593 { 0.74F, 0.65F, 0.41F },
1594
1595 { 0.00F, 1.00F, 1.00F },
1596 { 1.00F, 0.00F, 1.00F },
1597 { 1.00F, 1.00F, 0.00F },
1598 };
1599
1600 int x, y;
1601
1602 glEnable (GL_TEXTURE_2D);
1603 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1604 glEnable (GL_BLEND);
1605 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1606 glBegin (GL_QUADS);
1607
1608 for (y = 0; y < h; y++)
1609 for (x = 0; x < w; x++)
1610 {
1611 unsigned char m = data [x + y * w];
1612
1613 if (m)
1614 {
1615 float *c = color [m & 15];
1616
1617 float tx1 = m & 0x40 ? 0.5 : 0.;
1618 float tx2 = tx1 + 0.5;
1619
1620 glColor4f (c[0], c[1], c[2], 0.75);
1621 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1622 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1623 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1624 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1625 }
1626 }
1627
1628 glEnd ();
1629 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D);
1631}
1632
1633void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1635 PPCODE:
1636{
1637 int vx, vy;
1638 int x, y;
1639 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh);
1646
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1649
1650 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows)
1652 {
1653 maprow *row = self->row + (y + vy);
1654
1655 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1)
1657 {
1658 mapcell *cell = row->col + (x + vx - row->c0);
1659
1660 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS;
1663 }
1664 }
1339 1665
1340 EXTEND (SP, 3); 1666 EXTEND (SP, 3);
1341 PUSHs (sv_2mortal (newSViv (sw4))); 1667 PUSHs (sv_2mortal (newSViv (sw4)));
1342 PUSHs (sv_2mortal (newSViv (sh))); 1668 PUSHs (sv_2mortal (newSViv (sh)));
1343 PUSHs (darkness_sv); 1669 PUSHs (darkness_sv);
1344} 1670}
1345 1671
1346SV * 1672SV *
1347get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1673get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1348 CODE: 1674 CODE:
1349{ 1675{
1350 int x, y, x1, y1; 1676 int x, y, x1, y1;
1351 SV *data_sv = newSV (w * h * 7 + 5); 1677 SV *data_sv = newSV (w * h * 7 + 5);
1352 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1678 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1414} 1740}
1415 OUTPUT: 1741 OUTPUT:
1416 RETVAL 1742 RETVAL
1417 1743
1418void 1744void
1419set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1420 PPCODE: 1746 PPCODE:
1421{ 1747{
1422 int x, y, z; 1748 int x, y, z;
1423 int w, h; 1749 int w, h;
1424 int x1, y1; 1750 int x1, y1;
1456 1782
1457 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1458 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1459 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1460 1786
1461 if (cell->darkness <= 0) 1787 if (cell->darkness == 0)
1462 { 1788 {
1463 cell->darkness = -1; 1789 cell->darkness = 0;
1464 1790
1465 for (z = 0; z <= 2; z++) 1791 for (z = 0; z <= 2; z++)
1466 { 1792 {
1467 cell->face[z] = face[z]; 1793 cell->face[z] = face[z];
1468 1794
1473 } 1799 }
1474 } 1800 }
1475 } 1801 }
1476} 1802}
1477 1803
1478MODULE = CFClient PACKAGE = CFClient::MixChunk 1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1479 1805
1480CFClient::MixChunk 1806CFPlus::MixChunk
1481new_from_file (SV *class, char *path) 1807new_from_file (SV *class, char *path)
1482 CODE: 1808 CODE:
1483 RETVAL = Mix_LoadWAV (path); 1809 RETVAL = Mix_LoadWAV (path);
1484 OUTPUT: 1810 OUTPUT:
1485 RETVAL 1811 RETVAL
1486 1812
1487void 1813void
1488DESTROY (CFClient::MixChunk self) 1814DESTROY (CFPlus::MixChunk self)
1489 CODE: 1815 CODE:
1490 Mix_FreeChunk (self); 1816 Mix_FreeChunk (self);
1491 1817
1492int 1818int
1493volume (CFClient::MixChunk self, int volume = -1) 1819volume (CFPlus::MixChunk self, int volume = -1)
1494 CODE: 1820 CODE:
1495 RETVAL = Mix_VolumeChunk (self, volume); 1821 RETVAL = Mix_VolumeChunk (self, volume);
1496 OUTPUT: 1822 OUTPUT:
1497 RETVAL 1823 RETVAL
1498 1824
1499int 1825int
1500play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1826play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1501 CODE: 1827 CODE:
1502 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1828 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1503 OUTPUT: 1829 OUTPUT:
1504 RETVAL 1830 RETVAL
1505 1831
1506MODULE = CFClient PACKAGE = CFClient::MixMusic 1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1507 1833
1508int 1834int
1509volume (int volume = -1) 1835volume (int volume = -1)
1510 CODE: 1836 CODE:
1511 RETVAL = Mix_VolumeMusic (volume); 1837 RETVAL = Mix_VolumeMusic (volume);
1512 OUTPUT: 1838 OUTPUT:
1513 RETVAL 1839 RETVAL
1514 1840
1515CFClient::MixMusic 1841CFPlus::MixMusic
1516new_from_file (SV *class, char *path) 1842new_from_file (SV *class, char *path)
1517 CODE: 1843 CODE:
1518 RETVAL = Mix_LoadMUS (path); 1844 RETVAL = Mix_LoadMUS (path);
1519 OUTPUT: 1845 OUTPUT:
1520 RETVAL 1846 RETVAL
1521 1847
1522void 1848void
1523DESTROY (CFClient::MixMusic self) 1849DESTROY (CFPlus::MixMusic self)
1524 CODE: 1850 CODE:
1525 Mix_FreeMusic (self); 1851 Mix_FreeMusic (self);
1526 1852
1527int 1853int
1528play (CFClient::MixMusic self, int loops = -1) 1854play (CFPlus::MixMusic self, int loops = -1)
1529 CODE: 1855 CODE:
1530 RETVAL = Mix_PlayMusic (self, loops); 1856 RETVAL = Mix_PlayMusic (self, loops);
1531 OUTPUT: 1857 OUTPUT:
1532 RETVAL 1858 RETVAL
1533 1859
1534MODULE = CFClient PACKAGE = CFClient::OpenGL 1860MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1535 1861
1536BOOT: 1862BOOT:
1537{ 1863{
1538 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1539 static const struct { 1865 static const struct {
1540 const char *name; 1866 const char *name;
1541 IV iv; 1867 IV iv;
1542 } *civ, const_iv[] = { 1868 } *civ, const_iv[] = {
1543# define const_iv(name) { # name, (IV)name } 1869# define const_iv(name) { # name, (IV)name }
1550 const_iv (GL_SCISSOR_TEST), 1876 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST), 1877 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST), 1878 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE), 1879 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL), 1880 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT),
1882 const_iv (GL_BACK),
1555 const_iv (GL_AND), 1883 const_iv (GL_AND),
1556 const_iv (GL_ONE), 1884 const_iv (GL_ONE),
1557 const_iv (GL_ZERO), 1885 const_iv (GL_ZERO),
1558 const_iv (GL_SRC_ALPHA), 1886 const_iv (GL_SRC_ALPHA),
1559 const_iv (GL_SRC_ALPHA_SATURATE), 1887 const_iv (GL_DST_ALPHA),
1560 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1888 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561 const_iv (GL_ONE_MINUS_DST_ALPHA), 1889 const_iv (GL_ONE_MINUS_DST_ALPHA),
1890 const_iv (GL_SRC_ALPHA_SATURATE),
1562 const_iv (GL_RGB), 1891 const_iv (GL_RGB),
1563 const_iv (GL_RGBA), 1892 const_iv (GL_RGBA),
1893 const_iv (GL_RGBA4),
1894 const_iv (GL_RGBA8),
1895 const_iv (GL_RGB5_A1),
1564 const_iv (GL_UNSIGNED_BYTE), 1896 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT), 1897 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT), 1898 const_iv (GL_UNSIGNED_INT),
1567 const_iv (GL_ALPHA), 1899 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY), 1900 const_iv (GL_INTENSITY),
1577 const_iv (GL_TEXTURE_MAG_FILTER), 1909 const_iv (GL_TEXTURE_MAG_FILTER),
1578 const_iv (GL_TEXTURE_MIN_FILTER), 1910 const_iv (GL_TEXTURE_MIN_FILTER),
1579 const_iv (GL_TEXTURE_ENV_MODE), 1911 const_iv (GL_TEXTURE_ENV_MODE),
1580 const_iv (GL_TEXTURE_WRAP_S), 1912 const_iv (GL_TEXTURE_WRAP_S),
1581 const_iv (GL_TEXTURE_WRAP_T), 1913 const_iv (GL_TEXTURE_WRAP_T),
1914 const_iv (GL_REPEAT),
1582 const_iv (GL_CLAMP), 1915 const_iv (GL_CLAMP),
1583 const_iv (GL_REPEAT), 1916 const_iv (GL_CLAMP_TO_EDGE),
1584 const_iv (GL_NEAREST), 1917 const_iv (GL_NEAREST),
1585 const_iv (GL_LINEAR), 1918 const_iv (GL_LINEAR),
1586 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1919 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1920 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1921 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1599 const_iv (GL_SEPARABLE_2D), 1932 const_iv (GL_SEPARABLE_2D),
1600 const_iv (GL_CONVOLUTION_2D), 1933 const_iv (GL_CONVOLUTION_2D),
1601 const_iv (GL_CONVOLUTION_BORDER_MODE), 1934 const_iv (GL_CONVOLUTION_BORDER_MODE),
1602 const_iv (GL_CONSTANT_BORDER), 1935 const_iv (GL_CONSTANT_BORDER),
1603 const_iv (GL_LINES), 1936 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP),
1604 const_iv (GL_LINE_LOOP), 1938 const_iv (GL_LINE_LOOP),
1605 const_iv (GL_QUADS), 1939 const_iv (GL_QUADS),
1606 const_iv (GL_QUAD_STRIP), 1940 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES), 1941 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP), 1942 const_iv (GL_TRIANGLE_STRIP),
1618 1952
1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1953 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1954 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621} 1955}
1622 1956
1957char *
1958gl_vendor ()
1959 CODE:
1960 RETVAL = (char *)glGetString (GL_VENDOR);
1961 OUTPUT:
1962 RETVAL
1963
1964char *
1965gl_version ()
1966 CODE:
1967 RETVAL = (char *)glGetString (GL_VERSION);
1968 OUTPUT:
1969 RETVAL
1970
1971char *
1972gl_extensions ()
1973 CODE:
1974 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1975 OUTPUT:
1976 RETVAL
1977
1623int glGetError () 1978int glGetError ()
1979
1980void glFinish ()
1624 1981
1625void glClear (int mask) 1982void glClear (int mask)
1626 1983
1627void glClearColor (float r, float g, float b, float a = 1.0) 1984void glClearColor (float r, float g, float b, float a = 1.0)
1628 PROTOTYPE: @ 1985 PROTOTYPE: @
1635 1992
1636void glHint (int target, int mode) 1993void glHint (int target, int mode)
1637 1994
1638void glBlendFunc (int sfactor, int dfactor) 1995void glBlendFunc (int sfactor, int dfactor)
1639 1996
1997void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1998 CODE:
1999 gl_BlendFuncSeparate (sa, da, saa, daa);
2000
1640void glDepthMask (int flag) 2001void glDepthMask (int flag)
1641 2002
1642void glLogicOp (int opcode) 2003void glLogicOp (int opcode)
1643 2004
1644void glColorMask (int red, int green, int blue, int alpha) 2005void glColorMask (int red, int green, int blue, int alpha)
1648void glPushMatrix () 2009void glPushMatrix ()
1649 2010
1650void glPopMatrix () 2011void glPopMatrix ()
1651 2012
1652void glLoadIdentity () 2013void glLoadIdentity ()
2014
2015void glDrawBuffer (int buffer)
2016
2017void glReadBuffer (int buffer)
1653 2018
1654# near_ and far_ are due to microsofts buggy "c" compiler 2019# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2020void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656 2021
1657# near_ and far_ are due to microsofts buggy "c" compiler 2022# near_ and far_ are due to microsofts buggy "c" compiler
1677 2042
1678void glEnd () 2043void glEnd ()
1679 2044
1680void glColor (float r, float g, float b, float a = 1.0) 2045void glColor (float r, float g, float b, float a = 1.0)
1681 PROTOTYPE: @ 2046 PROTOTYPE: @
2047 ALIAS:
2048 glColor_premultiply = 1
1682 CODE: 2049 CODE:
2050 if (ix)
2051 {
2052 r *= a;
2053 g *= a;
2054 b *= a;
2055 }
1683 // microsoft visual "c" rounds instead of truncating... 2056 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255), 2057 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 2058
1689void glInterleavedArrays (int format, int stride, char *data) 2059void glInterleavedArrays (int format, int stride, char *data)
1690 2060
1691void glDrawElements (int mode, int count, int type, char *indices) 2061void glDrawElements (int mode, int count, int type, char *indices)
1692 2062
1715 2085
1716void glBindTexture (int target, int name) 2086void glBindTexture (int target, int name)
1717 2087
1718void glConvolutionParameter (int target, int pname, float params) 2088void glConvolutionParameter (int target, int pname, float params)
1719 CODE: 2089 CODE:
1720 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2090 if (gl.ConvolutionParameterf)
2091 gl.ConvolutionParameterf (target, pname, params);
1721 2092
1722void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2093void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723 CODE: 2094 CODE:
1724 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2095 if (gl.ConvolutionFilter2D)
1725 (target, internalformat, width, height, format, type, data)); 2096 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726 2097
1727void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2098void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1728 CODE: 2099 CODE:
1729 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2100 if (gl.SeparableFilter2D)
1730 (target, internalformat, width, height, format, type, row, column)); 2101 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731 2102
1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2103void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733 2104
1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2105void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735 2106
1768 2139
1769void glEndList () 2140void glEndList ()
1770 2141
1771void glCallList (int list) 2142void glCallList (int list)
1772 2143
1773

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines