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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines