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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines