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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.147 by root, Sat Aug 19 03:57:08 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_width, 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;
299 mapcell *cell;
248 300
249 for (y = y0; y < y0 + h; y++) 301 for (y = y0; y < y0 + h; y++)
250 if (y >= 0) 302 if (y >= 0)
251 { 303 {
252 if (y >= self->rows) 304 if (y >= self->rows)
258 if (x >= row->c0) 310 if (x >= row->c0)
259 { 311 {
260 if (x >= row->c1) 312 if (x >= row->c1)
261 break; 313 break;
262 314
263 row->col[x - row->c0].darkness = -1; 315 cell = row->col + x - row->c0;
316
317 cell->darkness = 0;
318 cell->stat_hp = 0;
264 } 319 }
265 } 320 }
266} 321}
267 322
268static void 323static void
289 ev.data2 = 0; 344 ev.data2 = 0;
290 345
291 SDL_PushEvent ((SDL_Event *)&ev); 346 SDL_PushEvent ((SDL_Event *)&ev);
292} 347}
293 348
349static unsigned int
350minpot (unsigned int n)
351{
352 if (!n)
353 return 0;
354
355 --n;
356
357 n |= n >> 1;
358 n |= n >> 2;
359 n |= n >> 4;
360 n |= n >> 8;
361 n |= n >> 16;
362
363 return n + 1;
364}
365
294MODULE = CFClient PACKAGE = CFClient 366MODULE = CFPlus PACKAGE = CFPlus
295 367
296PROTOTYPES: ENABLE 368PROTOTYPES: ENABLE
297 369
298BOOT: 370BOOT:
299{ 371{
300 HV *stash = gv_stashpv ("CFClient", 1); 372 HV *stash = gv_stashpv ("CFPlus", 1);
301 static const struct { 373 static const struct {
302 const char *name; 374 const char *name;
303 IV iv; 375 IV iv;
304 } *civ, const_iv[] = { 376 } *civ, const_iv[] = {
305# define const_iv(name) { # name, (IV)name } 377# define const_iv(name) { # name, (IV)name }
404# undef const_iv 476# undef const_iv
405 }; 477 };
406 478
407 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 479 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 480 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} 481}
417 482
418int 483int
484in_destruct ()
485 CODE:
486 RETVAL = PL_main_cv == Nullcv;
487 OUTPUT:
488 RETVAL
489
490NV floor (NV x)
491
492NV ceil (NV x)
493
494void
495pango_init ()
496 CODE:
497{
498 opengl_fontmap = pango_opengl_font_map_new ();
499 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
500 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
501}
502
503int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 504SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
420 505
421void 506void
422SDL_Quit () 507SDL_Quit ()
423 508
424void 509void
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 515 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 518 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 519
520 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
521 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
522
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 523 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 527
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 528 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
529#if SDL_VERSION_ATLEAST(1,2,10)
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 530 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 531 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
532#endif
443 533
444 SDL_EnableUNICODE (1); 534 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 535 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 536
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 537 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456 546
457 ++m; 547 ++m;
458 } 548 }
459} 549}
460 550
551char *
552SDL_GetError ()
553
461int 554int
462SDL_SetVideoMode (int w, int h, int fullscreen) 555SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 556 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 557 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 558 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466 ); 559 );
560 if (RETVAL)
561 {
467 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 562 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
563# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
564# include "glfunc.h"
565# undef GL_FUNC
566 }
468 OUTPUT: 567 OUTPUT:
469 RETVAL 568 RETVAL
470 569
471void 570void
472SDL_GL_SwapBuffers () 571SDL_GL_SwapBuffers ()
572
573char *
574SDL_GetKeyName (int sym)
473 575
474void 576void
475SDL_PollEvent () 577SDL_PollEvent ()
476 PPCODE: 578 PPCODE:
477{ 579{
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 598 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 599 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 600 break;
499 601
500 case SDL_MOUSEMOTION: 602 case SDL_MOUSEMOTION:
603 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
604
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 608 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 609 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 610 break;
507 611
508 case SDL_MOUSEBUTTONDOWN: 612 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 613 case SDL_MOUSEBUTTONUP:
614 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
615
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 616 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 617 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 618 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 619 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 620 break;
518 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 624 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
519 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 625 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
520 break; 626 break;
521 } 627 }
522 628
523 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 629 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
524 } 630 }
525} 631}
526 632
527int 633int
528Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 634Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
541 CODE: 647 CODE:
542#ifndef _WIN32 648#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 649 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 650#endif
545 651
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 652void
561add_font (char *file) 653add_font (char *file)
562 CODE: 654 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 655 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
564 656
565void 657void
566load_image_inline (SV *image_) 658load_image_inline (SV *image_)
567 ALIAS: 659 ALIAS:
568 load_image_file = 1 660 load_image_file = 1
610 702
611 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 703 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
612 704
613 assert (surface2->pitch == surface2->w * 4); 705 assert (surface2->pitch == surface2->w * 4);
614 706
707 SDL_LockSurface (surface2);
615 EXTEND (SP, 5); 708 EXTEND (SP, 6);
616 PUSHs (sv_2mortal (newSViv (surface2->w))); 709 PUSHs (sv_2mortal (newSViv (surface2->w)));
617 PUSHs (sv_2mortal (newSViv (surface2->h))); 710 PUSHs (sv_2mortal (newSViv (surface2->h)));
618 SDL_LockSurface (surface2);
619 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 711 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))); 712 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
622 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 713 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
623 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 714 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
715 SDL_UnlockSurface (surface2);
624 716
625 SDL_FreeSurface (surface); 717 SDL_FreeSurface (surface);
626 SDL_FreeSurface (surface2); 718 SDL_FreeSurface (surface2);
627} 719}
628 720
652} 744}
653 745
654void 746void
655error (char *message) 747error (char *message)
656 CODE: 748 CODE:
749 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 750#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 751 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 752#endif
662 753
663void 754void
664fatal (char *message) 755fatal (char *message)
665 CODE: 756 CODE:
757 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 758#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 759 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 760#endif
671 exit (1); 761 _exit (1);
672 762
763void
764_exit (int retval)
765 CODE:
766 _exit (retval);
767
673MODULE = CFClient PACKAGE = CFClient::Font 768MODULE = CFPlus PACKAGE = CFPlus::Font
674 769
675CFClient::Font 770CFPlus::Font
676new_from_file (SV *class, char *path, int id = 0) 771new_from_file (SV *class, char *path, int id = 0)
677 CODE: 772 CODE:
678{ 773{
679 int count; 774 int count;
680 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 775 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
683} 778}
684 OUTPUT: 779 OUTPUT:
685 RETVAL 780 RETVAL
686 781
687void 782void
688DESTROY (CFClient::Font self) 783DESTROY (CFPlus::Font self)
689 CODE: 784 CODE:
690 pango_font_description_free (self); 785 pango_font_description_free (self);
691 786
692void 787void
693make_default (CFClient::Font self) 788make_default (CFPlus::Font self)
694 CODE: 789 CODE:
695 default_font = self; 790 default_font = self;
696 791
697MODULE = CFClient PACKAGE = CFClient::Layout 792MODULE = CFPlus PACKAGE = CFPlus::Layout
698 793
699CFClient::Layout 794void
700new (SV *class, int rgba = 0) 795reset_glyph_cache ()
796 CODE:
797 tc_clear ();
798
799CFPlus::Layout
800new (SV *class)
701 CODE: 801 CODE:
702 New (0, RETVAL, 1, struct cf_layout); 802 New (0, RETVAL, 1, struct cf_layout);
703 803
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 804 RETVAL->pl = pango_layout_new (opengl_context);
705 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 805 RETVAL->r = 1.;
707 RETVAL->g = 1.; 806 RETVAL->g = 1.;
708 RETVAL->b = 1.; 807 RETVAL->b = 1.;
709 RETVAL->a = 1.; 808 RETVAL->a = 1.;
710 RETVAL->base_height = MIN_FONT_HEIGHT; 809 RETVAL->base_height = MIN_FONT_HEIGHT;
714 layout_update_font (RETVAL); 813 layout_update_font (RETVAL);
715 OUTPUT: 814 OUTPUT:
716 RETVAL 815 RETVAL
717 816
718void 817void
719DESTROY (CFClient::Layout self) 818DESTROY (CFPlus::Layout self)
720 CODE: 819 CODE:
721 g_object_unref (self->pl); 820 g_object_unref (self->pl);
722 Safefree (self); 821 Safefree (self);
723 822
724int
725is_rgba (CFClient::Layout self)
726 CODE:
727 RETVAL = self->rgba;
728 OUTPUT:
729 RETVAL
730
731void 823void
732set_text (CFClient::Layout self, SV *text_) 824set_text (CFPlus::Layout self, SV *text_)
733 CODE: 825 CODE:
734{ 826{
735 STRLEN textlen; 827 STRLEN textlen;
736 char *text = SvPVutf8 (text_, textlen); 828 char *text = SvPVutf8 (text_, textlen);
737 829
738 pango_layout_set_text (self->pl, text, textlen); 830 pango_layout_set_text (self->pl, text, textlen);
739} 831}
740 832
741void 833void
742set_markup (CFClient::Layout self, SV *text_) 834set_markup (CFPlus::Layout self, SV *text_)
743 CODE: 835 CODE:
744{ 836{
745 STRLEN textlen; 837 STRLEN textlen;
746 char *text = SvPVutf8 (text_, textlen); 838 char *text = SvPVutf8 (text_, textlen);
747 839
748 pango_layout_set_markup (self->pl, text, textlen); 840 pango_layout_set_markup (self->pl, text, textlen);
749} 841}
750 842
843void
844set_shapes (CFPlus::Layout self, ...)
845 CODE:
846{
847 PangoAttrList *attrs = 0;
848 const char *text = pango_layout_get_text (self->pl);
849 const char *pos = text;
850 int arg = 4;
851
852 while (arg < items && (pos = strstr (pos, OBJ_STR)))
853 {
854 PangoRectangle inkrect, rect;
855 PangoAttribute *attr;
856
857 int x = SvIV (ST (arg - 3));
858 int y = SvIV (ST (arg - 2));
859 int w = SvIV (ST (arg - 1));
860 int h = SvIV (ST (arg ));
861
862 inkrect.x = 0;
863 inkrect.y = 0;
864 inkrect.width = 0;
865 inkrect.height = 0;
866
867 rect.x = x * PANGO_SCALE;
868 rect.y = y * PANGO_SCALE;
869 rect.width = w * PANGO_SCALE;
870 rect.height = h * PANGO_SCALE;
871
872 if (!attrs)
873 attrs = pango_layout_get_attributes (self->pl);
874
875 attr = pango_attr_shape_new (&inkrect, &rect);
876 attr->start_index = pos - text;
877 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
878 pango_attr_list_insert (attrs, attr);
879
880 arg += 4;
881 pos += sizeof (OBJ_STR) - 1;
882 }
883
884 if (attrs)
885 pango_layout_set_attributes (self->pl, attrs);
886}
887
888void
889get_shapes (CFPlus::Layout self)
890 PPCODE:
891{
892 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
893
894 do
895 {
896 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
897
898 if (run && shape_attr_p (run))
899 {
900 PangoRectangle extents;
901 pango_layout_iter_get_run_extents (iter, 0, &extents);
902
903 EXTEND (SP, 2);
904 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
905 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
906 }
907 }
908 while (pango_layout_iter_next_run (iter));
909
910 pango_layout_iter_free (iter);
911}
912
913int
914has_wrapped (CFPlus::Layout self)
915 CODE:
916{
917 int lines = 1;
918 const char *text = pango_layout_get_text (self->pl);
919
920 while (*text)
921 lines += *text++ == '\n';
922
923 RETVAL = lines < pango_layout_get_line_count (self->pl);
924}
925 OUTPUT:
926 RETVAL
927
751SV * 928SV *
752get_text (CFClient::Layout self) 929get_text (CFPlus::Layout self)
753 CODE: 930 CODE:
754 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 931 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755 SvUTF8_on (RETVAL); 932 sv_utf8_decode (RETVAL);
756 OUTPUT: 933 OUTPUT:
757 RETVAL 934 RETVAL
758 935
759void 936void
760set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 937set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
761 CODE: 938 CODE:
762 self->r = r; 939 self->r = r;
763 self->g = g; 940 self->g = g;
764 self->b = b; 941 self->b = b;
765 self->a = a; 942 self->a = a;
766 943
767void 944void
768set_font (CFClient::Layout self, CFClient::Font font = 0) 945set_font (CFPlus::Layout self, CFPlus::Font font = 0)
769 CODE: 946 CODE:
770 if (self->font != font) 947 if (self->font != font)
771 { 948 {
772 self->font = font; 949 self->font = font;
773 layout_update_font (self); 950 layout_update_font (self);
774 } 951 }
775 952
776void 953void
777set_height (CFClient::Layout self, int base_height) 954set_height (CFPlus::Layout self, int base_height)
778 CODE: 955 CODE:
779 if (self->base_height != base_height) 956 if (self->base_height != base_height)
780 { 957 {
781 self->base_height = base_height; 958 self->base_height = base_height;
782 layout_update_font (self); 959 layout_update_font (self);
783 } 960 }
784 961
785void 962void
786set_width (CFClient::Layout self, int max_width = -1) 963set_width (CFPlus::Layout self, int max_width = -1)
787 CODE: 964 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 965 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 966
790void 967void
968set_indent (CFPlus::Layout self, int indent)
969 CODE:
970 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
971
972void
973set_spacing (CFPlus::Layout self, int spacing)
974 CODE:
975 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
976
977void
978set_ellipsise (CFPlus::Layout self, int ellipsise)
979 CODE:
980 pango_layout_set_ellipsize (self->pl,
981 ellipsise == 1 ? PANGO_ELLIPSIZE_START
982 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
983 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
984 : PANGO_ELLIPSIZE_NONE
985 );
986
987void
988set_single_paragraph_mode (CFPlus::Layout self, int spm)
989 CODE:
990 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
991
992void
791size (CFClient::Layout self) 993size (CFPlus::Layout self)
792 PPCODE: 994 PPCODE:
793{ 995{
794 int w, h; 996 int w, h;
795 997
796 layout_get_pixel_size (self, &w, &h); 998 layout_get_pixel_size (self, &w, &h);
799 PUSHs (sv_2mortal (newSViv (w))); 1001 PUSHs (sv_2mortal (newSViv (w)));
800 PUSHs (sv_2mortal (newSViv (h))); 1002 PUSHs (sv_2mortal (newSViv (h)));
801} 1003}
802 1004
803int 1005int
1006descent (CFPlus::Layout self)
1007 CODE:
1008{
1009 PangoRectangle rect;
1010 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1011 pango_layout_line_get_pixel_extents (line, 0, &rect);
1012 RETVAL = PANGO_DESCENT (rect);
1013}
1014 OUTPUT:
1015 RETVAL
1016
1017int
804xy_to_index (CFClient::Layout self, int x, int y) 1018xy_to_index (CFPlus::Layout self, int x, int y)
805 CODE: 1019 CODE:
806{ 1020{
807 int index, trailing; 1021 int index, trailing;
808 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1022 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
809 RETVAL = index; 1023 RETVAL = index;
810} 1024}
811 OUTPUT: 1025 OUTPUT:
812 RETVAL 1026 RETVAL
813 1027
814void 1028void
815cursor_pos (CFClient::Layout self, int index) 1029cursor_pos (CFPlus::Layout self, int index)
816 PPCODE: 1030 PPCODE:
817{ 1031{
818 PangoRectangle strong_pos; 1032 PangoRectangle strong_pos;
819 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1033 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
820 1034
823 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1037 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
824 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
825} 1039}
826 1040
827void 1041void
828render (CFClient::Layout self) 1042render (CFPlus::Layout self, float x, float y, int flags = 0)
829 PPCODE: 1043 PPCODE:
830{ 1044 pango_opengl_render_layout_subpixel (
831 SV *retval; 1045 self->pl,
832 int w, h; 1046 x * PANGO_SCALE, y * PANGO_SCALE,
1047 self->r, self->g, self->b, self->a,
1048 flags
1049 );
833 1050
834 layout_get_pixel_size (self, &w, &h); 1051MODULE = CFPlus PACKAGE = CFPlus::Texture
835 1052
836 if (self->rgba) 1053void
1054pad2pot (SV *data_, SV *w_, SV *h_)
1055 CODE:
1056{
1057 int ow = SvIV (w_);
1058 int oh = SvIV (h_);
1059
1060 if (ow && oh)
837 { 1061 {
838 cairo_surface_t *surface; 1062 int nw = minpot (ow);
839 cairo_t *cairo; 1063 int nh = minpot (oh);
840 1064
841 retval = newSV (w * h * 4); 1065 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 { 1066 {
859 uint32_t *p = (uint32_t *)SvPVX (retval); 1067 if (SvOK (data_))
860 uint32_t *e = p + w * h;
861
862 while (p < e)
863 { 1068 {
864 uint32_t rgba = *p; 1069 STRLEN datalen;
865 rgba = (rgba >> 24) | (rgba << 8); 1070 char *data = SvPVbyte (data_, datalen);
866 rgba = SDL_SwapBE32 (rgba); 1071 int bpp = datalen / (ow * oh);
867 *p++ = rgba; 1072 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1073
1074 SvPOK_only (result_);
1075 SvCUR_set (result_, nw * nh * bpp);
1076
1077 memset (SvPVX (result_), 0, nw * nh * bpp);
1078 while (oh--)
1079 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1080
1081 sv_setsv (data_, result_);
868 } 1082 }
1083
1084 sv_setiv (w_, nw);
1085 sv_setiv (h_, nh);
869 } 1086 }
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 } 1087 }
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} 1088}
905 1089
906MODULE = CFClient PACKAGE = CFClient::Texture
907
908void 1090void
909draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1091draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
910 PROTOTYPE: $$$;$$ 1092 PROTOTYPE: $$$;$$
911 ALIAS: 1093 ALIAS:
912 draw_quad_alpha = 1 1094 draw_quad_alpha = 1
913 draw_quad_alpha_premultiplied = 2 1095 draw_quad_alpha_premultiplied = 2
914 CODE: 1096 CODE:
915{ 1097{
916 HV *hv = (HV *)SvRV (self); 1098 HV *hv = (HV *)SvRV (self);
917 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1099 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1100 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1101 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921 1102
922 if (items < 5) 1103 if (items < 5)
923 { 1104 {
924 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1105 w = SvNV (*hv_fetch (hv, "w", 1, 1));
925 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1106 h = SvNV (*hv_fetch (hv, "h", 1, 1));
926 } 1107 }
927 1108
928 if (ix) 1109 if (ix)
929 { 1110 {
930 glEnable (GL_BLEND); 1111 glEnable (GL_BLEND);
1112
1113 if (ix == 2)
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1114 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1115 else
1116 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1117 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1118
1119 glEnable (GL_ALPHA_TEST);
1120 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1121 }
933 1122
934 glBindTexture (GL_TEXTURE_2D, name); 1123 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 1124
942 glBegin (GL_QUADS); 1125 glBegin (GL_QUADS);
943 glTexCoord2f (0, 0); glVertex2f (x , y ); 1126 glTexCoord2f (0, 0); glVertex2f (x , y );
944 glTexCoord2f (0, t); glVertex2f (x , y + h); 1127 glTexCoord2f (0, t); glVertex2f (x , y + h);
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1128 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1129 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1130 glEnd ();
948 1131
949 if (ix) 1132 if (ix)
1133 {
1134 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1135 glDisable (GL_BLEND);
1136 }
951} 1137}
952 1138
953MODULE = CFClient PACKAGE = CFClient::Map 1139MODULE = CFPlus PACKAGE = CFPlus::Map
954 1140
955CFClient::Map 1141CFPlus::Map
956new (SV *class, int map_width, int map_height) 1142new (SV *class, int map_width, int map_height)
957 CODE: 1143 CODE:
958 New (0, RETVAL, 1, struct map); 1144 New (0, RETVAL, 1, struct map);
959 RETVAL->x = 0; 1145 RETVAL->x = 0;
960 RETVAL->y = 0; 1146 RETVAL->y = 0;
970 RETVAL->row = 0; 1156 RETVAL->row = 0;
971 OUTPUT: 1157 OUTPUT:
972 RETVAL 1158 RETVAL
973 1159
974void 1160void
975DESTROY (CFClient::Map self) 1161DESTROY (CFPlus::Map self)
976 CODE: 1162 CODE:
977{ 1163{
978 map_clear (self); 1164 map_clear (self);
979 Safefree (self->face); 1165 Safefree (self->face);
1166 Safefree (self->tex);
980 Safefree (self); 1167 Safefree (self);
981} 1168}
982 1169
983void 1170void
984clear (CFClient::Map self) 1171clear (CFPlus::Map self)
985 CODE: 1172 CODE:
986 map_clear (self); 1173 map_clear (self);
987 1174
988void 1175void
989set_face (CFClient::Map self, int face, int texid) 1176set_face (CFPlus::Map self, int face, int texid)
990 CODE: 1177 CODE:
991{ 1178{
992 while (self->faces <= face) 1179 while (self->faces <= face)
993 { 1180 {
994 Append (mapface, self->face, self->faces, self->faces); 1181 Append (mapface, self->face, self->faces, self->faces);
997 1184
998 self->face [face] = texid; 1185 self->face [face] = texid;
999} 1186}
1000 1187
1001void 1188void
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) 1189set_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: 1190 CODE:
1004{ 1191{
1005 while (self->texs <= texid) 1192 while (self->texs <= texid)
1006 { 1193 {
1007 Append (maptex, self->tex, self->texs, self->texs); 1194 Append (maptex, self->tex, self->texs, self->texs);
1019 tex->r = r; 1206 tex->r = r;
1020 tex->g = g; 1207 tex->g = g;
1021 tex->b = b; 1208 tex->b = b;
1022 tex->a = a; 1209 tex->a = a;
1023 } 1210 }
1211
1212 // somewhat hackish, but for textures that require it, it really
1213 // improves the look, and most others don't suffer.
1214 glBindTexture (GL_TEXTURE_2D, name);
1215 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1216 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1217 // use uglier nearest interpolation because linear suffers
1218 // from transparent color bleeding and ugly wrapping effects.
1219 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1024} 1220}
1025 1221
1026int 1222int
1027ox (CFClient::Map self) 1223ox (CFPlus::Map self)
1028 ALIAS: 1224 ALIAS:
1029 oy = 1 1225 oy = 1
1226 x = 2
1227 y = 3
1228 w = 4
1229 h = 5
1030 CODE: 1230 CODE:
1031 switch (ix) 1231 switch (ix)
1032 { 1232 {
1033 case 0: RETVAL = self->ox; break; 1233 case 0: RETVAL = self->ox; break;
1034 case 1: RETVAL = self->oy; break; 1234 case 1: RETVAL = self->oy; break;
1235 case 2: RETVAL = self->x; break;
1236 case 3: RETVAL = self->y; break;
1237 case 4: RETVAL = self->w; break;
1238 case 5: RETVAL = self->h; break;
1035 } 1239 }
1036 OUTPUT: 1240 OUTPUT:
1037 RETVAL 1241 RETVAL
1038 1242
1039void 1243void
1040scroll (CFClient::Map self, int dx, int dy) 1244scroll (CFPlus::Map self, int dx, int dy)
1041 CODE: 1245 CODE:
1042{ 1246{
1043 if (dx > 0) 1247 if (dx > 0)
1044 map_blank (self, self->x, self->y, dx - 1, self->h); 1248 map_blank (self, self->x, self->y, dx - 1, self->h);
1045 else if (dx < 0) 1249 else if (dx < 0)
1061 self->y += MAP_EXTEND_Y; 1265 self->y += MAP_EXTEND_Y;
1062 } 1266 }
1063} 1267}
1064 1268
1065void 1269void
1066map1a_update (CFClient::Map self, SV *data_) 1270map1a_update (CFPlus::Map self, SV *data_, int extmap)
1067 CODE: 1271 CODE:
1068{ 1272{
1069 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1070 uint8_t *data_end = (uint8_t *)SvEND (data_); 1274 uint8_t *data_end = (uint8_t *)SvEND (data_);
1071 mapcell *cell; 1275 mapcell *cell;
1073 1277
1074 while (data < data_end) 1278 while (data < data_end)
1075 { 1279 {
1076 flags = (data [0] << 8) + data [1]; data += 2; 1280 flags = (data [0] << 8) + data [1]; data += 2;
1077 1281
1078 x = ((flags >> 10) & 63) + self->x; 1282 x = self->x + ((flags >> 10) & 63);
1079 y = ((flags >> 4) & 63) + self->y; 1283 y = self->y + ((flags >> 4) & 63);
1080 1284
1081 cell = map_get_cell (self, x, y); 1285 cell = map_get_cell (self, x, y);
1082 1286
1083 if (flags & 15) 1287 if (flags & 15)
1084 { 1288 {
1085 if (cell->darkness < 0) 1289 if (!cell->darkness)
1086 { 1290 {
1087 cell->darkness = 0; 1291 cell->darkness = 256;
1088 cell->face [0] = 0; 1292 cell->face [0] = 0;
1089 cell->face [1] = 0; 1293 cell->face [1] = 0;
1090 cell->face [2] = 0; 1294 cell->face [2] = 0;
1091 } 1295 }
1092 1296
1093 cell->darkness = flags & 8 ? *data++ : 255;
1094
1095 //TODO: don't trust server data to be in-range(!) 1297 //TODO: don't trust server data to be in-range(!)
1298
1299 if (flags & 8)
1300 {
1301 if (extmap)
1302 {
1303 uint8_t ext, cmd;
1304
1305 do
1306 {
1307 ext = *data++;
1308 cmd = ext & 0x3f;
1309
1310 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1;
1312 else if (cmd == 5) // health
1313 {
1314 cell->stat_width = 1;
1315 cell->stat_hp = *data++;
1316 }
1317 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1;
1319 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1;
1321 else
1322 data++;
1323 }
1324 while (ext & 0x80);
1325 }
1326 else
1327 cell->darkness = *data++ + 1;
1328 }
1096 1329
1097 if (flags & 4) 1330 if (flags & 4)
1098 { 1331 {
1099 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1100 } 1333 }
1108 { 1341 {
1109 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1342 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1110 } 1343 }
1111 } 1344 }
1112 else 1345 else
1346 {
1113 cell->darkness = -1; 1347 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1114 } 1350 }
1115} 1351}
1116 1352
1117SV * 1353SV *
1118mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1119 CODE: 1355 CODE:
1120{ 1356{
1121 int x1, x; 1357 int x1, x;
1122 int y1, y; 1358 int y1, y;
1123 int z; 1359 int z;
1173} 1409}
1174 OUTPUT: 1410 OUTPUT:
1175 RETVAL 1411 RETVAL
1176 1412
1177void 1413void
1178draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1414draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1179 PPCODE: 1415 CODE:
1180{ 1416{
1181 int vx, vy; 1417 int vx, vy;
1182 int x, y, z; 1418 int x, y, z;
1183 int last_name; 1419 int last_name;
1184 mapface face; 1420 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 1421
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; 1422 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1194 vy = self->y + (self->h - sh) / 2 - shift_y; 1423 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1195 1424
1196 /* 1425 /*
1197 int vx = self->vx = self->w >= sw 1426 int vx = self->vx = self->w >= sw
1198 ? self->x + (self->w - sw) / 2 1427 ? self->x + (self->w - sw) / 2
1199 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1428 : 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)); 1432 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1204 */ 1433 */
1205 1434
1206 glColor4ub (255, 255, 255, 255); 1435 glColor4ub (255, 255, 255, 255);
1207 1436
1437 glEnable (GL_BLEND);
1208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1438 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1209 glEnable (GL_BLEND);
1210 glEnable (GL_TEXTURE_2D); 1439 glEnable (GL_TEXTURE_2D);
1211 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1440 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1212 1441
1213 glBegin (GL_QUADS); 1442 glBegin (GL_QUADS);
1214 1443
1223 for (x = 0; x < sw; x++) 1452 for (x = 0; x < sw; x++)
1224 if (row->c0 <= x + vx && x + vx < row->c1) 1453 if (row->c0 <= x + vx && x + vx < row->c1)
1225 { 1454 {
1226 mapcell *cell = row->col + (x + vx - row->c0); 1455 mapcell *cell = row->col + (x + vx - row->c0);
1227 1456
1228 darkness[y * sw4 + x] = cell->darkness < 0
1229 ? 255 - FOW_DARKNESS
1230 : 255 - cell->darkness;
1231
1232 face = cell->face [z]; 1457 face = cell->face [z];
1233 1458
1234 if (face) 1459 if (face && face < self->texs)
1235 { 1460 {
1236 maptex tex = self->tex [face]; 1461 maptex tex = self->tex [face];
1237 1462
1238 int px = (x + 1) * 32 - tex.w; 1463 int px = (x + 1) * 32 - tex.w;
1239 int py = (y + 1) * 32 - tex.h; 1464 int py = (y + 1) * 32 - tex.h;
1255 } 1480 }
1256 1481
1257 glEnd (); 1482 glEnd ();
1258 1483
1259 glDisable (GL_TEXTURE_2D); 1484 glDisable (GL_TEXTURE_2D);
1485
1486 // top layer: overlays such as the health bar
1487 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows)
1489 {
1490 maprow *row = self->row + (y + vy);
1491
1492 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1)
1494 {
1495 mapcell *cell = row->col + (x + vx - row->c0);
1496
1497 int px = x * 32;
1498 int py = y * 32;
1499
1500 if (cell->stat_hp)
1501 {
1502 int width = cell->stat_width * 32;
1503 int thick = sh / 28 + 1 + cell->stat_width;
1504
1505 glColor4ub (0, 0, 0, 128);
1506 glRectf (px + 1, py,
1507 px + width - 1, py + thick + 2);
1508
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 192);
1510 glRectf (px + 2,
1511 py + 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
1513 }
1514 }
1515 }
1516
1260 glDisable (GL_BLEND); 1517 glDisable (GL_BLEND);
1518}
1519
1520void
1521draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1522 CODE:
1523{
1524 static float color[16][3] = {
1525 { 0.00F, 0.00F, 0.00F },
1526 { 1.00F, 1.00F, 1.00F },
1527 { 0.00F, 0.00F, 0.55F },
1528 { 1.00F, 0.00F, 0.00F },
1529
1530 { 1.00F, 0.54F, 0.00F },
1531 { 0.11F, 0.56F, 1.00F },
1532 { 0.93F, 0.46F, 0.00F },
1533 { 0.18F, 0.54F, 0.34F },
1534
1535 { 0.56F, 0.73F, 0.56F },
1536 { 0.80F, 0.80F, 0.80F },
1537 { 0.55F, 0.41F, 0.13F },
1538 { 0.99F, 0.77F, 0.26F },
1539
1540 { 0.74F, 0.65F, 0.41F },
1541
1542 { 0.00F, 1.00F, 1.00F },
1543 { 1.00F, 0.00F, 1.00F },
1544 { 1.00F, 1.00F, 0.00F },
1545 };
1546
1547 int x, y;
1548
1549 glEnable (GL_TEXTURE_2D);
1550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1551 glEnable (GL_BLEND);
1552 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1553 glBegin (GL_QUADS);
1554
1555 for (y = 0; y < h; y++)
1556 for (x = 0; x < w; x++)
1557 {
1558 unsigned char m = data [x + y * w];
1559
1560 if (m)
1561 {
1562 float *c = color [m & 15];
1563
1564 float tx1 = m & 0x40 ? 0.5 : 0.;
1565 float tx2 = tx1 + 0.5;
1566
1567 glColor4f (c[0], c[1], c[2], 0.75);
1568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1571 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1572 }
1573 }
1574
1575 glEnd ();
1576 glDisable (GL_BLEND);
1577 glDisable (GL_TEXTURE_2D);
1578}
1579
1580void
1581fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1582 PPCODE:
1583{
1584 int vx, vy;
1585 int x, y;
1586 int sw4 = (sw + 3) & ~3;
1587 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1588 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1589
1590 memset (darkness, 255, sw4 * sh);
1591 SvPOK_only (darkness_sv);
1592 SvCUR_set (darkness_sv, sw4 * sh);
1593
1594 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1595 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1596
1597 for (y = 0; y < sh; y++)
1598 if (0 <= y + vy && y + vy < self->rows)
1599 {
1600 maprow *row = self->row + (y + vy);
1601
1602 for (x = 0; x < sw; x++)
1603 if (row->c0 <= x + vx && x + vx < row->c1)
1604 {
1605 mapcell *cell = row->col + (x + vx - row->c0);
1606
1607 darkness[y * sw4 + x] = cell->darkness
1608 ? 255 - (cell->darkness - 1)
1609 : 255 - FOW_DARKNESS;
1610 }
1611 }
1261 1612
1262 EXTEND (SP, 3); 1613 EXTEND (SP, 3);
1263 PUSHs (sv_2mortal (newSViv (sw4))); 1614 PUSHs (sv_2mortal (newSViv (sw4)));
1264 PUSHs (sv_2mortal (newSViv (sh))); 1615 PUSHs (sv_2mortal (newSViv (sh)));
1265 PUSHs (darkness_sv); 1616 PUSHs (darkness_sv);
1266} 1617}
1267 1618
1268SV * 1619SV *
1269get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1620get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1270 CODE: 1621 CODE:
1271{ 1622{
1272 int x, y, x1, y1; 1623 int x, y, x1, y1;
1273 SV *data_sv = newSV (w * h * 7 + 5); 1624 SV *data_sv = newSV (w * h * 7 + 5);
1274 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1625 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1336} 1687}
1337 OUTPUT: 1688 OUTPUT:
1338 RETVAL 1689 RETVAL
1339 1690
1340void 1691void
1341set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1692set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1342 PPCODE: 1693 PPCODE:
1343{ 1694{
1344 int x, y, z; 1695 int x, y, z;
1345 int w, h; 1696 int w, h;
1346 int x1, y1; 1697 int x1, y1;
1378 1729
1379 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1730 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1380 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1731 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1381 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1732 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1382 1733
1383 if (cell->darkness <= 0) 1734 if (cell->darkness == 0)
1384 { 1735 {
1385 cell->darkness = -1; 1736 cell->darkness = 0;
1386 1737
1387 for (z = 0; z <= 2; z++) 1738 for (z = 0; z <= 2; z++)
1388 { 1739 {
1389 cell->face[z] = face[z]; 1740 cell->face[z] = face[z];
1390 1741
1395 } 1746 }
1396 } 1747 }
1397 } 1748 }
1398} 1749}
1399 1750
1400MODULE = CFClient PACKAGE = CFClient::MixChunk 1751MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1401 1752
1402CFClient::MixChunk 1753CFPlus::MixChunk
1403new_from_file (SV *class, char *path) 1754new_from_file (SV *class, char *path)
1404 CODE: 1755 CODE:
1405 RETVAL = Mix_LoadWAV (path); 1756 RETVAL = Mix_LoadWAV (path);
1406 OUTPUT: 1757 OUTPUT:
1407 RETVAL 1758 RETVAL
1408 1759
1409void 1760void
1410DESTROY (CFClient::MixChunk self) 1761DESTROY (CFPlus::MixChunk self)
1411 CODE: 1762 CODE:
1412 Mix_FreeChunk (self); 1763 Mix_FreeChunk (self);
1413 1764
1414int 1765int
1415volume (CFClient::MixChunk self, int volume = -1) 1766volume (CFPlus::MixChunk self, int volume = -1)
1416 CODE: 1767 CODE:
1417 RETVAL = Mix_VolumeChunk (self, volume); 1768 RETVAL = Mix_VolumeChunk (self, volume);
1418 OUTPUT: 1769 OUTPUT:
1419 RETVAL 1770 RETVAL
1420 1771
1421int 1772int
1422play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1773play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1423 CODE: 1774 CODE:
1424 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1775 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1425 OUTPUT: 1776 OUTPUT:
1426 RETVAL 1777 RETVAL
1427 1778
1428MODULE = CFClient PACKAGE = CFClient::MixMusic 1779MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1429 1780
1430int 1781int
1431volume (int volume = -1) 1782volume (int volume = -1)
1432 CODE: 1783 CODE:
1433 RETVAL = Mix_VolumeMusic (volume); 1784 RETVAL = Mix_VolumeMusic (volume);
1434 OUTPUT: 1785 OUTPUT:
1435 RETVAL 1786 RETVAL
1436 1787
1437CFClient::MixMusic 1788CFPlus::MixMusic
1438new_from_file (SV *class, char *path) 1789new_from_file (SV *class, char *path)
1439 CODE: 1790 CODE:
1440 RETVAL = Mix_LoadMUS (path); 1791 RETVAL = Mix_LoadMUS (path);
1441 OUTPUT: 1792 OUTPUT:
1442 RETVAL 1793 RETVAL
1443 1794
1444void 1795void
1445DESTROY (CFClient::MixMusic self) 1796DESTROY (CFPlus::MixMusic self)
1446 CODE: 1797 CODE:
1447 Mix_FreeMusic (self); 1798 Mix_FreeMusic (self);
1448 1799
1449int 1800int
1450play (CFClient::MixMusic self, int loops = -1) 1801play (CFPlus::MixMusic self, int loops = -1)
1451 CODE: 1802 CODE:
1452 RETVAL = Mix_PlayMusic (self, loops); 1803 RETVAL = Mix_PlayMusic (self, loops);
1453 OUTPUT: 1804 OUTPUT:
1454 RETVAL 1805 RETVAL
1455 1806
1456MODULE = CFClient PACKAGE = CFClient::OpenGL 1807MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1457 1808
1458BOOT: 1809BOOT:
1459{ 1810{
1460 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1811 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1461 static const struct { 1812 static const struct {
1462 const char *name; 1813 const char *name;
1463 IV iv; 1814 IV iv;
1464 } *civ, const_iv[] = { 1815 } *civ, const_iv[] = {
1465# define const_iv(name) { # name, (IV)name } 1816# define const_iv(name) { # name, (IV)name }
1466 const_iv (GL_COLOR_MATERIAL), 1817 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1818 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1819 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1820 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1821 const_iv (GL_BLEND),
1822 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1823 const_iv (GL_SCISSOR_TEST),
1824 const_iv (GL_DEPTH_TEST),
1825 const_iv (GL_ALPHA_TEST),
1826 const_iv (GL_NORMALIZE),
1827 const_iv (GL_RESCALE_NORMAL),
1828 const_iv (GL_FRONT),
1829 const_iv (GL_BACK),
1472 const_iv (GL_AND), 1830 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1831 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1832 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1833 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1834 const_iv (GL_DST_ALPHA),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1835 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1836 const_iv (GL_ONE_MINUS_DST_ALPHA),
1837 const_iv (GL_SRC_ALPHA_SATURATE),
1479 const_iv (GL_RGB), 1838 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1839 const_iv (GL_RGBA),
1840 const_iv (GL_RGBA4),
1841 const_iv (GL_RGBA8),
1842 const_iv (GL_RGB5_A1),
1481 const_iv (GL_UNSIGNED_BYTE), 1843 const_iv (GL_UNSIGNED_BYTE),
1844 const_iv (GL_UNSIGNED_SHORT),
1845 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1846 const_iv (GL_ALPHA),
1847 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1848 const_iv (GL_LUMINANCE),
1849 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1850 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1851 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1852 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1853 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1854 const_iv (GL_TEXTURE_2D),
1490 const_iv (GL_TEXTURE_MAG_FILTER), 1856 const_iv (GL_TEXTURE_MAG_FILTER),
1491 const_iv (GL_TEXTURE_MIN_FILTER), 1857 const_iv (GL_TEXTURE_MIN_FILTER),
1492 const_iv (GL_TEXTURE_ENV_MODE), 1858 const_iv (GL_TEXTURE_ENV_MODE),
1493 const_iv (GL_TEXTURE_WRAP_S), 1859 const_iv (GL_TEXTURE_WRAP_S),
1494 const_iv (GL_TEXTURE_WRAP_T), 1860 const_iv (GL_TEXTURE_WRAP_T),
1861 const_iv (GL_REPEAT),
1495 const_iv (GL_CLAMP), 1862 const_iv (GL_CLAMP),
1496 const_iv (GL_REPEAT), 1863 const_iv (GL_CLAMP_TO_EDGE),
1497 const_iv (GL_NEAREST), 1864 const_iv (GL_NEAREST),
1498 const_iv (GL_LINEAR), 1865 const_iv (GL_LINEAR),
1499 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1866 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1867 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1868 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1869 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1870 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1871 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1872 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1873 const_iv (GL_REPLACE),
1874 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1875 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1876 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1877 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1878 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1879 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1880 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1881 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1882 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1883 const_iv (GL_LINES),
1884 const_iv (GL_LINE_STRIP),
1885 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1886 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1887 const_iv (GL_QUAD_STRIP),
1888 const_iv (GL_TRIANGLES),
1889 const_iv (GL_TRIANGLE_STRIP),
1890 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1891 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1892 const_iv (GL_FASTEST),
1893 const_iv (GL_V2F),
1894 const_iv (GL_V3F),
1895 const_iv (GL_T2F_V3F),
1896 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1897# undef const_iv
1521 }; 1898 };
1522 1899
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1900 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1901 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525} 1902}
1526 1903
1904char *
1905gl_vendor ()
1906 CODE:
1907 RETVAL = (char *)glGetString (GL_VENDOR);
1908 OUTPUT:
1909 RETVAL
1910
1911char *
1912gl_version ()
1913 CODE:
1914 RETVAL = (char *)glGetString (GL_VERSION);
1915 OUTPUT:
1916 RETVAL
1917
1918char *
1919gl_extensions ()
1920 CODE:
1921 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1922 OUTPUT:
1923 RETVAL
1924
1527int glGetError () 1925int glGetError ()
1926
1927void glFinish ()
1528 1928
1529void glClear (int mask) 1929void glClear (int mask)
1530 1930
1531void glClearColor (float r, float g, float b, float a = 1.0) 1931void glClearColor (float r, float g, float b, float a = 1.0)
1532 PROTOTYPE: @ 1932 PROTOTYPE: @
1539 1939
1540void glHint (int target, int mode) 1940void glHint (int target, int mode)
1541 1941
1542void glBlendFunc (int sfactor, int dfactor) 1942void glBlendFunc (int sfactor, int dfactor)
1543 1943
1944void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1945 CODE:
1946 gl_BlendFuncSeparate (sa, da, saa, daa);
1947
1948void glDepthMask (int flag)
1949
1544void glLogicOp (int opcode) 1950void glLogicOp (int opcode)
1545 1951
1546void glColorMask (int red, int green, int blue, int alpha) 1952void glColorMask (int red, int green, int blue, int alpha)
1547 1953
1548void glMatrixMode (int mode) 1954void glMatrixMode (int mode)
1551 1957
1552void glPopMatrix () 1958void glPopMatrix ()
1553 1959
1554void glLoadIdentity () 1960void glLoadIdentity ()
1555 1961
1962void glDrawBuffer (int buffer)
1963
1964void glReadBuffer (int buffer)
1965
1556# near and far are due to microsofts buggy c compiler 1966# near_ and far_ are due to microsofts buggy "c" compiler
1967void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1968
1969# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1970void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1971
1559void glViewport (int x, int y, int width, int height) 1972void glViewport (int x, int y, int width, int height)
1560 1973
1561void glScissor (int x, int y, int width, int height) 1974void glScissor (int x, int y, int width, int height)
1576 1989
1577void glEnd () 1990void glEnd ()
1578 1991
1579void glColor (float r, float g, float b, float a = 1.0) 1992void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1993 PROTOTYPE: @
1994 ALIAS:
1995 glColor_premultiply = 1
1581 CODE: 1996 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1997 if (ix)
1998 {
1999 r *= a;
2000 g *= a;
2001 b *= a;
2002 }
2003 // microsoft visual "c" rounds instead of truncating...
2004 glColor4f (r, g, b, a);
2005
2006void glInterleavedArrays (int format, int stride, char *data)
2007
2008void glDrawElements (int mode, int count, int type, char *indices)
2009
2010# 1.2 void glDrawRangeElements (int mode, int start, int end
2011
2012void glRasterPos (float x, float y, float z = 0.)
2013 CODE:
2014 glRasterPos3f (0, 0, z);
2015 glBitmap (0, 0, 0, 0, x, y, 0);
1583 2016
1584void glVertex (float x, float y, float z = 0.) 2017void glVertex (float x, float y, float z = 0.)
1585 CODE: 2018 CODE:
1586 glVertex3f (x, y, z); 2019 glVertex3f (x, y, z);
1587 2020
1599 2032
1600void glBindTexture (int target, int name) 2033void glBindTexture (int target, int name)
1601 2034
1602void glConvolutionParameter (int target, int pname, float params) 2035void glConvolutionParameter (int target, int pname, float params)
1603 CODE: 2036 CODE:
1604 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2037 if (gl.ConvolutionParameterf)
2038 gl.ConvolutionParameterf (target, pname, params);
1605 2039
1606void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2040void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1607 CODE: 2041 CODE:
1608 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2042 if (gl.ConvolutionFilter2D)
1609 (target, internalformat, width, height, format, type, data)); 2043 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610 2044
1611void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2045void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1612 CODE: 2046 CODE:
1613 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2047 if (gl.SeparableFilter2D)
1614 (target, internalformat, width, height, format, type, row, column)); 2048 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615 2049
1616void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2050void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617 2051
1618void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2052void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619 2053
1620void glRasterPos (int x, int y) 2054void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 2055
1624void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2056void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625 2057
1626int glGenTexture () 2058int glGenTexture ()
1627 CODE: 2059 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines