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.78 by root, Fri May 12 01:47:03 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
3# pragma warning(disable:4244) 6# pragma warning(disable:4244)
4#endif 7#endif
5 8
6#include "EXTERN.h" 9#include "EXTERN.h"
7#include "perl.h" 10#include "perl.h"
8#include "XSUB.h" 11#include "XSUB.h"
9 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
17#include <math.h>
10#include <string.h> 18#include <string.h>
11#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
12 21
13#include <SDL.h> 22#include <SDL.h>
14#include <SDL_endian.h> 23#include <SDL_endian.h>
15#include <SDL_image.h> 24#include <SDL_image.h>
16#include <SDL_mixer.h> 25#include <SDL_mixer.h>
17#include <SDL_opengl.h> 26#include <SDL_opengl.h>
18 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
19#include <glib/gmacros.h> 31#include <glib/gmacros.h>
20 32
21#include <pango/pango.h> 33#include <pango/pango.h>
22#include <pango/pangofc-fontmap.h>
23#include <pango/pangoft2.h>
24#include <pango/pangocairo.h>
25 34
26#ifndef _WIN32 35#ifndef _WIN32
27# include <sys/types.h> 36# include <sys/types.h>
28# include <sys/socket.h> 37# include <sys/socket.h>
29# include <netinet/in.h> 38# include <netinet/in.h>
36 typedef signed char int8_t; 45 typedef signed char int8_t;
37 typedef signed short int16_t; 46 typedef signed short int16_t;
38 typedef signed int int32_t; 47 typedef signed int int32_t;
39#endif 48#endif
40 49
41#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
42 51
43#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
44 53
45#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
46#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
47 56
48#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
49 58
50#define GL_CALL(type,func,args) \ 59#if 0
51 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
52 static int init_; \ 61#else
53 static type fptr_; \ 62# define PARACHUTE 0
54 \ 63#endif
55 if (!init_) \
56 { \
57 init_ = 1; \
58 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
59 } \
60 \
61 if (fptr_) \
62 fptr_ args; \
63 }
64 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
65typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
66typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
67 90
68typedef 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}
69 110
70typedef struct cf_layout { 111typedef struct cf_layout {
71 PangoLayout *pl; // either derived from a cairo or ft2 context 112 PangoLayout *pl;
72 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
73 float r, g, b, a; // default color for rgba mode 113 float r, g, b, a; // default color for rgba mode
74 int base_height; 114 int base_height;
75 CFClient__Font font; 115 CFPlus__Font font;
76} *CFClient__Layout; 116} *CFPlus__Layout;
77 117
78static CFClient__Font default_font; 118static CFPlus__Font default_font;
79static PangoContext *ft2_context, *cairo_context; 119static PangoContext *opengl_context;
80static PangoFontMap *ft2_fontmap, *cairo_fontmap; 120static PangoFontMap *opengl_fontmap;
81 121
82static void 122static void
83substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
84{ 124{
85 FcPatternAddBool (pattern, FC_HINTING , 1); 125 FcPatternAddBool (pattern, FC_HINTING, 1);
126#ifdef FC_HINT_STYLE
127 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
128#endif
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
87} 130}
88 131
89static void 132static void
90layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
91{ 134{
92 /* 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
93 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
94 */ 137 */
95 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
99 142
100 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
101} 144}
102 145
103static void 146static void
104layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
105{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
106 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
107 153
108 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
109 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
110 156
111 *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;
112} 162}
113 163
114typedef uint16_t mapface; 164typedef uint16_t mapface;
115 165
116typedef struct { 166typedef struct {
119 float s, t; 169 float s, t;
120 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
121} maptex; 171} maptex;
122 172
123typedef struct { 173typedef struct {
124 int16_t darkness; 174 uint16_t darkness;
125 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
126} mapcell; 177} mapcell;
127 178
128typedef struct { 179typedef struct {
129 int32_t c0, c1; 180 int32_t c0, c1;
130 mapcell *col; 181 mapcell *col;
139 int texs; 190 int texs;
140 maptex *tex; 191 maptex *tex;
141 192
142 int32_t rows; 193 int32_t rows;
143 maprow *row; 194 maprow *row;
144} *CFClient__Map; 195} *CFPlus__Map;
145 196
146static char * 197static char *
147prepend (char *ptr, int sze, int inc) 198prepend (char *ptr, int sze, int inc)
148{ 199{
149 char *p; 200 char *p;
167 218
168#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))
169#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))
170 221
171static maprow * 222static maprow *
172map_get_row (CFClient__Map self, int y) 223map_get_row (CFPlus__Map self, int y)
173{ 224{
174 if (0 > y) 225 if (0 > y)
175 { 226 {
176 int extend = - y + MAP_EXTEND_Y; 227 int extend = - y + MAP_EXTEND_Y;
177 Prepend (maprow, self->row, self->rows, extend); 228 Prepend (maprow, self->row, self->rows, extend);
215 266
216 return row->col + (x - row->c0); 267 return row->col + (x - row->c0);
217} 268}
218 269
219static mapcell * 270static mapcell *
220map_get_cell (CFClient__Map self, int x, int y) 271map_get_cell (CFPlus__Map self, int x, int y)
221{ 272{
222 return row_get_cell (map_get_row (self, y), x); 273 return row_get_cell (map_get_row (self, y), x);
223} 274}
224 275
225static void 276static void
226map_clear (CFClient__Map self) 277map_clear (CFPlus__Map self)
227{ 278{
228 int r; 279 int r;
229 280
230 for (r = 0; r < self->rows; r++) 281 for (r = 0; r < self->rows; r++)
231 Safefree (self->row[r].col); 282 Safefree (self->row[r].col);
239 self->row = 0; 290 self->row = 0;
240 self->rows = 0; 291 self->rows = 0;
241} 292}
242 293
243static void 294static void
244map_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)
245{ 296{
246 int x, y; 297 int x, y;
247 maprow *row; 298 maprow *row;
248 299
249 for (y = y0; y < y0 + h; y++) 300 for (y = y0; y < y0 + h; y++)
258 if (x >= row->c0) 309 if (x >= row->c0)
259 { 310 {
260 if (x >= row->c1) 311 if (x >= row->c1)
261 break; 312 break;
262 313
263 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
264 } 315 }
265 } 316 }
266} 317}
267 318
268static void 319static void
289 ev.data2 = 0; 340 ev.data2 = 0;
290 341
291 SDL_PushEvent ((SDL_Event *)&ev); 342 SDL_PushEvent ((SDL_Event *)&ev);
292} 343}
293 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
294MODULE = CFClient PACKAGE = CFClient 362MODULE = CFPlus PACKAGE = CFPlus
295 363
296PROTOTYPES: ENABLE 364PROTOTYPES: ENABLE
297 365
298BOOT: 366BOOT:
299{ 367{
300 HV *stash = gv_stashpv ("CFClient", 1); 368 HV *stash = gv_stashpv ("CFPlus", 1);
301 static const struct { 369 static const struct {
302 const char *name; 370 const char *name;
303 IV iv; 371 IV iv;
304 } *civ, const_iv[] = { 372 } *civ, const_iv[] = {
305# define const_iv(name) { # name, (IV)name } 373# define const_iv(name) { # name, (IV)name }
404# undef const_iv 472# undef const_iv
405 }; 473 };
406 474
407 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; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
409
410 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413
414 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416} 477}
417 478
418int 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
490void
491pango_init ()
492 CODE:
493{
494 opengl_fontmap = pango_opengl_font_map_new ();
495 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
496 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
497}
498
499int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 500SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
420 501
421void 502void
422SDL_Quit () 503SDL_Quit ()
423 504
424void 505void
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 511 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 512 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 513 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 514 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 515
516 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
517 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
518
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 520 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 521 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 522 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 523
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 524 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
525#if SDL_VERSION_ATLEAST(1,2,10)
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 526 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
528#endif
443 529
444 SDL_EnableUNICODE (1); 530 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 531 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 532
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 533 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456 542
457 ++m; 543 ++m;
458 } 544 }
459} 545}
460 546
547char *
548SDL_GetError ()
549
461int 550int
462SDL_SetVideoMode (int w, int h, int fullscreen) 551SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 552 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 553 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466 ); 555 );
556 if (RETVAL)
557 {
467 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 }
468 OUTPUT: 563 OUTPUT:
469 RETVAL 564 RETVAL
470 565
471void 566void
472SDL_GL_SwapBuffers () 567SDL_GL_SwapBuffers ()
568
569char *
570SDL_GetKeyName (int sym)
473 571
474void 572void
475SDL_PollEvent () 573SDL_PollEvent ()
476 PPCODE: 574 PPCODE:
477{ 575{
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 595 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 596 break;
499 597
500 case SDL_MOUSEMOTION: 598 case SDL_MOUSEMOTION:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
600
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 601 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 602 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 603 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 604 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 605 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 606 break;
507 607
508 case SDL_MOUSEBUTTONDOWN: 608 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 609 case SDL_MOUSEBUTTONUP:
610 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
611
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 612 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 613 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 614 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 615 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 616 break;
518 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 620 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
519 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 621 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
520 break; 622 break;
521 } 623 }
522 624
523 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 625 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
524 } 626 }
525} 627}
526 628
527int 629int
528Mix_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)
541 CODE: 643 CODE:
542#ifndef _WIN32 644#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 646#endif
545 647
546char *
547gl_version ()
548 CODE:
549 RETVAL = (char *)glGetString (GL_VERSION);
550 OUTPUT:
551 RETVAL
552
553char *
554gl_extensions ()
555 CODE:
556 RETVAL = (char *)glGetString (GL_EXTENSIONS);
557 OUTPUT:
558 RETVAL
559
560void 648void
561add_font (char *file) 649add_font (char *file)
562 CODE: 650 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 651 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
564 652
565void 653void
566load_image_inline (SV *image_) 654load_image_inline (SV *image_)
567 ALIAS: 655 ALIAS:
568 load_image_file = 1 656 load_image_file = 1
610 698
611 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 699 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
612 700
613 assert (surface2->pitch == surface2->w * 4); 701 assert (surface2->pitch == surface2->w * 4);
614 702
703 SDL_LockSurface (surface2);
615 EXTEND (SP, 5); 704 EXTEND (SP, 6);
616 PUSHs (sv_2mortal (newSViv (surface2->w))); 705 PUSHs (sv_2mortal (newSViv (surface2->w)));
617 PUSHs (sv_2mortal (newSViv (surface2->h))); 706 PUSHs (sv_2mortal (newSViv (surface2->h)));
618 SDL_LockSurface (surface2);
619 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 707 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
620 SDL_UnlockSurface (surface2);
621 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)));
622 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 709 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
623 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 710 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
711 SDL_UnlockSurface (surface2);
624 712
625 SDL_FreeSurface (surface); 713 SDL_FreeSurface (surface);
626 SDL_FreeSurface (surface2); 714 SDL_FreeSurface (surface2);
627} 715}
628 716
652} 740}
653 741
654void 742void
655error (char *message) 743error (char *message)
656 CODE: 744 CODE:
745 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 746#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 748#endif
662 749
663void 750void
664fatal (char *message) 751fatal (char *message)
665 CODE: 752 CODE:
753 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 754#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 756#endif
671 exit (1); 757 _exit (1);
672 758
759void
760_exit (int retval)
761 CODE:
762 _exit (retval);
763
673MODULE = CFClient PACKAGE = CFClient::Font 764MODULE = CFPlus PACKAGE = CFPlus::Font
674 765
675CFClient::Font 766CFPlus::Font
676new_from_file (SV *class, char *path, int id = 0) 767new_from_file (SV *class, char *path, int id = 0)
677 CODE: 768 CODE:
678{ 769{
679 int count; 770 int count;
680 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 771 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
683} 774}
684 OUTPUT: 775 OUTPUT:
685 RETVAL 776 RETVAL
686 777
687void 778void
688DESTROY (CFClient::Font self) 779DESTROY (CFPlus::Font self)
689 CODE: 780 CODE:
690 pango_font_description_free (self); 781 pango_font_description_free (self);
691 782
692void 783void
693make_default (CFClient::Font self) 784make_default (CFPlus::Font self)
694 CODE: 785 CODE:
695 default_font = self; 786 default_font = self;
696 787
697MODULE = CFClient PACKAGE = CFClient::Layout 788MODULE = CFPlus PACKAGE = CFPlus::Layout
698 789
699CFClient::Layout 790void
700new (SV *class, int rgba = 0) 791reset_glyph_cache ()
792 CODE:
793 tc_clear ();
794
795CFPlus::Layout
796new (SV *class)
701 CODE: 797 CODE:
702 New (0, RETVAL, 1, struct cf_layout); 798 New (0, RETVAL, 1, struct cf_layout);
703 799
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 800 RETVAL->pl = pango_layout_new (opengl_context);
705 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 801 RETVAL->r = 1.;
707 RETVAL->g = 1.; 802 RETVAL->g = 1.;
708 RETVAL->b = 1.; 803 RETVAL->b = 1.;
709 RETVAL->a = 1.; 804 RETVAL->a = 1.;
710 RETVAL->base_height = MIN_FONT_HEIGHT; 805 RETVAL->base_height = MIN_FONT_HEIGHT;
714 layout_update_font (RETVAL); 809 layout_update_font (RETVAL);
715 OUTPUT: 810 OUTPUT:
716 RETVAL 811 RETVAL
717 812
718void 813void
719DESTROY (CFClient::Layout self) 814DESTROY (CFPlus::Layout self)
720 CODE: 815 CODE:
721 g_object_unref (self->pl); 816 g_object_unref (self->pl);
722 Safefree (self); 817 Safefree (self);
723 818
724int
725is_rgba (CFClient::Layout self)
726 CODE:
727 RETVAL = self->rgba;
728 OUTPUT:
729 RETVAL
730
731void 819void
732set_text (CFClient::Layout self, SV *text_) 820set_text (CFPlus::Layout self, SV *text_)
733 CODE: 821 CODE:
734{ 822{
735 STRLEN textlen; 823 STRLEN textlen;
736 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
737 825
738 pango_layout_set_text (self->pl, text, textlen); 826 pango_layout_set_text (self->pl, text, textlen);
739} 827}
740 828
741void 829void
742set_markup (CFClient::Layout self, SV *text_) 830set_markup (CFPlus::Layout self, SV *text_)
743 CODE: 831 CODE:
744{ 832{
745 STRLEN textlen; 833 STRLEN textlen;
746 char *text = SvPVutf8 (text_, textlen); 834 char *text = SvPVutf8 (text_, textlen);
747 835
748 pango_layout_set_markup (self->pl, text, textlen); 836 pango_layout_set_markup (self->pl, text, textlen);
749} 837}
750 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
751SV * 924SV *
752get_text (CFClient::Layout self) 925get_text (CFPlus::Layout self)
753 CODE: 926 CODE:
754 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 927 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755 SvUTF8_on (RETVAL); 928 sv_utf8_decode (RETVAL);
756 OUTPUT: 929 OUTPUT:
757 RETVAL 930 RETVAL
758 931
759void 932void
760set_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.)
761 CODE: 934 CODE:
762 self->r = r; 935 self->r = r;
763 self->g = g; 936 self->g = g;
764 self->b = b; 937 self->b = b;
765 self->a = a; 938 self->a = a;
766 939
767void 940void
768set_font (CFClient::Layout self, CFClient::Font font = 0) 941set_font (CFPlus::Layout self, CFPlus::Font font = 0)
769 CODE: 942 CODE:
770 if (self->font != font) 943 if (self->font != font)
771 { 944 {
772 self->font = font; 945 self->font = font;
773 layout_update_font (self); 946 layout_update_font (self);
774 } 947 }
775 948
776void 949void
777set_height (CFClient::Layout self, int base_height) 950set_height (CFPlus::Layout self, int base_height)
778 CODE: 951 CODE:
779 if (self->base_height != base_height) 952 if (self->base_height != base_height)
780 { 953 {
781 self->base_height = base_height; 954 self->base_height = base_height;
782 layout_update_font (self); 955 layout_update_font (self);
783 } 956 }
784 957
785void 958void
786set_width (CFClient::Layout self, int max_width = -1) 959set_width (CFPlus::Layout self, int max_width = -1)
787 CODE: 960 CODE:
788 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);
789 962
790void 963void
964set_indent (CFPlus::Layout self, int indent)
965 CODE:
966 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
967
968void
969set_spacing (CFPlus::Layout self, int spacing)
970 CODE:
971 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
972
973void
974set_ellipsise (CFPlus::Layout self, int ellipsise)
975 CODE:
976 pango_layout_set_ellipsize (self->pl,
977 ellipsise == 1 ? PANGO_ELLIPSIZE_START
978 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
979 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
980 : PANGO_ELLIPSIZE_NONE
981 );
982
983void
984set_single_paragraph_mode (CFPlus::Layout self, int spm)
985 CODE:
986 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
987
988void
791size (CFClient::Layout self) 989size (CFPlus::Layout self)
792 PPCODE: 990 PPCODE:
793{ 991{
794 int w, h; 992 int w, h;
795 993
796 layout_get_pixel_size (self, &w, &h); 994 layout_get_pixel_size (self, &w, &h);
799 PUSHs (sv_2mortal (newSViv (w))); 997 PUSHs (sv_2mortal (newSViv (w)));
800 PUSHs (sv_2mortal (newSViv (h))); 998 PUSHs (sv_2mortal (newSViv (h)));
801} 999}
802 1000
803int 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
804xy_to_index (CFClient::Layout self, int x, int y) 1014xy_to_index (CFPlus::Layout self, int x, int y)
805 CODE: 1015 CODE:
806{ 1016{
807 int index, trailing; 1017 int index, trailing;
808 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);
809 RETVAL = index; 1019 RETVAL = index;
810} 1020}
811 OUTPUT: 1021 OUTPUT:
812 RETVAL 1022 RETVAL
813 1023
814void 1024void
815cursor_pos (CFClient::Layout self, int index) 1025cursor_pos (CFPlus::Layout self, int index)
816 PPCODE: 1026 PPCODE:
817{ 1027{
818 PangoRectangle strong_pos; 1028 PangoRectangle strong_pos;
819 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1029 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
820 1030
823 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
824 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
825} 1035}
826 1036
827void 1037void
828render (CFClient::Layout self) 1038render (CFPlus::Layout self, float x, float y, int flags = 0)
829 PPCODE: 1039 PPCODE:
830{ 1040 pango_opengl_render_layout_subpixel (
831 SV *retval; 1041 self->pl,
832 int w, h; 1042 x * PANGO_SCALE, y * PANGO_SCALE,
1043 self->r, self->g, self->b, self->a,
1044 flags
1045 );
833 1046
834 layout_get_pixel_size (self, &w, &h); 1047MODULE = CFPlus PACKAGE = CFPlus::Texture
835 1048
836 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)
837 { 1057 {
838 cairo_surface_t *surface; 1058 int nw = minpot (ow);
839 cairo_t *cairo; 1059 int nh = minpot (oh);
840 1060
841 retval = newSV (w * h * 4); 1061 if (nw != ow || nh != oh)
842 SvPOK_only (retval);
843 SvCUR_set (retval, w * h * 4);
844
845 memset (SvPVX (retval), 0, w * h * 4);
846
847 surface = cairo_image_surface_create_for_data (
848 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
849 cairo = cairo_create (surface);
850 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
851
852 pango_cairo_show_layout (cairo, self->pl);
853
854 cairo_destroy (cairo);
855 cairo_surface_destroy (surface);
856
857 // what a mess, and its premultiplied, too :(
858 { 1062 {
859 uint32_t *p = (uint32_t *)SvPVX (retval); 1063 if (SvOK (data_))
860 uint32_t *e = p + w * h;
861
862 while (p < e)
863 { 1064 {
864 uint32_t rgba = *p; 1065 STRLEN datalen;
865 rgba = (rgba >> 24) | (rgba << 8); 1066 char *data = SvPVbyte (data_, datalen);
866 rgba = SDL_SwapBE32 (rgba); 1067 int bpp = datalen / (ow * oh);
867 *p++ = rgba; 1068 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1069
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_);
868 } 1078 }
1079
1080 sv_setiv (w_, nw);
1081 sv_setiv (h_, nh);
869 } 1082 }
870
871 EXTEND (SP, 5);
872 PUSHs (sv_2mortal (newSViv (w)));
873 PUSHs (sv_2mortal (newSViv (h)));
874 PUSHs (sv_2mortal (retval));
875 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
876 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
877 } 1083 }
878 else
879 {
880 FT_Bitmap bitmap;
881
882 retval = newSV (w * h);
883 SvPOK_only (retval);
884 SvCUR_set (retval, w * h);
885
886 bitmap.rows = h;
887 bitmap.width = w;
888 bitmap.pitch = w;
889 bitmap.buffer = (unsigned char*)SvPVX (retval);
890 bitmap.num_grays = 256;
891 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
892
893 memset (bitmap.buffer, 0, w * h);
894
895 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
896
897 EXTEND (SP, 5);
898 PUSHs (sv_2mortal (newSViv (w)));
899 PUSHs (sv_2mortal (newSViv (h)));
900 PUSHs (sv_2mortal (retval));
901 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
902 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
903 }
904} 1084}
905 1085
906MODULE = CFClient PACKAGE = CFClient::Texture
907
908void 1086void
909draw_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.)
910 PROTOTYPE: $$$;$$ 1088 PROTOTYPE: $$$;$$
911 ALIAS: 1089 ALIAS:
912 draw_quad_alpha = 1 1090 draw_quad_alpha = 1
913 draw_quad_alpha_premultiplied = 2 1091 draw_quad_alpha_premultiplied = 2
914 CODE: 1092 CODE:
915{ 1093{
916 HV *hv = (HV *)SvRV (self); 1094 HV *hv = (HV *)SvRV (self);
917 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1095 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1096 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1097 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921 1098
922 if (items < 5) 1099 if (items < 5)
923 { 1100 {
924 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1101 w = SvNV (*hv_fetch (hv, "w", 1, 1));
925 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1102 h = SvNV (*hv_fetch (hv, "h", 1, 1));
926 } 1103 }
927 1104
928 if (ix) 1105 if (ix)
929 { 1106 {
930 glEnable (GL_BLEND); 1107 glEnable (GL_BLEND);
1108
1109 if (ix == 2)
931 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
1115 glEnable (GL_ALPHA_TEST);
1116 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1117 }
933 1118
934 glBindTexture (GL_TEXTURE_2D, name); 1119 glBindTexture (GL_TEXTURE_2D, name);
935
936 if (wrap_mode)
937 {
938 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940 }
941 1120
942 glBegin (GL_QUADS); 1121 glBegin (GL_QUADS);
943 glTexCoord2f (0, 0); glVertex2f (x , y ); 1122 glTexCoord2f (0, 0); glVertex2f (x , y );
944 glTexCoord2f (0, t); glVertex2f (x , y + h); 1123 glTexCoord2f (0, t); glVertex2f (x , y + h);
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1124 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1125 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1126 glEnd ();
948 1127
949 if (ix) 1128 if (ix)
1129 {
1130 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1131 glDisable (GL_BLEND);
1132 }
951} 1133}
952 1134
953MODULE = CFClient PACKAGE = CFClient::Map 1135MODULE = CFPlus PACKAGE = CFPlus::Map
954 1136
955CFClient::Map 1137CFPlus::Map
956new (SV *class, int map_width, int map_height) 1138new (SV *class, int map_width, int map_height)
957 CODE: 1139 CODE:
958 New (0, RETVAL, 1, struct map); 1140 New (0, RETVAL, 1, struct map);
959 RETVAL->x = 0; 1141 RETVAL->x = 0;
960 RETVAL->y = 0; 1142 RETVAL->y = 0;
970 RETVAL->row = 0; 1152 RETVAL->row = 0;
971 OUTPUT: 1153 OUTPUT:
972 RETVAL 1154 RETVAL
973 1155
974void 1156void
975DESTROY (CFClient::Map self) 1157DESTROY (CFPlus::Map self)
976 CODE: 1158 CODE:
977{ 1159{
978 map_clear (self); 1160 map_clear (self);
979 Safefree (self->face); 1161 Safefree (self->face);
1162 Safefree (self->tex);
980 Safefree (self); 1163 Safefree (self);
981} 1164}
982 1165
983void 1166void
984clear (CFClient::Map self) 1167clear (CFPlus::Map self)
985 CODE: 1168 CODE:
986 map_clear (self); 1169 map_clear (self);
987 1170
988void 1171void
989set_face (CFClient::Map self, int face, int texid) 1172set_face (CFPlus::Map self, int face, int texid)
990 CODE: 1173 CODE:
991{ 1174{
992 while (self->faces <= face) 1175 while (self->faces <= face)
993 { 1176 {
994 Append (mapface, self->face, self->faces, self->faces); 1177 Append (mapface, self->face, self->faces, self->faces);
997 1180
998 self->face [face] = texid; 1181 self->face [face] = texid;
999} 1182}
1000 1183
1001void 1184void
1002set_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)
1003 CODE: 1186 CODE:
1004{ 1187{
1005 while (self->texs <= texid) 1188 while (self->texs <= texid)
1006 { 1189 {
1007 Append (maptex, self->tex, self->texs, self->texs); 1190 Append (maptex, self->tex, self->texs, self->texs);
1019 tex->r = r; 1202 tex->r = r;
1020 tex->g = g; 1203 tex->g = g;
1021 tex->b = b; 1204 tex->b = b;
1022 tex->a = a; 1205 tex->a = a;
1023 } 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);
1024} 1216}
1025 1217
1026int 1218int
1027ox (CFClient::Map self) 1219ox (CFPlus::Map self)
1028 ALIAS: 1220 ALIAS:
1029 oy = 1 1221 oy = 1
1222 x = 2
1223 y = 3
1224 w = 4
1225 h = 5
1030 CODE: 1226 CODE:
1031 switch (ix) 1227 switch (ix)
1032 { 1228 {
1033 case 0: RETVAL = self->ox; break; 1229 case 0: RETVAL = self->ox; break;
1034 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;
1035 } 1235 }
1036 OUTPUT: 1236 OUTPUT:
1037 RETVAL 1237 RETVAL
1038 1238
1039void 1239void
1040scroll (CFClient::Map self, int dx, int dy) 1240scroll (CFPlus::Map self, int dx, int dy)
1041 CODE: 1241 CODE:
1042{ 1242{
1043 if (dx > 0) 1243 if (dx > 0)
1044 map_blank (self, self->x, self->y, dx - 1, self->h); 1244 map_blank (self, self->x, self->y, dx - 1, self->h);
1045 else if (dx < 0) 1245 else if (dx < 0)
1061 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1062 } 1262 }
1063} 1263}
1064 1264
1065void 1265void
1066map1a_update (CFClient::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1067 CODE: 1267 CODE:
1068{ 1268{
1069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1070 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1071 mapcell *cell; 1271 mapcell *cell;
1073 1273
1074 while (data < data_end) 1274 while (data < data_end)
1075 { 1275 {
1076 flags = (data [0] << 8) + data [1]; data += 2; 1276 flags = (data [0] << 8) + data [1]; data += 2;
1077 1277
1078 x = ((flags >> 10) & 63) + self->x; 1278 x = self->x + ((flags >> 10) & 63);
1079 y = ((flags >> 4) & 63) + self->y; 1279 y = self->y + ((flags >> 4) & 63);
1080 1280
1081 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1082 1282
1083 if (flags & 15) 1283 if (flags & 15)
1084 { 1284 {
1085 if (cell->darkness < 0) 1285 if (!cell->darkness)
1086 { 1286 {
1087 cell->darkness = 0; 1287 cell->darkness = 256;
1088 cell->face [0] = 0; 1288 cell->face [0] = 0;
1089 cell->face [1] = 0; 1289 cell->face [1] = 0;
1090 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1091 } 1292 }
1092 1293
1093 cell->darkness = flags & 8 ? *data++ : 255;
1094
1095 //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 }
1096 1319
1097 if (flags & 4) 1320 if (flags & 4)
1098 { 1321 {
1099 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;
1100 } 1323 }
1108 { 1331 {
1109 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;
1110 } 1333 }
1111 } 1334 }
1112 else 1335 else
1113 cell->darkness = -1; 1336 cell->darkness = 0;
1114 } 1337 }
1115} 1338}
1116 1339
1117SV * 1340SV *
1118mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1119 CODE: 1342 CODE:
1120{ 1343{
1121 int x1, x; 1344 int x1, x;
1122 int y1, y; 1345 int y1, y;
1123 int z; 1346 int z;
1173} 1396}
1174 OUTPUT: 1397 OUTPUT:
1175 RETVAL 1398 RETVAL
1176 1399
1177void 1400void
1178draw (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)
1179 PPCODE: 1402 CODE:
1180{ 1403{
1181 int vx, vy; 1404 int vx, vy;
1182 int x, y, z; 1405 int x, y, z;
1183 int last_name; 1406 int last_name;
1184 mapface face; 1407 mapface face;
1185 int sw4 = (sw + 3) & ~3;
1186 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1187 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1188 1408
1189 memset (darkness, 255, sw4 * sh);
1190 SvPOK_only (darkness_sv);
1191 SvCUR_set (darkness_sv, sw4 * sh);
1192
1193 vx = self->x + (self->w - sw) / 2 - shift_x; 1409 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1194 vy = self->y + (self->h - sh) / 2 - shift_y; 1410 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1195 1411
1196 /* 1412 /*
1197 int vx = self->vx = self->w >= sw 1413 int vx = self->vx = self->w >= sw
1198 ? self->x + (self->w - sw) / 2 1414 ? self->x + (self->w - sw) / 2
1199 : 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));
1203 : 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));
1204 */ 1420 */
1205 1421
1206 glColor4ub (255, 255, 255, 255); 1422 glColor4ub (255, 255, 255, 255);
1207 1423
1424 glEnable (GL_BLEND);
1208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1425 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1209 glEnable (GL_BLEND);
1210 glEnable (GL_TEXTURE_2D); 1426 glEnable (GL_TEXTURE_2D);
1211 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1427 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1212 1428
1213 glBegin (GL_QUADS); 1429 glBegin (GL_QUADS);
1214 1430
1222 1438
1223 for (x = 0; x < sw; x++) 1439 for (x = 0; x < sw; x++)
1224 if (row->c0 <= x + vx && x + vx < row->c1) 1440 if (row->c0 <= x + vx && x + vx < row->c1)
1225 { 1441 {
1226 mapcell *cell = row->col + (x + vx - row->c0); 1442 mapcell *cell = row->col + (x + vx - row->c0);
1227
1228 darkness[y * sw4 + x] = cell->darkness < 0
1229 ? 255 - FOW_DARKNESS
1230 : 255 - cell->darkness;
1231 1443
1232 face = cell->face [z]; 1444 face = cell->face [z];
1233 1445
1234 if (face) 1446 if (face)
1235 { 1447 {
1257 glEnd (); 1469 glEnd ();
1258 1470
1259 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1260 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1261 1473
1474 for (y = 0; y < sh; y++)
1475 if (0 <= y + vy && y + vy < self->rows)
1476 {
1477 maprow *row = self->row + (y + vy);
1478
1479 for (x = 0; x < sw; x++)
1480 if (row->c0 <= x + vx && x + vx < row->c1)
1481 {
1482 mapcell *cell = row->col + (x + vx - row->c0);
1483
1484 int px = x * 32;
1485 int py = y * 32;
1486
1487 if (cell->stat_hp)
1488 {
1489 glColor3ub (0, 0, 0);
1490 glRectf (px + 1, py + 1, px + 31, py + 4);
1491
1492 glColor3ub (0, 255, 0);
1493 glBegin (GL_LINES);
1494 glVertex2f (px + 2, py + 2.5f);
1495 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1496 glEnd ();
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
1262 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1263 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
1264 PUSHs (sv_2mortal (newSViv (sh))); 1597 PUSHs (sv_2mortal (newSViv (sh)));
1265 PUSHs (darkness_sv); 1598 PUSHs (darkness_sv);
1266} 1599}
1267 1600
1268SV * 1601SV *
1269get_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)
1270 CODE: 1603 CODE:
1271{ 1604{
1272 int x, y, x1, y1; 1605 int x, y, x1, y1;
1273 SV *data_sv = newSV (w * h * 7 + 5); 1606 SV *data_sv = newSV (w * h * 7 + 5);
1274 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1607 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1336} 1669}
1337 OUTPUT: 1670 OUTPUT:
1338 RETVAL 1671 RETVAL
1339 1672
1340void 1673void
1341set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1674set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1342 PPCODE: 1675 PPCODE:
1343{ 1676{
1344 int x, y, z; 1677 int x, y, z;
1345 int w, h; 1678 int w, h;
1346 int x1, y1; 1679 int x1, y1;
1378 1711
1379 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1380 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1381 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1382 1715
1383 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1384 { 1717 {
1385 cell->darkness = -1; 1718 cell->darkness = 0;
1386 1719
1387 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1388 { 1721 {
1389 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1390 1723
1395 } 1728 }
1396 } 1729 }
1397 } 1730 }
1398} 1731}
1399 1732
1400MODULE = CFClient PACKAGE = CFClient::MixChunk 1733MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1401 1734
1402CFClient::MixChunk 1735CFPlus::MixChunk
1403new_from_file (SV *class, char *path) 1736new_from_file (SV *class, char *path)
1404 CODE: 1737 CODE:
1405 RETVAL = Mix_LoadWAV (path); 1738 RETVAL = Mix_LoadWAV (path);
1406 OUTPUT: 1739 OUTPUT:
1407 RETVAL 1740 RETVAL
1408 1741
1409void 1742void
1410DESTROY (CFClient::MixChunk self) 1743DESTROY (CFPlus::MixChunk self)
1411 CODE: 1744 CODE:
1412 Mix_FreeChunk (self); 1745 Mix_FreeChunk (self);
1413 1746
1414int 1747int
1415volume (CFClient::MixChunk self, int volume = -1) 1748volume (CFPlus::MixChunk self, int volume = -1)
1416 CODE: 1749 CODE:
1417 RETVAL = Mix_VolumeChunk (self, volume); 1750 RETVAL = Mix_VolumeChunk (self, volume);
1418 OUTPUT: 1751 OUTPUT:
1419 RETVAL 1752 RETVAL
1420 1753
1421int 1754int
1422play (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)
1423 CODE: 1756 CODE:
1424 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1757 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1425 OUTPUT: 1758 OUTPUT:
1426 RETVAL 1759 RETVAL
1427 1760
1428MODULE = CFClient PACKAGE = CFClient::MixMusic 1761MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1429 1762
1430int 1763int
1431volume (int volume = -1) 1764volume (int volume = -1)
1432 CODE: 1765 CODE:
1433 RETVAL = Mix_VolumeMusic (volume); 1766 RETVAL = Mix_VolumeMusic (volume);
1434 OUTPUT: 1767 OUTPUT:
1435 RETVAL 1768 RETVAL
1436 1769
1437CFClient::MixMusic 1770CFPlus::MixMusic
1438new_from_file (SV *class, char *path) 1771new_from_file (SV *class, char *path)
1439 CODE: 1772 CODE:
1440 RETVAL = Mix_LoadMUS (path); 1773 RETVAL = Mix_LoadMUS (path);
1441 OUTPUT: 1774 OUTPUT:
1442 RETVAL 1775 RETVAL
1443 1776
1444void 1777void
1445DESTROY (CFClient::MixMusic self) 1778DESTROY (CFPlus::MixMusic self)
1446 CODE: 1779 CODE:
1447 Mix_FreeMusic (self); 1780 Mix_FreeMusic (self);
1448 1781
1449int 1782int
1450play (CFClient::MixMusic self, int loops = -1) 1783play (CFPlus::MixMusic self, int loops = -1)
1451 CODE: 1784 CODE:
1452 RETVAL = Mix_PlayMusic (self, loops); 1785 RETVAL = Mix_PlayMusic (self, loops);
1453 OUTPUT: 1786 OUTPUT:
1454 RETVAL 1787 RETVAL
1455 1788
1456MODULE = CFClient PACKAGE = CFClient::OpenGL 1789MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1457 1790
1458BOOT: 1791BOOT:
1459{ 1792{
1460 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1793 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1461 static const struct { 1794 static const struct {
1462 const char *name; 1795 const char *name;
1463 IV iv; 1796 IV iv;
1464 } *civ, const_iv[] = { 1797 } *civ, const_iv[] = {
1465# define const_iv(name) { # name, (IV)name } 1798# define const_iv(name) { # name, (IV)name }
1466 const_iv (GL_COLOR_MATERIAL), 1799 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1800 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1801 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1802 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1803 const_iv (GL_BLEND),
1804 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1805 const_iv (GL_SCISSOR_TEST),
1806 const_iv (GL_DEPTH_TEST),
1807 const_iv (GL_ALPHA_TEST),
1808 const_iv (GL_NORMALIZE),
1809 const_iv (GL_RESCALE_NORMAL),
1810 const_iv (GL_FRONT),
1811 const_iv (GL_BACK),
1472 const_iv (GL_AND), 1812 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1813 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1814 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1815 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1816 const_iv (GL_DST_ALPHA),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1817 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1818 const_iv (GL_ONE_MINUS_DST_ALPHA),
1819 const_iv (GL_SRC_ALPHA_SATURATE),
1479 const_iv (GL_RGB), 1820 const_iv (GL_RGB),
1480 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),
1481 const_iv (GL_UNSIGNED_BYTE), 1825 const_iv (GL_UNSIGNED_BYTE),
1826 const_iv (GL_UNSIGNED_SHORT),
1827 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1828 const_iv (GL_ALPHA),
1829 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1830 const_iv (GL_LUMINANCE),
1831 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1832 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1833 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1834 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1835 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1836 const_iv (GL_TEXTURE_2D),
1490 const_iv (GL_TEXTURE_MAG_FILTER), 1838 const_iv (GL_TEXTURE_MAG_FILTER),
1491 const_iv (GL_TEXTURE_MIN_FILTER), 1839 const_iv (GL_TEXTURE_MIN_FILTER),
1492 const_iv (GL_TEXTURE_ENV_MODE), 1840 const_iv (GL_TEXTURE_ENV_MODE),
1493 const_iv (GL_TEXTURE_WRAP_S), 1841 const_iv (GL_TEXTURE_WRAP_S),
1494 const_iv (GL_TEXTURE_WRAP_T), 1842 const_iv (GL_TEXTURE_WRAP_T),
1843 const_iv (GL_REPEAT),
1495 const_iv (GL_CLAMP), 1844 const_iv (GL_CLAMP),
1496 const_iv (GL_REPEAT), 1845 const_iv (GL_CLAMP_TO_EDGE),
1497 const_iv (GL_NEAREST), 1846 const_iv (GL_NEAREST),
1498 const_iv (GL_LINEAR), 1847 const_iv (GL_LINEAR),
1499 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1848 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1849 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1850 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1851 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1852 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1853 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1854 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1855 const_iv (GL_REPLACE),
1856 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1857 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1858 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1859 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1860 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1861 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1862 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1863 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1864 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1865 const_iv (GL_LINES),
1866 const_iv (GL_LINE_STRIP),
1867 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1868 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1869 const_iv (GL_QUAD_STRIP),
1870 const_iv (GL_TRIANGLES),
1871 const_iv (GL_TRIANGLE_STRIP),
1872 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1873 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1874 const_iv (GL_FASTEST),
1875 const_iv (GL_V2F),
1876 const_iv (GL_V3F),
1877 const_iv (GL_T2F_V3F),
1878 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1879# undef const_iv
1521 }; 1880 };
1522 1881
1523 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; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1883 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525} 1884}
1526 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
1527int glGetError () 1907int glGetError ()
1908
1909void glFinish ()
1528 1910
1529void glClear (int mask) 1911void glClear (int mask)
1530 1912
1531void glClearColor (float r, float g, float b, float a = 1.0) 1913void glClearColor (float r, float g, float b, float a = 1.0)
1532 PROTOTYPE: @ 1914 PROTOTYPE: @
1539 1921
1540void glHint (int target, int mode) 1922void glHint (int target, int mode)
1541 1923
1542void glBlendFunc (int sfactor, int dfactor) 1924void glBlendFunc (int sfactor, int dfactor)
1543 1925
1926void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1927 CODE:
1928 gl_BlendFuncSeparate (sa, da, saa, daa);
1929
1930void glDepthMask (int flag)
1931
1544void glLogicOp (int opcode) 1932void glLogicOp (int opcode)
1545 1933
1546void glColorMask (int red, int green, int blue, int alpha) 1934void glColorMask (int red, int green, int blue, int alpha)
1547 1935
1548void glMatrixMode (int mode) 1936void glMatrixMode (int mode)
1551 1939
1552void glPopMatrix () 1940void glPopMatrix ()
1553 1941
1554void glLoadIdentity () 1942void glLoadIdentity ()
1555 1943
1944void glDrawBuffer (int buffer)
1945
1946void glReadBuffer (int buffer)
1947
1556# near and far are due to microsofts buggy c compiler 1948# near_ and far_ are due to microsofts buggy "c" compiler
1949void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1950
1951# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1952void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1953
1559void glViewport (int x, int y, int width, int height) 1954void glViewport (int x, int y, int width, int height)
1560 1955
1561void glScissor (int x, int y, int width, int height) 1956void glScissor (int x, int y, int width, int height)
1576 1971
1577void glEnd () 1972void glEnd ()
1578 1973
1579void glColor (float r, float g, float b, float a = 1.0) 1974void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1975 PROTOTYPE: @
1976 ALIAS:
1977 glColor_premultiply = 1
1581 CODE: 1978 CODE:
1582 // 255.999 is close enough to correctness (256 and clamp) 1979 if (ix)
1583 glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999); 1980 {
1981 r *= a;
1982 g *= a;
1983 b *= a;
1984 }
1985 // microsoft visual "c" rounds instead of truncating...
1986 glColor4f (r, g, b, a);
1987
1988void glInterleavedArrays (int format, int stride, char *data)
1989
1990void glDrawElements (int mode, int count, int type, char *indices)
1991
1992# 1.2 void glDrawRangeElements (int mode, int start, int end
1993
1994void glRasterPos (float x, float y, float z = 0.)
1995 CODE:
1996 glRasterPos3f (0, 0, z);
1997 glBitmap (0, 0, 0, 0, x, y, 0);
1584 1998
1585void glVertex (float x, float y, float z = 0.) 1999void glVertex (float x, float y, float z = 0.)
1586 CODE: 2000 CODE:
1587 glVertex3f (x, y, z); 2001 glVertex3f (x, y, z);
1588 2002
1600 2014
1601void glBindTexture (int target, int name) 2015void glBindTexture (int target, int name)
1602 2016
1603void glConvolutionParameter (int target, int pname, float params) 2017void glConvolutionParameter (int target, int pname, float params)
1604 CODE: 2018 CODE:
1605 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2019 if (gl.ConvolutionParameterf)
2020 gl.ConvolutionParameterf (target, pname, params);
1606 2021
1607void 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)
1608 CODE: 2023 CODE:
1609 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2024 if (gl.ConvolutionFilter2D)
1610 (target, internalformat, width, height, format, type, data)); 2025 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1611 2026
1612void 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)
1613 CODE: 2028 CODE:
1614 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2029 if (gl.SeparableFilter2D)
1615 (target, internalformat, width, height, format, type, row, column)); 2030 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1616 2031
1617void 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)
1618 2033
1619void 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)
1620 2035
1621void glRasterPos (int x, int y) 2036void glDrawPixels (int width, int height, int format, int type, char *pixels)
1622 CODE:
1623 glRasterPos2i (x, y);
1624 2037
1625void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2038void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1626 2039
1627int glGenTexture () 2040int glGenTexture ()
1628 CODE: 2041 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines