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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
5# pragma warning(disable:4244) 6# pragma warning(disable:4244)
6#endif 7#endif
7 8
8#include "EXTERN.h" 9#include "EXTERN.h"
9#include "perl.h" 10#include "perl.h"
10#include "XSUB.h" 11#include "XSUB.h"
11 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
12#include <math.h> 17#include <math.h>
13#include <string.h> 18#include <string.h>
14#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
15 21
16#include <SDL.h> 22#include <SDL.h>
17#include <SDL_endian.h> 23#include <SDL_endian.h>
18#include <SDL_image.h> 24#include <SDL_image.h>
19#include <SDL_mixer.h> 25#include <SDL_mixer.h>
20#include <SDL_opengl.h> 26#include <SDL_opengl.h>
21 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
22#include <glib/gmacros.h> 31#include <glib/gmacros.h>
23 32
24#include <pango/pango.h> 33#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 34
29#ifndef _WIN32 35#ifndef _WIN32
30# include <sys/types.h> 36# include <sys/types.h>
31# include <sys/socket.h> 37# include <sys/socket.h>
32# include <netinet/in.h> 38# include <netinet/in.h>
39 typedef signed char int8_t; 45 typedef signed char int8_t;
40 typedef signed short int16_t; 46 typedef signed short int16_t;
41 typedef signed int int32_t; 47 typedef signed int int32_t;
42#endif 48#endif
43 49
44#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45 51
46#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
47 53
48#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
50 56
51#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
52 58
53#define GL_CALL(type,func,args) \ 59#if 0
54 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
55 static int init_; \ 61#else
56 static type fptr_; \ 62# define PARACHUTE 0
57 \ 63#endif
58 if (!init_) \
59 { \
60 init_ = 1; \
61 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62 } \
63 \
64 if (fptr_) \
65 fptr_ args; \
66 }
67 64
65static struct
66{
67#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h"
69#undef GL_FUNC
70} gl;
71
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{
74 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else
79 glBlendFunc (sa, da);
80}
81
82#include "texcache.c"
83
84#include "pango-font.c"
85#include "pango-fontmap.c"
86#include "pango-render.c"
87
68typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
69typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
70 90
71typedef PangoFontDescription *CFClient__Font; 91typedef PangoFontDescription *CFPlus__Font;
92
93static int
94shape_attr_p (PangoLayoutRun *run)
95{
96 GSList *attrs = run->item->analysis.extra_attrs;
97
98 while (attrs)
99 {
100 PangoAttribute *attr = attrs->data;
101
102 if (attr->klass->type == PANGO_ATTR_SHAPE)
103 return 1;
104
105 attrs = attrs->next;
106 }
107
108 return 0;
109}
72 110
73typedef struct cf_layout { 111typedef struct cf_layout {
74 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
75 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
77 int base_height; 114 int base_height;
78 CFClient__Font font; 115 CFPlus__Font font;
79} *CFClient__Layout; 116} *CFPlus__Layout;
80 117
81static CFClient__Font default_font; 118static CFPlus__Font default_font;
82static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
83static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
84 121
85static void 122static void
86substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
87{ 124{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
89#ifdef _WIN32 126#ifdef FC_HINT_STYLE
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1); 127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91#else 128#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
94} 130}
95 131
96static void 132static void
97layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
98{ 134{
99 /* use a random scale factor to account for unknown descenders, 0.8 works 135 /* use a random scale factor to account for unknown descenders, 0.8 works
100 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
101 */ 137 */
102 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
106 142
107 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
108} 144}
109 145
110static void 146static void
111layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
113 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
114 153
115 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117 156
118 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
119} 162}
120 163
121typedef uint16_t mapface; 164typedef uint16_t mapface;
122 165
123typedef struct { 166typedef struct {
126 float s, t; 169 float s, t;
127 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
128} maptex; 171} maptex;
129 172
130typedef struct { 173typedef struct {
131 int16_t darkness; 174 uint16_t darkness;
132 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
133} mapcell; 177} mapcell;
134 178
135typedef struct { 179typedef struct {
136 int32_t c0, c1; 180 int32_t c0, c1;
137 mapcell *col; 181 mapcell *col;
146 int texs; 190 int texs;
147 maptex *tex; 191 maptex *tex;
148 192
149 int32_t rows; 193 int32_t rows;
150 maprow *row; 194 maprow *row;
151} *CFClient__Map; 195} *CFPlus__Map;
152 196
153static char * 197static char *
154prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
155{ 199{
156 char *p; 200 char *p;
174 218
175#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 219#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)) 220#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177 221
178static maprow * 222static maprow *
179map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
180{ 224{
181 if (0 > y) 225 if (0 > y)
182 { 226 {
183 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
184 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
222 266
223 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
224} 268}
225 269
226static mapcell * 270static mapcell *
227map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
228{ 272{
229 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
230} 274}
231 275
232static void 276static void
233map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
234{ 278{
235 int r; 279 int r;
236 280
237 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
238 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
246 self->row = 0; 290 self->row = 0;
247 self->rows = 0; 291 self->rows = 0;
248} 292}
249 293
250static void 294static void
251map_blank (CFClient__Map self, int x0, int y0, int w, int h) 295map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252{ 296{
253 int x, y; 297 int x, y;
254 maprow *row; 298 maprow *row;
255 299
256 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
265 if (x >= row->c0) 309 if (x >= row->c0)
266 { 310 {
267 if (x >= row->c1) 311 if (x >= row->c1)
268 break; 312 break;
269 313
270 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
271 } 315 }
272 } 316 }
273} 317}
274 318
275static void 319static void
296 ev.data2 = 0; 340 ev.data2 = 0;
297 341
298 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
299} 343}
300 344
345static unsigned int
346minpot (unsigned int n)
347{
348 if (!n)
349 return 0;
350
351 --n;
352
353 n |= n >> 1;
354 n |= n >> 2;
355 n |= n >> 4;
356 n |= n >> 8;
357 n |= n >> 16;
358
359 return n + 1;
360}
361
301MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
302 363
303PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
304 365
305BOOT: 366BOOT:
306{ 367{
307 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
308 static const struct { 369 static const struct {
309 const char *name; 370 const char *name;
310 IV iv; 371 IV iv;
311 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
312# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
413 474
414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416} 477}
417 478
479int
480in_destruct ()
481 CODE:
482 RETVAL = PL_main_cv == Nullcv;
483 OUTPUT:
484 RETVAL
485
486NV floor (NV x)
487
488NV ceil (NV x)
489
418void 490void
419pango_init () 491pango_init ()
420 CODE: 492 CODE:
421{ 493{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
423 ft2_fontmap = pango_ft2_font_map_new (); 494 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 495 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); 496 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} 497}
430 498
431int 499int
432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433 501
434void 502void
435SDL_Quit () 503SDL_Quit ()
436 504
437void 505void
444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447 515
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450 518
451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455 523
456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
457 529
458 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460 532
461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
479SDL_SetVideoMode (int w, int h, int fullscreen) 551SDL_SetVideoMode (int w, int h, int fullscreen)
480 CODE: 552 CODE:
481 RETVAL = !!SDL_SetVideoMode ( 553 RETVAL = !!SDL_SetVideoMode (
482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483 ); 555 );
556 if (RETVAL)
557 {
484 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 558 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
559# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
560# include "glfunc.h"
561# undef GL_FUNC
562 }
485 OUTPUT: 563 OUTPUT:
486 RETVAL 564 RETVAL
487 565
488void 566void
489SDL_GL_SwapBuffers () 567SDL_GL_SwapBuffers ()
568
569char *
570SDL_GetKeyName (int sym)
490 571
491void 572void
492SDL_PollEvent () 573SDL_PollEvent ()
493 PPCODE: 574 PPCODE:
494{ 575{
513 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515 break; 596 break;
516 597
517 case SDL_MOUSEMOTION: 598 case SDL_MOUSEMOTION:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
518 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 601 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 602 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 603 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 604 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 605 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523 break; 606 break;
524 607
525 case SDL_MOUSEBUTTONDOWN: 608 case SDL_MOUSEBUTTONDOWN:
526 case SDL_MOUSEBUTTONUP: 609 case SDL_MOUSEBUTTONUP:
610 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
611
527 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 612 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 613 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 614 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 615 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531 break; 616 break;
535 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537 break; 622 break;
538 } 623 }
539 624
540 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541 } 626 }
542} 627}
543 628
544int 629int
545Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 630Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
558 CODE: 643 CODE:
559#ifndef _WIN32 644#ifndef _WIN32
560 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561#endif 646#endif
562 647
563char *
564gl_vendor ()
565 CODE:
566 RETVAL = (char *)glGetString (GL_VENDOR);
567 OUTPUT:
568 RETVAL
569
570char *
571gl_version ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VERSION);
574 OUTPUT:
575 RETVAL
576
577char *
578gl_extensions ()
579 CODE:
580 RETVAL = (char *)glGetString (GL_EXTENSIONS);
581 OUTPUT:
582 RETVAL
583
584void 648void
585add_font (char *file) 649add_font (char *file)
586 CODE: 650 CODE:
587 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
588#ifdef _WIN32
589 // cairo... sigh... requires win2000
590 AddFontResourceEx (file, FR_PRIVATE, 0);
591#endif
592 652
593void 653void
594load_image_inline (SV *image_) 654load_image_inline (SV *image_)
595 ALIAS: 655 ALIAS:
596 load_image_file = 1 656 load_image_file = 1
638 698
639 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
640 700
641 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
642 702
703 SDL_LockSurface (surface2);
643 EXTEND (SP, 5); 704 EXTEND (SP, 6);
644 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
645 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
646 SDL_LockSurface (surface2);
647 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
648 SDL_UnlockSurface (surface2);
649 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 708 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
650 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
651 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
652 712
653 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
654 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
655} 715}
656 716
692 CODE: 752 CODE:
693 fprintf (stderr, "FATAL: %s\n", message); 753 fprintf (stderr, "FATAL: %s\n", message);
694#ifdef _WIN32 754#ifdef _WIN32
695 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
696#endif 756#endif
697 exit (1); 757 _exit (1);
698 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
699MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
700 765
701CFClient::Font 766CFPlus::Font
702new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
703 CODE: 768 CODE:
704{ 769{
705 int count; 770 int count;
706 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
709} 774}
710 OUTPUT: 775 OUTPUT:
711 RETVAL 776 RETVAL
712 777
713void 778void
714DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
715 CODE: 780 CODE:
716 pango_font_description_free (self); 781 pango_font_description_free (self);
717 782
718void 783void
719make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
720 CODE: 785 CODE:
721 default_font = self; 786 default_font = self;
722 787
723MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
724 789
725CFClient::Layout 790void
726new (SV *class, int rgba = 0) 791reset_glyph_cache ()
727 CODE: 792 CODE:
728#if _WIN32 793 tc_clear ();
729 rgba = 0;//D 794
730#endif 795CFPlus::Layout
796new (SV *class)
797 CODE:
731 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
732 799
733 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
734 RETVAL->rgba = rgba;
735 RETVAL->r = 1.; 801 RETVAL->r = 1.;
736 RETVAL->g = 1.; 802 RETVAL->g = 1.;
737 RETVAL->b = 1.; 803 RETVAL->b = 1.;
738 RETVAL->a = 1.; 804 RETVAL->a = 1.;
739 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
743 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
744 OUTPUT: 810 OUTPUT:
745 RETVAL 811 RETVAL
746 812
747void 813void
748DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
749 CODE: 815 CODE:
750 g_object_unref (self->pl); 816 g_object_unref (self->pl);
751 Safefree (self); 817 Safefree (self);
752 818
753int
754is_rgba (CFClient::Layout self)
755 CODE:
756 RETVAL = self->rgba;
757 OUTPUT:
758 RETVAL
759
760void 819void
761set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
762 CODE: 821 CODE:
763{ 822{
764 STRLEN textlen; 823 STRLEN textlen;
765 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
766 825
767 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
768} 827}
769 828
770void 829void
771set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
772 CODE: 831 CODE:
773{ 832{
774 STRLEN textlen; 833 STRLEN textlen;
775 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
776 835
777 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
778} 837}
779 838
839void
840set_shapes (CFPlus::Layout self, ...)
841 CODE:
842{
843 PangoAttrList *attrs = 0;
844 const char *text = pango_layout_get_text (self->pl);
845 const char *pos = text;
846 int arg = 4;
847
848 while (arg < items && (pos = strstr (pos, OBJ_STR)))
849 {
850 PangoRectangle inkrect, rect;
851 PangoAttribute *attr;
852
853 int x = SvIV (ST (arg - 3));
854 int y = SvIV (ST (arg - 2));
855 int w = SvIV (ST (arg - 1));
856 int h = SvIV (ST (arg ));
857
858 inkrect.x = 0;
859 inkrect.y = 0;
860 inkrect.width = 0;
861 inkrect.height = 0;
862
863 rect.x = x * PANGO_SCALE;
864 rect.y = y * PANGO_SCALE;
865 rect.width = w * PANGO_SCALE;
866 rect.height = h * PANGO_SCALE;
867
868 if (!attrs)
869 attrs = pango_layout_get_attributes (self->pl);
870
871 attr = pango_attr_shape_new (&inkrect, &rect);
872 attr->start_index = pos - text;
873 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
874 pango_attr_list_insert (attrs, attr);
875
876 arg += 4;
877 pos += sizeof (OBJ_STR) - 1;
878 }
879
880 if (attrs)
881 pango_layout_set_attributes (self->pl, attrs);
882}
883
884void
885get_shapes (CFPlus::Layout self)
886 PPCODE:
887{
888 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
889
890 do
891 {
892 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
893
894 if (run && shape_attr_p (run))
895 {
896 PangoRectangle extents;
897 pango_layout_iter_get_run_extents (iter, 0, &extents);
898
899 EXTEND (SP, 2);
900 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
901 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
902 }
903 }
904 while (pango_layout_iter_next_run (iter));
905
906 pango_layout_iter_free (iter);
907}
908
909int
910has_wrapped (CFPlus::Layout self)
911 CODE:
912{
913 int lines = 1;
914 const char *text = pango_layout_get_text (self->pl);
915
916 while (*text)
917 lines += *text++ == '\n';
918
919 RETVAL = lines < pango_layout_get_line_count (self->pl);
920}
921 OUTPUT:
922 RETVAL
923
780SV * 924SV *
781get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
782 CODE: 926 CODE:
783 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
785 OUTPUT: 929 OUTPUT:
786 RETVAL 930 RETVAL
787 931
788void 932void
789set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 933set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790 CODE: 934 CODE:
791 self->r = r; 935 self->r = r;
792 self->g = g; 936 self->g = g;
793 self->b = b; 937 self->b = b;
794 self->a = a; 938 self->a = a;
795 939
796void 940void
797set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798 CODE: 942 CODE:
799 if (self->font != font) 943 if (self->font != font)
800 { 944 {
801 self->font = font; 945 self->font = font;
802 layout_update_font (self); 946 layout_update_font (self);
803 } 947 }
804 948
805void 949void
806set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
807 CODE: 951 CODE:
808 if (self->base_height != base_height) 952 if (self->base_height != base_height)
809 { 953 {
810 self->base_height = base_height; 954 self->base_height = base_height;
811 layout_update_font (self); 955 layout_update_font (self);
812 } 956 }
813 957
814void 958void
815set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
816 CODE: 960 CODE:
817 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 961 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
818 962
819void 963void
820set_indent (CFClient::Layout self, int indent) 964set_indent (CFPlus::Layout self, int indent)
821 CODE: 965 CODE:
822 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823 967
824void 968void
825set_spacing (CFClient::Layout self, int spacing) 969set_spacing (CFPlus::Layout self, int spacing)
826 CODE: 970 CODE:
827 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828 972
829void 973void
830set_ellipsise (CFClient::Layout self, int ellipsise) 974set_ellipsise (CFPlus::Layout self, int ellipsise)
831 CODE: 975 CODE:
832 pango_layout_set_ellipsize (self->pl, 976 pango_layout_set_ellipsize (self->pl,
833 ellipsise == 1 ? PANGO_ELLIPSIZE_START 977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
834 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
836 : PANGO_ELLIPSIZE_NONE 980 : PANGO_ELLIPSIZE_NONE
837 ); 981 );
838 982
839void 983void
840set_single_paragraph_mode (CFClient::Layout self, int spm) 984set_single_paragraph_mode (CFPlus::Layout self, int spm)
841 CODE: 985 CODE:
842 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843 987
844void 988void
845size (CFClient::Layout self) 989size (CFPlus::Layout self)
846 PPCODE: 990 PPCODE:
847{ 991{
848 int w, h; 992 int w, h;
849 993
850 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
853 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
854 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
855} 999}
856 1000
857int 1001int
1002descent (CFPlus::Layout self)
1003 CODE:
1004{
1005 PangoRectangle rect;
1006 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1007 pango_layout_line_get_pixel_extents (line, 0, &rect);
1008 RETVAL = PANGO_DESCENT (rect);
1009}
1010 OUTPUT:
1011 RETVAL
1012
1013int
858xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
859 CODE: 1015 CODE:
860{ 1016{
861 int index, trailing; 1017 int index, trailing;
862 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
863 RETVAL = index; 1019 RETVAL = index;
864} 1020}
865 OUTPUT: 1021 OUTPUT:
866 RETVAL 1022 RETVAL
867 1023
868void 1024void
869cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
870 PPCODE: 1026 PPCODE:
871{ 1027{
872 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
873 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874 1030
877 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879} 1035}
880 1036
881void 1037void
882render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
883 PPCODE: 1039 PPCODE:
884{ 1040 pango_opengl_render_layout_subpixel (
885 SV *retval; 1041 self->pl,
886 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
887 1046
888 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
889 1048
890 if (self->rgba) 1049void
1050pad2pot (SV *data_, SV *w_, SV *h_)
1051 CODE:
1052{
1053 int ow = SvIV (w_);
1054 int oh = SvIV (h_);
1055
1056 if (ow && oh)
891 { 1057 {
892 cairo_surface_t *surface; 1058 int nw = minpot (ow);
893 cairo_t *cairo; 1059 int nh = minpot (oh);
894 1060
895 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
896 SvPOK_only (retval);
897 SvCUR_set (retval, w * h * 4);
898
899 memset (SvPVX (retval), 0, w * h * 4);
900
901 surface = cairo_image_surface_create_for_data (
902 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
903 cairo = cairo_create (surface);
904 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
905
906 pango_cairo_show_layout (cairo, self->pl);
907
908 cairo_destroy (cairo);
909 cairo_surface_destroy (surface);
910
911 // what a mess, and its premultiplied, too :(
912 { 1062 {
913 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
914 uint32_t *e = p + w * h;
915
916 while (p < e)
917 { 1064 {
918 uint32_t rgba = *p; 1065 STRLEN datalen;
919 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
920#if 0 1067 int bpp = datalen / (ow * oh);
921#ifdef _WIN32 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
922 {//D
923 uint8_t r = rgba >> 24;
924 uint8_t g = rgba >> 16;
925 uint8_t b = rgba >> 8;
926 uint8_t a = rgba >> 0;
927 1069
928 rgba = (rgba & 0xffffff00) | a; 1070 SvPOK_only (result_);
1071 SvCUR_set (result_, nw * nh * bpp);
1072
1073 memset (SvPVX (result_), 0, nw * nh * bpp);
1074 while (oh--)
1075 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1076
1077 sv_setsv (data_, result_);
929 } 1078 }
930#endif 1079
931#endif 1080 sv_setiv (w_, nw);
932 rgba = SDL_SwapBE32 (rgba); 1081 sv_setiv (h_, nh);
933 *p++ = rgba;
934 } 1082 }
935 }
936
937 EXTEND (SP, 5);
938 PUSHs (sv_2mortal (newSViv (w)));
939 PUSHs (sv_2mortal (newSViv (h)));
940 PUSHs (sv_2mortal (retval));
941 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
942 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
943 } 1083 }
944 else
945 {
946 FT_Bitmap bitmap;
947
948 retval = newSV (w * h);
949 SvPOK_only (retval);
950 SvCUR_set (retval, w * h);
951
952 bitmap.rows = h;
953 bitmap.width = w;
954 bitmap.pitch = w;
955 bitmap.buffer = (unsigned char*)SvPVX (retval);
956 bitmap.num_grays = 256;
957 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
958
959 memset (bitmap.buffer, 0, w * h);
960
961 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
962
963 EXTEND (SP, 5);
964 PUSHs (sv_2mortal (newSViv (w)));
965 PUSHs (sv_2mortal (newSViv (h)));
966 PUSHs (sv_2mortal (retval));
967 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
968 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
969 }
970} 1084}
971 1085
972MODULE = CFClient PACKAGE = CFClient::Texture
973
974void 1086void
975draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1087draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
977 ALIAS: 1089 ALIAS:
978 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
979 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
980 CODE: 1092 CODE:
981{ 1093{
982 HV *hv = (HV *)SvRV (self); 1094 HV *hv = (HV *)SvRV (self);
983 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1095 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1096 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1097 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987 1098
988 if (items < 5) 1099 if (items < 5)
989 { 1100 {
990 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1101 w = SvNV (*hv_fetch (hv, "w", 1, 1));
991 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1102 h = SvNV (*hv_fetch (hv, "h", 1, 1));
992 } 1103 }
993 1104
994 if (ix) 1105 if (ix)
995 { 1106 {
996 glEnable (GL_BLEND); 1107 glEnable (GL_BLEND);
1108
1109 if (ix == 2)
997 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1110 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1111 else
1112 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1113 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1114
998 glEnable (GL_ALPHA_TEST); 1115 glEnable (GL_ALPHA_TEST);
999 glAlphaFunc (GL_GREATER, 0.01f); 1116 glAlphaFunc (GL_GREATER, 0.01f);
1000 } 1117 }
1001 1118
1002 glBindTexture (GL_TEXTURE_2D, name); 1119 glBindTexture (GL_TEXTURE_2D, name);
1003
1004 if (wrap_mode)
1005 {
1006 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008 }
1009 1120
1010 glBegin (GL_QUADS); 1121 glBegin (GL_QUADS);
1011 glTexCoord2f (0, 0); glVertex2f (x , y ); 1122 glTexCoord2f (0, 0); glVertex2f (x , y );
1012 glTexCoord2f (0, t); glVertex2f (x , y + h); 1123 glTexCoord2f (0, t); glVertex2f (x , y + h);
1013 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1124 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
1019 glDisable (GL_ALPHA_TEST); 1130 glDisable (GL_ALPHA_TEST);
1020 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1021 } 1132 }
1022} 1133}
1023 1134
1024MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
1025 1136
1026CFClient::Map 1137CFPlus::Map
1027new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
1028 CODE: 1139 CODE:
1029 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
1030 RETVAL->x = 0; 1141 RETVAL->x = 0;
1031 RETVAL->y = 0; 1142 RETVAL->y = 0;
1041 RETVAL->row = 0; 1152 RETVAL->row = 0;
1042 OUTPUT: 1153 OUTPUT:
1043 RETVAL 1154 RETVAL
1044 1155
1045void 1156void
1046DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
1047 CODE: 1158 CODE:
1048{ 1159{
1049 map_clear (self); 1160 map_clear (self);
1050 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
1051 Safefree (self); 1163 Safefree (self);
1052} 1164}
1053 1165
1054void 1166void
1055clear (CFClient::Map self) 1167clear (CFPlus::Map self)
1056 CODE: 1168 CODE:
1057 map_clear (self); 1169 map_clear (self);
1058 1170
1059void 1171void
1060set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
1061 CODE: 1173 CODE:
1062{ 1174{
1063 while (self->faces <= face) 1175 while (self->faces <= face)
1064 { 1176 {
1065 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
1068 1180
1069 self->face [face] = texid; 1181 self->face [face] = texid;
1070} 1182}
1071 1183
1072void 1184void
1073set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1074 CODE: 1186 CODE:
1075{ 1187{
1076 while (self->texs <= texid) 1188 while (self->texs <= texid)
1077 { 1189 {
1078 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1090 tex->r = r; 1202 tex->r = r;
1091 tex->g = g; 1203 tex->g = g;
1092 tex->b = b; 1204 tex->b = b;
1093 tex->a = a; 1205 tex->a = a;
1094 } 1206 }
1207
1208 // somewhat hackish, but for textures that require it, it really
1209 // improves the look, and most others don't suffer.
1210 glBindTexture (GL_TEXTURE_2D, name);
1211 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1212 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1213 // use uglier nearest interpolation because linear suffers
1214 // from transparent color bleeding and ugly wrapping effects.
1215 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095} 1216}
1096 1217
1097int 1218int
1098ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1099 ALIAS: 1220 ALIAS:
1100 oy = 1 1221 oy = 1
1222 x = 2
1223 y = 3
1224 w = 4
1225 h = 5
1101 CODE: 1226 CODE:
1102 switch (ix) 1227 switch (ix)
1103 { 1228 {
1104 case 0: RETVAL = self->ox; break; 1229 case 0: RETVAL = self->ox; break;
1105 case 1: RETVAL = self->oy; break; 1230 case 1: RETVAL = self->oy; break;
1231 case 2: RETVAL = self->x; break;
1232 case 3: RETVAL = self->y; break;
1233 case 4: RETVAL = self->w; break;
1234 case 5: RETVAL = self->h; break;
1106 } 1235 }
1107 OUTPUT: 1236 OUTPUT:
1108 RETVAL 1237 RETVAL
1109 1238
1110void 1239void
1111scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1112 CODE: 1241 CODE:
1113{ 1242{
1114 if (dx > 0) 1243 if (dx > 0)
1115 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1116 else if (dx < 0) 1245 else if (dx < 0)
1132 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1133 } 1262 }
1134} 1263}
1135 1264
1136void 1265void
1137map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1138 CODE: 1267 CODE:
1139{ 1268{
1140 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1141 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1142 mapcell *cell; 1271 mapcell *cell;
1144 1273
1145 while (data < data_end) 1274 while (data < data_end)
1146 { 1275 {
1147 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1148 1277
1149 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1150 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1151 1280
1152 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1153 1282
1154 if (flags & 15) 1283 if (flags & 15)
1155 { 1284 {
1156 if (cell->darkness < 0) 1285 if (!cell->darkness)
1157 { 1286 {
1158 cell->darkness = 0; 1287 cell->darkness = 256;
1159 cell->face [0] = 0; 1288 cell->face [0] = 0;
1160 cell->face [1] = 0; 1289 cell->face [1] = 0;
1161 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1162 } 1292 }
1163 1293
1164 cell->darkness = flags & 8 ? *data++ : 255;
1165
1166 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x3f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1;
1313 }
1314 while (cmd & 0x80);
1315 }
1316 else
1317 cell->darkness = *data++ + 1;
1318 }
1167 1319
1168 if (flags & 4) 1320 if (flags & 4)
1169 { 1321 {
1170 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1171 } 1323 }
1179 { 1331 {
1180 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181 } 1333 }
1182 } 1334 }
1183 else 1335 else
1184 cell->darkness = -1; 1336 cell->darkness = 0;
1185 } 1337 }
1186} 1338}
1187 1339
1188SV * 1340SV *
1189mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190 CODE: 1342 CODE:
1191{ 1343{
1192 int x1, x; 1344 int x1, x;
1193 int y1, y; 1345 int y1, y;
1194 int z; 1346 int z;
1244} 1396}
1245 OUTPUT: 1397 OUTPUT:
1246 RETVAL 1398 RETVAL
1247 1399
1248void 1400void
1249draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1401draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250 PPCODE: 1402 CODE:
1251{ 1403{
1252 int vx, vy; 1404 int vx, vy;
1253 int x, y, z; 1405 int x, y, z;
1254 int last_name; 1406 int last_name;
1255 mapface face; 1407 mapface face;
1256 int sw4 = (sw + 3) & ~3;
1257 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1258 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1259 1408
1260 memset (darkness, 255, sw4 * sh);
1261 SvPOK_only (darkness_sv);
1262 SvCUR_set (darkness_sv, sw4 * sh);
1263
1264 vx = self->x + (self->w - sw) / 2 - shift_x; 1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265 vy = self->y + (self->h - sh) / 2 - shift_y; 1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266 1411
1267 /* 1412 /*
1268 int vx = self->vx = self->w >= sw 1413 int vx = self->vx = self->w >= sw
1269 ? self->x + (self->w - sw) / 2 1414 ? self->x + (self->w - sw) / 2
1270 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1415 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1274 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1419 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275 */ 1420 */
1276 1421
1277 glColor4ub (255, 255, 255, 255); 1422 glColor4ub (255, 255, 255, 255);
1278 1423
1424 glEnable (GL_BLEND);
1279 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280 glEnable (GL_BLEND);
1281 glEnable (GL_TEXTURE_2D); 1426 glEnable (GL_TEXTURE_2D);
1282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1427 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283 1428
1284 glBegin (GL_QUADS); 1429 glBegin (GL_QUADS);
1285 1430
1294 for (x = 0; x < sw; x++) 1439 for (x = 0; x < sw; x++)
1295 if (row->c0 <= x + vx && x + vx < row->c1) 1440 if (row->c0 <= x + vx && x + vx < row->c1)
1296 { 1441 {
1297 mapcell *cell = row->col + (x + vx - row->c0); 1442 mapcell *cell = row->col + (x + vx - row->c0);
1298 1443
1299 darkness[y * sw4 + x] = cell->darkness < 0
1300 ? 255 - FOW_DARKNESS
1301 : 255 - cell->darkness;
1302
1303 face = cell->face [z]; 1444 face = cell->face [z];
1304 1445
1305 if (face) 1446 if (face && face < self->texs)
1306 { 1447 {
1307 maptex tex = self->tex [face]; 1448 maptex tex = self->tex [face];
1308 1449
1309 int px = (x + 1) * 32 - tex.w; 1450 int px = (x + 1) * 32 - tex.w;
1310 int py = (y + 1) * 32 - tex.h; 1451 int py = (y + 1) * 32 - tex.h;
1328 glEnd (); 1469 glEnd ();
1329 1470
1330 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1331 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1332 1473
1474 // top layer: overlays such as the health bar
1475 for (y = 0; y < sh; y++)
1476 if (0 <= y + vy && y + vy < self->rows)
1477 {
1478 maprow *row = self->row + (y + vy);
1479
1480 for (x = 0; x < sw; x++)
1481 if (row->c0 <= x + vx && x + vx < row->c1)
1482 {
1483 mapcell *cell = row->col + (x + vx - row->c0);
1484
1485 int px = x * 32;
1486 int py = y * 32;
1487
1488 if (cell->stat_hp)
1489 {
1490 int width = sh / 28 + 1;
1491
1492 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2);
1494
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1496 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
1497 }
1498 }
1499 }
1500}
1501
1502void
1503draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1504 CODE:
1505{
1506 static float color[16][3] = {
1507 { 0.00F, 0.00F, 0.00F },
1508 { 1.00F, 1.00F, 1.00F },
1509 { 0.00F, 0.00F, 0.55F },
1510 { 1.00F, 0.00F, 0.00F },
1511
1512 { 1.00F, 0.54F, 0.00F },
1513 { 0.11F, 0.56F, 1.00F },
1514 { 0.93F, 0.46F, 0.00F },
1515 { 0.18F, 0.54F, 0.34F },
1516
1517 { 0.56F, 0.73F, 0.56F },
1518 { 0.80F, 0.80F, 0.80F },
1519 { 0.55F, 0.41F, 0.13F },
1520 { 0.99F, 0.77F, 0.26F },
1521
1522 { 0.74F, 0.65F, 0.41F },
1523
1524 { 0.00F, 1.00F, 1.00F },
1525 { 1.00F, 0.00F, 1.00F },
1526 { 1.00F, 1.00F, 0.00F },
1527 };
1528
1529 int x, y;
1530
1531 glEnable (GL_TEXTURE_2D);
1532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1533 glEnable (GL_BLEND);
1534 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1535 glBegin (GL_QUADS);
1536
1537 for (y = 0; y < h; y++)
1538 for (x = 0; x < w; x++)
1539 {
1540 unsigned char m = data [x + y * w];
1541
1542 if (m)
1543 {
1544 float *c = color [m & 15];
1545
1546 float tx1 = m & 0x40 ? 0.5 : 0.;
1547 float tx2 = tx1 + 0.5;
1548
1549 glColor4f (c[0], c[1], c[2], 0.75);
1550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1553 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1554 }
1555 }
1556
1557 glEnd ();
1558 glDisable (GL_BLEND);
1559 glDisable (GL_TEXTURE_2D);
1560}
1561
1562void
1563fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1564 PPCODE:
1565{
1566 int vx, vy;
1567 int x, y;
1568 int sw4 = (sw + 3) & ~3;
1569 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1570 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1571
1572 memset (darkness, 255, sw4 * sh);
1573 SvPOK_only (darkness_sv);
1574 SvCUR_set (darkness_sv, sw4 * sh);
1575
1576 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1577 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1578
1579 for (y = 0; y < sh; y++)
1580 if (0 <= y + vy && y + vy < self->rows)
1581 {
1582 maprow *row = self->row + (y + vy);
1583
1584 for (x = 0; x < sw; x++)
1585 if (row->c0 <= x + vx && x + vx < row->c1)
1586 {
1587 mapcell *cell = row->col + (x + vx - row->c0);
1588
1589 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1)
1591 : 255 - FOW_DARKNESS;
1592 }
1593 }
1594
1333 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1334 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
1335 PUSHs (sv_2mortal (newSViv (sh))); 1597 PUSHs (sv_2mortal (newSViv (sh)));
1336 PUSHs (darkness_sv); 1598 PUSHs (darkness_sv);
1337} 1599}
1338 1600
1339SV * 1601SV *
1340get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1602get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341 CODE: 1603 CODE:
1342{ 1604{
1343 int x, y, x1, y1; 1605 int x, y, x1, y1;
1344 SV *data_sv = newSV (w * h * 7 + 5); 1606 SV *data_sv = newSV (w * h * 7 + 5);
1345 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1607 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1407} 1669}
1408 OUTPUT: 1670 OUTPUT:
1409 RETVAL 1671 RETVAL
1410 1672
1411void 1673void
1412set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1674set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413 PPCODE: 1675 PPCODE:
1414{ 1676{
1415 int x, y, z; 1677 int x, y, z;
1416 int w, h; 1678 int w, h;
1417 int x1, y1; 1679 int x1, y1;
1449 1711
1450 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1451 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1452 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1453 1715
1454 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1455 { 1717 {
1456 cell->darkness = -1; 1718 cell->darkness = 0;
1457 1719
1458 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1459 { 1721 {
1460 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1461 1723
1466 } 1728 }
1467 } 1729 }
1468 } 1730 }
1469} 1731}
1470 1732
1471MODULE = CFClient PACKAGE = CFClient::MixChunk 1733MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472 1734
1473CFClient::MixChunk 1735CFPlus::MixChunk
1474new_from_file (SV *class, char *path) 1736new_from_file (SV *class, char *path)
1475 CODE: 1737 CODE:
1476 RETVAL = Mix_LoadWAV (path); 1738 RETVAL = Mix_LoadWAV (path);
1477 OUTPUT: 1739 OUTPUT:
1478 RETVAL 1740 RETVAL
1479 1741
1480void 1742void
1481DESTROY (CFClient::MixChunk self) 1743DESTROY (CFPlus::MixChunk self)
1482 CODE: 1744 CODE:
1483 Mix_FreeChunk (self); 1745 Mix_FreeChunk (self);
1484 1746
1485int 1747int
1486volume (CFClient::MixChunk self, int volume = -1) 1748volume (CFPlus::MixChunk self, int volume = -1)
1487 CODE: 1749 CODE:
1488 RETVAL = Mix_VolumeChunk (self, volume); 1750 RETVAL = Mix_VolumeChunk (self, volume);
1489 OUTPUT: 1751 OUTPUT:
1490 RETVAL 1752 RETVAL
1491 1753
1492int 1754int
1493play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1755play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494 CODE: 1756 CODE:
1495 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1757 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496 OUTPUT: 1758 OUTPUT:
1497 RETVAL 1759 RETVAL
1498 1760
1499MODULE = CFClient PACKAGE = CFClient::MixMusic 1761MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500 1762
1501int 1763int
1502volume (int volume = -1) 1764volume (int volume = -1)
1503 CODE: 1765 CODE:
1504 RETVAL = Mix_VolumeMusic (volume); 1766 RETVAL = Mix_VolumeMusic (volume);
1505 OUTPUT: 1767 OUTPUT:
1506 RETVAL 1768 RETVAL
1507 1769
1508CFClient::MixMusic 1770CFPlus::MixMusic
1509new_from_file (SV *class, char *path) 1771new_from_file (SV *class, char *path)
1510 CODE: 1772 CODE:
1511 RETVAL = Mix_LoadMUS (path); 1773 RETVAL = Mix_LoadMUS (path);
1512 OUTPUT: 1774 OUTPUT:
1513 RETVAL 1775 RETVAL
1514 1776
1515void 1777void
1516DESTROY (CFClient::MixMusic self) 1778DESTROY (CFPlus::MixMusic self)
1517 CODE: 1779 CODE:
1518 Mix_FreeMusic (self); 1780 Mix_FreeMusic (self);
1519 1781
1520int 1782int
1521play (CFClient::MixMusic self, int loops = -1) 1783play (CFPlus::MixMusic self, int loops = -1)
1522 CODE: 1784 CODE:
1523 RETVAL = Mix_PlayMusic (self, loops); 1785 RETVAL = Mix_PlayMusic (self, loops);
1524 OUTPUT: 1786 OUTPUT:
1525 RETVAL 1787 RETVAL
1526 1788
1527MODULE = CFClient PACKAGE = CFClient::OpenGL 1789MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528 1790
1529BOOT: 1791BOOT:
1530{ 1792{
1531 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1793 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532 static const struct { 1794 static const struct {
1533 const char *name; 1795 const char *name;
1534 IV iv; 1796 IV iv;
1535 } *civ, const_iv[] = { 1797 } *civ, const_iv[] = {
1536# define const_iv(name) { # name, (IV)name } 1798# define const_iv(name) { # name, (IV)name }
1543 const_iv (GL_SCISSOR_TEST), 1805 const_iv (GL_SCISSOR_TEST),
1544 const_iv (GL_DEPTH_TEST), 1806 const_iv (GL_DEPTH_TEST),
1545 const_iv (GL_ALPHA_TEST), 1807 const_iv (GL_ALPHA_TEST),
1546 const_iv (GL_NORMALIZE), 1808 const_iv (GL_NORMALIZE),
1547 const_iv (GL_RESCALE_NORMAL), 1809 const_iv (GL_RESCALE_NORMAL),
1810 const_iv (GL_FRONT),
1811 const_iv (GL_BACK),
1548 const_iv (GL_AND), 1812 const_iv (GL_AND),
1549 const_iv (GL_ONE), 1813 const_iv (GL_ONE),
1550 const_iv (GL_ZERO), 1814 const_iv (GL_ZERO),
1551 const_iv (GL_SRC_ALPHA), 1815 const_iv (GL_SRC_ALPHA),
1552 const_iv (GL_SRC_ALPHA_SATURATE), 1816 const_iv (GL_DST_ALPHA),
1553 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1817 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554 const_iv (GL_ONE_MINUS_DST_ALPHA), 1818 const_iv (GL_ONE_MINUS_DST_ALPHA),
1819 const_iv (GL_SRC_ALPHA_SATURATE),
1555 const_iv (GL_RGB), 1820 const_iv (GL_RGB),
1556 const_iv (GL_RGBA), 1821 const_iv (GL_RGBA),
1822 const_iv (GL_RGBA4),
1823 const_iv (GL_RGBA8),
1824 const_iv (GL_RGB5_A1),
1557 const_iv (GL_UNSIGNED_BYTE), 1825 const_iv (GL_UNSIGNED_BYTE),
1558 const_iv (GL_UNSIGNED_SHORT), 1826 const_iv (GL_UNSIGNED_SHORT),
1559 const_iv (GL_UNSIGNED_INT), 1827 const_iv (GL_UNSIGNED_INT),
1560 const_iv (GL_ALPHA), 1828 const_iv (GL_ALPHA),
1561 const_iv (GL_INTENSITY), 1829 const_iv (GL_INTENSITY),
1570 const_iv (GL_TEXTURE_MAG_FILTER), 1838 const_iv (GL_TEXTURE_MAG_FILTER),
1571 const_iv (GL_TEXTURE_MIN_FILTER), 1839 const_iv (GL_TEXTURE_MIN_FILTER),
1572 const_iv (GL_TEXTURE_ENV_MODE), 1840 const_iv (GL_TEXTURE_ENV_MODE),
1573 const_iv (GL_TEXTURE_WRAP_S), 1841 const_iv (GL_TEXTURE_WRAP_S),
1574 const_iv (GL_TEXTURE_WRAP_T), 1842 const_iv (GL_TEXTURE_WRAP_T),
1843 const_iv (GL_REPEAT),
1575 const_iv (GL_CLAMP), 1844 const_iv (GL_CLAMP),
1576 const_iv (GL_REPEAT), 1845 const_iv (GL_CLAMP_TO_EDGE),
1577 const_iv (GL_NEAREST), 1846 const_iv (GL_NEAREST),
1578 const_iv (GL_LINEAR), 1847 const_iv (GL_LINEAR),
1579 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1848 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1849 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1850 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1592 const_iv (GL_SEPARABLE_2D), 1861 const_iv (GL_SEPARABLE_2D),
1593 const_iv (GL_CONVOLUTION_2D), 1862 const_iv (GL_CONVOLUTION_2D),
1594 const_iv (GL_CONVOLUTION_BORDER_MODE), 1863 const_iv (GL_CONVOLUTION_BORDER_MODE),
1595 const_iv (GL_CONSTANT_BORDER), 1864 const_iv (GL_CONSTANT_BORDER),
1596 const_iv (GL_LINES), 1865 const_iv (GL_LINES),
1866 const_iv (GL_LINE_STRIP),
1597 const_iv (GL_LINE_LOOP), 1867 const_iv (GL_LINE_LOOP),
1598 const_iv (GL_QUADS), 1868 const_iv (GL_QUADS),
1599 const_iv (GL_QUAD_STRIP), 1869 const_iv (GL_QUAD_STRIP),
1600 const_iv (GL_TRIANGLES), 1870 const_iv (GL_TRIANGLES),
1601 const_iv (GL_TRIANGLE_STRIP), 1871 const_iv (GL_TRIANGLE_STRIP),
1611 1881
1612 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1882 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1883 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614} 1884}
1615 1885
1886char *
1887gl_vendor ()
1888 CODE:
1889 RETVAL = (char *)glGetString (GL_VENDOR);
1890 OUTPUT:
1891 RETVAL
1892
1893char *
1894gl_version ()
1895 CODE:
1896 RETVAL = (char *)glGetString (GL_VERSION);
1897 OUTPUT:
1898 RETVAL
1899
1900char *
1901gl_extensions ()
1902 CODE:
1903 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1904 OUTPUT:
1905 RETVAL
1906
1616int glGetError () 1907int glGetError ()
1908
1909void glFinish ()
1617 1910
1618void glClear (int mask) 1911void glClear (int mask)
1619 1912
1620void glClearColor (float r, float g, float b, float a = 1.0) 1913void glClearColor (float r, float g, float b, float a = 1.0)
1621 PROTOTYPE: @ 1914 PROTOTYPE: @
1628 1921
1629void glHint (int target, int mode) 1922void glHint (int target, int mode)
1630 1923
1631void glBlendFunc (int sfactor, int dfactor) 1924void glBlendFunc (int sfactor, int dfactor)
1632 1925
1926void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1927 CODE:
1928 gl_BlendFuncSeparate (sa, da, saa, daa);
1929
1633void glDepthMask (int flag) 1930void glDepthMask (int flag)
1634 1931
1635void glLogicOp (int opcode) 1932void glLogicOp (int opcode)
1636 1933
1637void glColorMask (int red, int green, int blue, int alpha) 1934void glColorMask (int red, int green, int blue, int alpha)
1641void glPushMatrix () 1938void glPushMatrix ()
1642 1939
1643void glPopMatrix () 1940void glPopMatrix ()
1644 1941
1645void glLoadIdentity () 1942void glLoadIdentity ()
1943
1944void glDrawBuffer (int buffer)
1945
1946void glReadBuffer (int buffer)
1646 1947
1647# near_ and far_ are due to microsofts buggy "c" compiler 1948# near_ and far_ are due to microsofts buggy "c" compiler
1648void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 1949void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649 1950
1650# near_ and far_ are due to microsofts buggy "c" compiler 1951# near_ and far_ are due to microsofts buggy "c" compiler
1670 1971
1671void glEnd () 1972void glEnd ()
1672 1973
1673void glColor (float r, float g, float b, float a = 1.0) 1974void glColor (float r, float g, float b, float a = 1.0)
1674 PROTOTYPE: @ 1975 PROTOTYPE: @
1976 ALIAS:
1977 glColor_premultiply = 1
1675 CODE: 1978 CODE:
1979 if (ix)
1980 {
1981 r *= a;
1982 g *= a;
1983 b *= a;
1984 }
1676 // microsoft visual "c" rounds instead of truncating... 1985 // microsoft visual "c" rounds instead of truncating...
1677 glColor4ub (MIN ((int)(r * 255.f), 255), 1986 glColor4f (r, g, b, a);
1678 MIN ((int)(g * 255.f), 255),
1679 MIN ((int)(b * 255.f), 255),
1680 MIN ((int)(a * 255.f), 255));
1681 1987
1682void glInterleavedArrays (int format, int stride, char *data) 1988void glInterleavedArrays (int format, int stride, char *data)
1683 1989
1684void glDrawElements (int mode, int count, int type, char *indices) 1990void glDrawElements (int mode, int count, int type, char *indices)
1685 1991
1708 2014
1709void glBindTexture (int target, int name) 2015void glBindTexture (int target, int name)
1710 2016
1711void glConvolutionParameter (int target, int pname, float params) 2017void glConvolutionParameter (int target, int pname, float params)
1712 CODE: 2018 CODE:
1713 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2019 if (gl.ConvolutionParameterf)
2020 gl.ConvolutionParameterf (target, pname, params);
1714 2021
1715void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2022void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716 CODE: 2023 CODE:
1717 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2024 if (gl.ConvolutionFilter2D)
1718 (target, internalformat, width, height, format, type, data)); 2025 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719 2026
1720void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2027void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1721 CODE: 2028 CODE:
1722 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2029 if (gl.SeparableFilter2D)
1723 (target, internalformat, width, height, format, type, row, column)); 2030 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724 2031
1725void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2032void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726 2033
1727void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2034void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728 2035
1761 2068
1762void glEndList () 2069void glEndList ()
1763 2070
1764void glCallList (int list) 2071void glCallList (int list)
1765 2072
1766

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines