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.56 by root, Thu Apr 20 09:13:31 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
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
51
38#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
39 53
40#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
41#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
42 56
57#define MIN_FONT_HEIGHT 10
58
59#if 0
60# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else
62# define PARACHUTE 0
63#endif
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
43typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
44typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
45 90
46static PangoContext *context; 91typedef PangoFontDescription *CFPlus__Font;
47static PangoFontMap *fontmap; 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}
48 110
49typedef struct cf_layout { 111typedef struct cf_layout {
50 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
51 int base_height; 114 int base_height;
115 CFPlus__Font font;
52} *CFClient__Layout; 116} *CFPlus__Layout;
117
118static CFPlus__Font default_font;
119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap;
53 121
54static void 122static void
55substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
56{ 124{
57 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
58 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59} 130}
60 131
61static void 132static void
62layout_update (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
63{ 134{
64 /* 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
65 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
66 */ 137 */
67 PangoFontDescription *font = pango_context_get_font_description (context); 138 PangoFontDescription *font = self->font ? self->font : default_font;
68 139
69 int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71 if (pango_font_description_get_size (font) != height)
72 {
73 pango_font_description_set_absolute_size (font, height); 140 pango_font_description_set_absolute_size (font,
74 pango_layout_context_changed (self->pl); 141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75 } 142
143 pango_layout_set_font_description (self->pl, font);
76} 144}
77 145
78static void 146static void
79layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80{ 148{
81 layout_update (self); 149 PangoRectangle rect;
82 150
151 // get_pixel_* wrongly rounds down
83 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
84 153
85 *w = (*w + 3) & ~3; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86 if (!*w) *w = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87 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;
88} 162}
89 163
90typedef uint16_t mapface; 164typedef uint16_t mapface;
91 165
92typedef struct { 166typedef struct {
95 float s, t; 169 float s, t;
96 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
97} maptex; 171} maptex;
98 172
99typedef struct { 173typedef struct {
100 int16_t darkness; 174 uint32_t player;
101 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
102} mapcell; 178} mapcell;
103 179
104typedef struct { 180typedef struct {
105 int32_t c0, c1; 181 int32_t c0, c1;
106 mapcell *col; 182 mapcell *col;
115 int texs; 191 int texs;
116 maptex *tex; 192 maptex *tex;
117 193
118 int32_t rows; 194 int32_t rows;
119 maprow *row; 195 maprow *row;
120} *CFClient__Map; 196} *CFPlus__Map;
121 197
122static char * 198static char *
123prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
124{ 200{
125 char *p; 201 char *p;
143 219
144#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))
145#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))
146 222
147static maprow * 223static maprow *
148map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
149{ 225{
150 if (0 > y) 226 if (0 > y)
151 { 227 {
152 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
153 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
191 267
192 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
193} 269}
194 270
195static mapcell * 271static mapcell *
196map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
197{ 273{
198 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
199} 275}
200 276
201static void 277static void
202map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
203{ 279{
204 int r; 280 int r;
205 281
206 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
207 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
215 self->row = 0; 291 self->row = 0;
216 self->rows = 0; 292 self->rows = 0;
217} 293}
218 294
219static void 295static void
220map_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)
221{ 297{
222 int x, y; 298 int x, y;
223 maprow *row; 299 maprow *row;
300 mapcell *cell;
224 301
225 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
226 if (y >= 0) 303 if (y >= 0)
227 { 304 {
228 if (y >= self->rows) 305 if (y >= self->rows)
234 if (x >= row->c0) 311 if (x >= row->c0)
235 { 312 {
236 if (x >= row->c1) 313 if (x >= row->c1)
237 break; 314 break;
238 315
239 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;
240 } 322 }
241 } 323 }
242} 324}
243 325
244static void 326static void
245music_finished () 327music_finished (void)
246{ 328{
247 SDL_UserEvent ev; 329 SDL_UserEvent ev;
248 330
249 ev.type = SDL_USEREVENT; 331 ev.type = SDL_USEREVENT;
250 ev.code = 0; 332 ev.code = 0;
251 ev.data1 = 0; 333 ev.data1 = 0;
252 ev.data2 = 0; 334 ev.data2 = 0;
253 335
336 SDL_PushEvent ((SDL_Event *)&ev);
337}
338
339static void
340channel_finished (int channel)
341{
254 SDL_PushEvent (&ev); 342 SDL_UserEvent ev;
255}
256 343
344 ev.type = SDL_USEREVENT;
345 ev.code = 1;
346 ev.data1 = (void *)(long)channel;
347 ev.data2 = 0;
348
349 SDL_PushEvent ((SDL_Event *)&ev);
350}
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
257MODULE = CFClient PACKAGE = CFClient 369MODULE = CFPlus PACKAGE = CFPlus
258 370
259PROTOTYPES: ENABLE 371PROTOTYPES: ENABLE
260 372
261BOOT: 373BOOT:
262{ 374{
263 HV *stash = gv_stashpv ("CFClient", 1); 375 HV *stash = gv_stashpv ("CFPlus", 1);
264 static const struct { 376 static const struct {
265 const char *name; 377 const char *name;
266 IV iv; 378 IV iv;
267 } *civ, const_iv[] = { 379 } *civ, const_iv[] = {
268# define const_iv(name) { # name, (IV)name } 380# define const_iv(name) { # name, (IV)name }
367# undef const_iv 479# undef const_iv
368 }; 480 };
369 481
370 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; )
371 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
372
373 fontmap = pango_ft2_font_map_new ();
374 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
375 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
376} 484}
377 485
378int 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
379SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 507SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
380 508
381void 509void
382SDL_Quit () 510SDL_Quit ()
383 511
384void 512void
390 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 518 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
391 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 519 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
392 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 520 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
393 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 521 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
394 522
523 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
524 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
525
395 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
396 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
397 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 528 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
399 530
400 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 531 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
532#if SDL_VERSION_ATLEAST(1,2,10)
401 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 533 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
402 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 534 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
535#endif
403 536
404 SDL_EnableUNICODE (1); 537 SDL_EnableUNICODE (1);
405 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 538 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
406 539
407 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 540 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
416 549
417 ++m; 550 ++m;
418 } 551 }
419} 552}
420 553
554char *
555SDL_GetError ()
556
421int 557int
422SDL_SetVideoMode (int w, int h, int fullscreen) 558SDL_SetVideoMode (int w, int h, int fullscreen)
423 CODE: 559 CODE:
424 RETVAL = !!SDL_SetVideoMode ( 560 RETVAL = !!SDL_SetVideoMode (
425 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 561 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
426 ); 562 );
563 if (RETVAL)
564 {
427 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 }
428 OUTPUT: 570 OUTPUT:
429 RETVAL 571 RETVAL
430 572
431void 573void
432SDL_GL_SwapBuffers () 574SDL_GL_SwapBuffers ()
575
576char *
577SDL_GetKeyName (int sym)
433 578
434void 579void
435SDL_PollEvent () 580SDL_PollEvent ()
436 PPCODE: 581 PPCODE:
437{ 582{
439 584
440 while (SDL_PollEvent (&ev)) 585 while (SDL_PollEvent (&ev))
441 { 586 {
442 HV *hv = newHV (); 587 HV *hv = newHV ();
443 hv_store (hv, "type", 4, newSViv (ev.type), 0); 588 hv_store (hv, "type", 4, newSViv (ev.type), 0);
589
444 switch (ev.type) 590 switch (ev.type)
445 { 591 {
446 case SDL_KEYDOWN: 592 case SDL_KEYDOWN:
447 case SDL_KEYUP: 593 case SDL_KEYUP:
448 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
455 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
456 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 602 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
457 break; 603 break;
458 604
459 case SDL_MOUSEMOTION: 605 case SDL_MOUSEMOTION:
606 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
460 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 608 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
461 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 609 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
462 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 610 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
463 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 611 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
464 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 612 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
465 break; 613 break;
466 614
467 case SDL_MOUSEBUTTONDOWN: 615 case SDL_MOUSEBUTTONDOWN:
468 case SDL_MOUSEBUTTONUP: 616 case SDL_MOUSEBUTTONUP:
617 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
618
469 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 619 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
470 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 620 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
471 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 621 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
472 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 622 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
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;
473 } 630 }
474 631
475 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 632 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
476 } 633 }
477} 634}
478 635
479int 636int
480Mix_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)
481 POSTCALL: 638 POSTCALL:
482 Mix_HookMusicFinished (music_finished); 639 Mix_HookMusicFinished (music_finished);
640 Mix_ChannelFinished (channel_finished);
483 641
484void 642void
485Mix_CloseAudio () 643Mix_CloseAudio ()
486 644
487int 645int
492 CODE: 650 CODE:
493#ifndef _WIN32 651#ifndef _WIN32
494 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
495#endif 653#endif
496 654
497char *
498gl_version ()
499 CODE:
500 RETVAL = (char *)glGetString (GL_VERSION);
501 OUTPUT:
502 RETVAL
503
504char *
505gl_extensions ()
506 CODE:
507 RETVAL = (char *)glGetString (GL_EXTENSIONS);
508 OUTPUT:
509 RETVAL
510
511void 655void
512add_font (char *file) 656add_font (char *file)
513 CODE: 657 CODE:
514 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 658 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
515
516void
517set_font (char *file)
518 CODE:
519{
520 int count;
521 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
522 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
523 FcPatternDestroy (pattern);
524 pango_context_set_font_description (context, font);
525}
526 659
527void 660void
528load_image_inline (SV *image_) 661load_image_inline (SV *image_)
529 ALIAS: 662 ALIAS:
530 load_image_file = 1 663 load_image_file = 1
572 705
573 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 706 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
574 707
575 assert (surface2->pitch == surface2->w * 4); 708 assert (surface2->pitch == surface2->w * 4);
576 709
710 SDL_LockSurface (surface2);
577 EXTEND (SP, 5); 711 EXTEND (SP, 6);
578 PUSHs (sv_2mortal (newSViv (surface2->w))); 712 PUSHs (sv_2mortal (newSViv (surface2->w)));
579 PUSHs (sv_2mortal (newSViv (surface2->h))); 713 PUSHs (sv_2mortal (newSViv (surface2->h)));
580 SDL_LockSurface (surface2);
581 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 714 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
582 SDL_UnlockSurface (surface2);
583 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)));
584 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 716 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
585 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 717 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
718 SDL_UnlockSurface (surface2);
586 719
587 SDL_FreeSurface (surface); 720 SDL_FreeSurface (surface);
588 SDL_FreeSurface (surface2); 721 SDL_FreeSurface (surface2);
589} 722}
590 723
612 PUSHs (sv_2mortal (newSViv (b / y))); 745 PUSHs (sv_2mortal (newSViv (b / y)));
613 PUSHs (sv_2mortal (newSViv (a / y))); 746 PUSHs (sv_2mortal (newSViv (a / y)));
614} 747}
615 748
616void 749void
750error (char *message)
751 CODE:
752 fprintf (stderr, "ERROR: %s\n", message);
753#ifdef _WIN32
754 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
755#endif
756
757void
617fatal (char *message) 758fatal (char *message)
618 CODE: 759 CODE:
760 fprintf (stderr, "FATAL: %s\n", message);
619#ifdef _WIN32 761#ifdef _WIN32
620 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
621#else
622 fprintf (stderr, "FATAL: %s\n", message);
623#endif 763#endif
624 exit (1); 764 _exit (1);
625 765
766void
767_exit (int retval)
768 CODE:
769 _exit (retval);
770
771MODULE = CFPlus PACKAGE = CFPlus::Font
772
773CFPlus::Font
774new_from_file (SV *class, char *path, int id = 0)
775 CODE:
776{
777 int count;
778 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
779 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
780 FcPatternDestroy (pattern);
781}
782 OUTPUT:
783 RETVAL
784
785void
786DESTROY (CFPlus::Font self)
787 CODE:
788 pango_font_description_free (self);
789
790void
791make_default (CFPlus::Font self)
792 CODE:
793 default_font = self;
794
626MODULE = CFClient PACKAGE = CFClient::Layout 795MODULE = CFPlus PACKAGE = CFPlus::Layout
627 796
628CFClient::Layout 797void
629new (SV *class, int base_height = 10) 798reset_glyph_cache ()
799 CODE:
800 tc_clear ();
801
802CFPlus::Layout
803new (SV *class)
630 CODE: 804 CODE:
631 New (0, RETVAL, 1, struct cf_layout); 805 New (0, RETVAL, 1, struct cf_layout);
632 RETVAL->base_height = base_height; 806
633 RETVAL->pl = pango_layout_new (context); 807 RETVAL->pl = pango_layout_new (opengl_context);
808 RETVAL->r = 1.;
809 RETVAL->g = 1.;
810 RETVAL->b = 1.;
811 RETVAL->a = 1.;
812 RETVAL->base_height = MIN_FONT_HEIGHT;
813 RETVAL->font = 0;
814
634 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 815 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
816 layout_update_font (RETVAL);
635 OUTPUT: 817 OUTPUT:
636 RETVAL 818 RETVAL
637 819
638void 820void
639DESTROY (CFClient::Layout self) 821DESTROY (CFPlus::Layout self)
640 CODE: 822 CODE:
641 g_object_unref (self->pl); 823 g_object_unref (self->pl);
642 Safefree (self); 824 Safefree (self);
643 825
644void 826void
645set_text (CFClient::Layout self, SV *text_) 827set_text (CFPlus::Layout self, SV *text_)
646 CODE: 828 CODE:
647{ 829{
648 STRLEN textlen; 830 STRLEN textlen;
649 char *text = SvPVutf8 (text_, textlen); 831 char *text = SvPVutf8 (text_, textlen);
650 832
651 pango_layout_set_text (self->pl, text, textlen); 833 pango_layout_set_text (self->pl, text, textlen);
652} 834}
653 835
654void 836void
655set_markup (CFClient::Layout self, SV *text_) 837set_markup (CFPlus::Layout self, SV *text_)
656 CODE: 838 CODE:
657{ 839{
658 STRLEN textlen; 840 STRLEN textlen;
659 char *text = SvPVutf8 (text_, textlen); 841 char *text = SvPVutf8 (text_, textlen);
660 842
661 pango_layout_set_markup (self->pl, text, textlen); 843 pango_layout_set_markup (self->pl, text, textlen);
662} 844}
663 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
664SV * 931SV *
665get_text (CFClient::Layout self) 932get_text (CFPlus::Layout self)
666 CODE: 933 CODE:
667 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 934 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
668 SvUTF8_on (RETVAL); 935 sv_utf8_decode (RETVAL);
669 OUTPUT: 936 OUTPUT:
670 RETVAL 937 RETVAL
671 938
672void 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
948set_font (CFPlus::Layout self, CFPlus::Font font = 0)
949 CODE:
950 if (self->font != font)
951 {
952 self->font = font;
953 layout_update_font (self);
954 }
955
956void
673set_height (CFClient::Layout self, int base_height) 957set_height (CFPlus::Layout self, int base_height)
674 CODE: 958 CODE:
959 if (self->base_height != base_height)
960 {
675 self->base_height = base_height; 961 self->base_height = base_height;
962 layout_update_font (self);
963 }
676 964
677void 965void
678set_width (CFClient::Layout self, int max_width = -1) 966set_width (CFPlus::Layout self, int max_width = -1)
679 CODE: 967 CODE:
680 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);
681 969
682void 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
683size (CFClient::Layout self) 996size (CFPlus::Layout self)
684 PPCODE: 997 PPCODE:
685{ 998{
686 int w, h; 999 int w, h;
687 1000
688 layout_update (self);
689 layout_get_pixel_size (self, &w, &h); 1001 layout_get_pixel_size (self, &w, &h);
690 1002
691 EXTEND (SP, 2); 1003 EXTEND (SP, 2);
692 PUSHs (sv_2mortal (newSViv (w))); 1004 PUSHs (sv_2mortal (newSViv (w)));
693 PUSHs (sv_2mortal (newSViv (h))); 1005 PUSHs (sv_2mortal (newSViv (h)));
694} 1006}
695 1007
696int 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
697xy_to_index (CFClient::Layout self, int x, int y) 1021xy_to_index (CFPlus::Layout self, int x, int y)
698 CODE: 1022 CODE:
699{ 1023{
700 int index, trailing; 1024 int index, trailing;
701
702 layout_update (self);
703 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);
704
705 RETVAL = index; 1026 RETVAL = index;
706} 1027}
707 OUTPUT: 1028 OUTPUT:
708 RETVAL 1029 RETVAL
709 1030
710void 1031void
711cursor_pos (CFClient::Layout self, int index) 1032cursor_pos (CFPlus::Layout self, int index)
712 PPCODE: 1033 PPCODE:
713{ 1034{
714 PangoRectangle strong_pos; 1035 PangoRectangle strong_pos;
715 layout_update (self);
716 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1036 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
717 1037
718 EXTEND (SP, 3); 1038 EXTEND (SP, 3);
719 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
720 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
721 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
722} 1042}
723 1043
724void 1044void
725render (CFClient::Layout self) 1045render (CFPlus::Layout self, float x, float y, int flags = 0)
726 PPCODE: 1046 PPCODE:
727{ 1047 pango_opengl_render_layout_subpixel (
728 SV *retval; 1048 self->pl,
729 int w, h; 1049 x * PANGO_SCALE, y * PANGO_SCALE,
730 FT_Bitmap bitmap; 1050 self->r, self->g, self->b, self->a,
1051 flags
1052 );
731 1053
732 layout_update (self); 1054MODULE = CFPlus PACKAGE = CFPlus::Texture
733 layout_get_pixel_size (self, &w, &h);
734 1055
735 retval = newSV (w * h); 1056void
736 SvPOK_only (retval); 1057pad2pot (SV *data_, SV *w_, SV *h_)
737 SvCUR_set (retval, w * h); 1058 CODE:
1059{
1060 int ow = SvIV (w_);
1061 int oh = SvIV (h_);
738 1062
739 bitmap.rows = h; 1063 if (ow && oh)
740 bitmap.width = w; 1064 {
741 bitmap.pitch = w; 1065 int nw = minpot (ow);
742 bitmap.buffer = (unsigned char*)SvPVX (retval); 1066 int nh = minpot (oh);
743 bitmap.num_grays = 256;
744 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
745 1067
746 memset (bitmap.buffer, 0, w * h); 1068 if (nw != ow || nh != oh)
747 1069 {
748 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));
749 1076
750 EXTEND (SP, 3); 1077 SvPOK_only (result_);
751 PUSHs (sv_2mortal (newSViv (w))); 1078 SvCUR_set (result_, nw * nh * bpp);
752 PUSHs (sv_2mortal (newSViv (h)));
753 PUSHs (sv_2mortal (retval));
754}
755 1079
756MODULE = 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);
757 1083
1084 sv_setsv (data_, result_);
1085 }
1086
1087 sv_setiv (w_, nw);
1088 sv_setiv (h_, nh);
1089 }
1090 }
1091}
1092
758void 1093void
759draw_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.)
760 PROTOTYPE: $$$;$$ 1095 PROTOTYPE: $$$;$$
1096 ALIAS:
1097 draw_quad_alpha = 1
1098 draw_quad_alpha_premultiplied = 2
761 CODE: 1099 CODE:
762{ 1100{
763 HV *hv = (HV *)SvRV (self); 1101 HV *hv = (HV *)SvRV (self);
764 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1102 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
765 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1103 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
766 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1104 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
767 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
768 1105
769 if (items < 5) 1106 if (items < 5)
770 { 1107 {
771 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1108 w = SvNV (*hv_fetch (hv, "w", 1, 1));
772 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1109 h = SvNV (*hv_fetch (hv, "h", 1, 1));
773 } 1110 }
774 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
775 glBindTexture (GL_TEXTURE_2D, name); 1126 glBindTexture (GL_TEXTURE_2D, name);
776 if (wrap_mode) { 1127
777 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
778 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
779 }
780 glBegin (GL_QUADS); 1128 glBegin (GL_QUADS);
781 glTexCoord2f (0, 0); glVertex2f (x , y ); 1129 glTexCoord2f (0, 0); glVertex2f (x , y );
782 glTexCoord2f (0, t); glVertex2f (x , y + h); 1130 glTexCoord2f (0, t); glVertex2f (x , y + h);
783 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1131 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
784 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1132 glTexCoord2f (s, 0); glVertex2f (x + w, y );
785 glEnd (); 1133 glEnd ();
786}
787 1134
1135 if (ix)
1136 {
1137 glDisable (GL_ALPHA_TEST);
1138 glDisable (GL_BLEND);
1139 }
1140}
1141
788MODULE = CFClient PACKAGE = CFClient::Map 1142MODULE = CFPlus PACKAGE = CFPlus::Map
789 1143
790CFClient::Map 1144CFPlus::Map
791new (SV *class, int map_width, int map_height) 1145new (SV *class, int map_width, int map_height)
792 CODE: 1146 CODE:
793 New (0, RETVAL, 1, struct map); 1147 New (0, RETVAL, 1, struct map);
794 RETVAL->x = 0; 1148 RETVAL->x = 0;
795 RETVAL->y = 0; 1149 RETVAL->y = 0;
805 RETVAL->row = 0; 1159 RETVAL->row = 0;
806 OUTPUT: 1160 OUTPUT:
807 RETVAL 1161 RETVAL
808 1162
809void 1163void
810DESTROY (CFClient::Map self) 1164DESTROY (CFPlus::Map self)
811 CODE: 1165 CODE:
812{ 1166{
813 map_clear (self); 1167 map_clear (self);
814 Safefree (self->face); 1168 Safefree (self->face);
1169 Safefree (self->tex);
815 Safefree (self); 1170 Safefree (self);
816} 1171}
817 1172
818void 1173void
819clear (CFClient::Map self) 1174clear (CFPlus::Map self)
820 CODE: 1175 CODE:
821 map_clear (self); 1176 map_clear (self);
822 1177
823void 1178void
824set_face (CFClient::Map self, int face, int texid) 1179set_face (CFPlus::Map self, int face, int texid)
825 CODE: 1180 CODE:
826{ 1181{
827 while (self->faces <= face) 1182 while (self->faces <= face)
828 { 1183 {
829 Append (mapface, self->face, self->faces, self->faces); 1184 Append (mapface, self->face, self->faces, self->faces);
832 1187
833 self->face [face] = texid; 1188 self->face [face] = texid;
834} 1189}
835 1190
836void 1191void
837set_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)
838 CODE: 1193 CODE:
839{ 1194{
840 while (self->texs <= texid) 1195 while (self->texs <= texid)
841 { 1196 {
842 Append (maptex, self->tex, self->texs, self->texs); 1197 Append (maptex, self->tex, self->texs, self->texs);
854 tex->r = r; 1209 tex->r = r;
855 tex->g = g; 1210 tex->g = g;
856 tex->b = b; 1211 tex->b = b;
857 tex->a = a; 1212 tex->a = a;
858 } 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);
859} 1223}
860 1224
861int 1225int
862ox (CFClient::Map self) 1226ox (CFPlus::Map self)
863 ALIAS: 1227 ALIAS:
864 oy = 1 1228 oy = 1
1229 x = 2
1230 y = 3
1231 w = 4
1232 h = 5
865 CODE: 1233 CODE:
866 switch (ix) 1234 switch (ix)
867 { 1235 {
868 case 0: RETVAL = self->ox; break; 1236 case 0: RETVAL = self->ox; break;
869 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;
870 } 1242 }
871 OUTPUT: 1243 OUTPUT:
872 RETVAL 1244 RETVAL
873 1245
874void 1246void
875scroll (CFClient::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
876 CODE: 1248 CODE:
877{ 1249{
878 if (dx > 0) 1250 if (dx > 0)
879 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
880 else if (dx < 0) 1252 else if (dx < 0)
881 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);
882 1254
883 if (dy > 0) 1255 if (dy > 0)
884 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
885 else if (dy < 0) 1257 else if (dy < 0)
886 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);
887 1259
888 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
889 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
890 1262
891 while (self->y < 0) 1263 while (self->y < 0)
896 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
897 } 1269 }
898} 1270}
899 1271
900void 1272void
901map1a_update (CFClient::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
902 CODE: 1274 CODE:
903{ 1275{
904 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
905 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
906 mapcell *cell; 1278 mapcell *cell;
907 int x, y, flags; 1279 int x, y, flags;
908 1280
909 while (data < data_end) 1281 while (data < data_end - 1)
910 { 1282 {
911 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
912 1284
913 x = ((flags >> 10) & 63) + self->x; 1285 x = self->x + ((flags >> 10) & 63);
914 y = ((flags >> 4) & 63) + self->y; 1286 y = self->y + ((flags >> 4) & 63);
915 1287
916 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
917 1289
918 if (flags & 15) 1290 if (flags & 15)
919 { 1291 {
920 if (cell->darkness < 0) 1292 if (!cell->darkness)
921 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
922 cell->darkness = 0; 1295 cell->darkness = 256;
923 cell->face [0] = 0;
924 cell->face [1] = 0;
925 cell->face [2] = 0;
926 } 1296 }
927 1297
928 cell->darkness = flags & 8 ? *data++ : 255;
929
930 //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 }
931 1340
932 if (flags & 4) 1341 if (flags & 4)
933 { 1342 {
934 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;
935 } 1344 }
943 { 1352 {
944 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;
945 } 1354 }
946 } 1355 }
947 else 1356 else
1357 {
948 cell->darkness = -1; 1358 cell->darkness = 0;
1359 cell->stat_hp = 0;
1360 cell->flags = 0;
1361 cell->player = 0;
1362 }
949 } 1363 }
950} 1364}
951 1365
952SV * 1366SV *
953mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1367mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
954 CODE: 1368 CODE:
955{ 1369{
956 int x1, x; 1370 int x1, x;
957 int y1, y; 1371 int y1, y;
958 int z; 1372 int z;
1008} 1422}
1009 OUTPUT: 1423 OUTPUT:
1010 RETVAL 1424 RETVAL
1011 1425
1012void 1426void
1013draw (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)
1014 PPCODE: 1428 CODE:
1015{ 1429{
1016 int vx, vy; 1430 int vx, vy;
1017 int x, y, z; 1431 int x, y, z;
1018 int last_name; 1432 int last_name;
1019 mapface face; 1433 mapface face;
1020 int sw4 = (sw + 3) & ~3;
1021 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1022 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1023 1434
1024 memset (darkness, 255, sw4 * sh);
1025 SvPOK_only (darkness_sv);
1026 SvCUR_set (darkness_sv, sw4 * sh);
1027
1028 vx = self->x + (self->w - sw) / 2 - shift_x; 1435 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1029 vy = self->y + (self->h - sh) / 2 - shift_y; 1436 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1030 1437
1031 /* 1438 /*
1032 int vx = self->vx = self->w >= sw 1439 int vx = self->vx = self->w >= sw
1033 ? self->x + (self->w - sw) / 2 1440 ? self->x + (self->w - sw) / 2
1034 : 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));
1038 : 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));
1039 */ 1446 */
1040 1447
1041 glColor4ub (255, 255, 255, 255); 1448 glColor4ub (255, 255, 255, 255);
1042 1449
1450 glEnable (GL_BLEND);
1043 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1451 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1044 glEnable (GL_BLEND);
1045 glEnable (GL_TEXTURE_2D); 1452 glEnable (GL_TEXTURE_2D);
1046 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1453 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1047 1454
1048 glBegin (GL_QUADS); 1455 glBegin (GL_QUADS);
1049 1456
1058 for (x = 0; x < sw; x++) 1465 for (x = 0; x < sw; x++)
1059 if (row->c0 <= x + vx && x + vx < row->c1) 1466 if (row->c0 <= x + vx && x + vx < row->c1)
1060 { 1467 {
1061 mapcell *cell = row->col + (x + vx - row->c0); 1468 mapcell *cell = row->col + (x + vx - row->c0);
1062 1469
1063 darkness[y * sw4 + x] = cell->darkness < 0
1064 ? 255 - FOW_DARKNESS
1065 : 255 - cell->darkness;
1066
1067 face = cell->face [z]; 1470 face = cell->face [z];
1068 1471
1069 if (face) 1472 if (face && face < self->texs)
1070 { 1473 {
1071 maptex tex = self->tex [face]; 1474 maptex tex = self->tex [face];
1072
1073 int px = (x + 1) * 32 - tex.w; 1475 int px = (x + 1) * 32 - tex.w;
1074 int py = (y + 1) * 32 - tex.h; 1476 int py = (y + 1) * 32 - tex.h;
1075 1477
1076 if (last_name != tex.name) 1478 if (last_name != tex.name)
1077 { 1479 {
1078 glEnd (); 1480 glEnd ();
1079 last_name = tex.name;
1080 glBindTexture (GL_TEXTURE_2D, last_name); 1481 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1081 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1082 } 1483 }
1083 1484
1084 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1485 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1085 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1486 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1086 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);
1087 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1488 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1088 } 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 }
1089 } 1509 }
1090 } 1510 }
1091 1511
1092 glEnd (); 1512 glEnd ();
1093 1513
1094 glDisable (GL_TEXTURE_2D); 1514 glDisable (GL_TEXTURE_2D);
1095 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 }
1096 1641
1097 EXTEND (SP, 3); 1642 EXTEND (SP, 3);
1098 PUSHs (sv_2mortal (newSViv (sw4))); 1643 PUSHs (sv_2mortal (newSViv (sw4)));
1099 PUSHs (sv_2mortal (newSViv (sh))); 1644 PUSHs (sv_2mortal (newSViv (sh)));
1100 PUSHs (darkness_sv); 1645 PUSHs (darkness_sv);
1101} 1646}
1102 1647
1103SV * 1648SV *
1104get_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)
1105 CODE: 1650 CODE:
1106{ 1651{
1107 int x, y, x1, y1; 1652 int x, y, x1, y1;
1108 SV *data_sv = newSV (w * h * 7 + 5); 1653 SV *data_sv = newSV (w * h * 7 + 5);
1109 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1654 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1171} 1716}
1172 OUTPUT: 1717 OUTPUT:
1173 RETVAL 1718 RETVAL
1174 1719
1175void 1720void
1176set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1721set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1177 PPCODE: 1722 PPCODE:
1178{ 1723{
1179 int x, y, z; 1724 int x, y, z;
1180 int w, h; 1725 int w, h;
1181 int x1, y1; 1726 int x1, y1;
1213 1758
1214 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1759 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1215 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1760 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1216 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1761 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1217 1762
1218 if (cell->darkness <= 0) 1763 if (cell->darkness == 0)
1219 { 1764 {
1220 cell->darkness = -1; 1765 cell->darkness = 0;
1221 1766
1222 for (z = 0; z <= 2; z++) 1767 for (z = 0; z <= 2; z++)
1223 { 1768 {
1224 cell->face[z] = face[z]; 1769 cell->face[z] = face[z];
1225 1770
1230 } 1775 }
1231 } 1776 }
1232 } 1777 }
1233} 1778}
1234 1779
1235MODULE = CFClient PACKAGE = CFClient::MixChunk 1780MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1236 1781
1237CFClient::MixChunk 1782CFPlus::MixChunk
1238new_from_file (SV *class, char *path) 1783new_from_file (SV *class, char *path)
1239 CODE: 1784 CODE:
1240 RETVAL = Mix_LoadWAV (path); 1785 RETVAL = Mix_LoadWAV (path);
1241 OUTPUT: 1786 OUTPUT:
1242 RETVAL 1787 RETVAL
1243 1788
1244void 1789void
1245DESTROY (CFClient::MixChunk self) 1790DESTROY (CFPlus::MixChunk self)
1246 CODE: 1791 CODE:
1247 Mix_FreeChunk (self); 1792 Mix_FreeChunk (self);
1248 1793
1249int 1794int
1250volume (CFClient::MixChunk self, int volume = -1) 1795volume (CFPlus::MixChunk self, int volume = -1)
1251 CODE: 1796 CODE:
1252 RETVAL = Mix_VolumeChunk (self, volume); 1797 RETVAL = Mix_VolumeChunk (self, volume);
1253 OUTPUT: 1798 OUTPUT:
1254 RETVAL 1799 RETVAL
1255 1800
1256int 1801int
1257play (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)
1258 CODE: 1803 CODE:
1259 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1804 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1260 OUTPUT: 1805 OUTPUT:
1261 RETVAL 1806 RETVAL
1262 1807
1263MODULE = CFClient PACKAGE = CFClient::MixMusic 1808MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1264 1809
1265int 1810int
1266volume (int volume = -1) 1811volume (int volume = -1)
1267 CODE: 1812 CODE:
1268 RETVAL = Mix_VolumeMusic (volume); 1813 RETVAL = Mix_VolumeMusic (volume);
1269 OUTPUT: 1814 OUTPUT:
1270 RETVAL 1815 RETVAL
1271 1816
1272CFClient::MixMusic 1817CFPlus::MixMusic
1273new_from_file (SV *class, char *path) 1818new_from_file (SV *class, char *path)
1274 CODE: 1819 CODE:
1275 RETVAL = Mix_LoadMUS (path); 1820 RETVAL = Mix_LoadMUS (path);
1276 OUTPUT: 1821 OUTPUT:
1277 RETVAL 1822 RETVAL
1278 1823
1279void 1824void
1280DESTROY (CFClient::MixMusic self) 1825DESTROY (CFPlus::MixMusic self)
1281 CODE: 1826 CODE:
1282 Mix_FreeMusic (self); 1827 Mix_FreeMusic (self);
1283 1828
1284int 1829int
1285play (CFClient::MixMusic self, int loops = -1) 1830play (CFPlus::MixMusic self, int loops = -1)
1286 CODE: 1831 CODE:
1287 RETVAL = Mix_PlayMusic (self, loops); 1832 RETVAL = Mix_PlayMusic (self, loops);
1288 OUTPUT: 1833 OUTPUT:
1289 RETVAL 1834 RETVAL
1290 1835
1291MODULE = CFClient PACKAGE = CFClient::OpenGL 1836MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1292 1837
1293BOOT: 1838BOOT:
1294{ 1839{
1295 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1840 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1296 static const struct { 1841 static const struct {
1297 const char *name; 1842 const char *name;
1298 IV iv; 1843 IV iv;
1299 } *civ, const_iv[] = { 1844 } *civ, const_iv[] = {
1300# define const_iv(name) { # name, (IV)name } 1845# define const_iv(name) { # name, (IV)name }
1301 const_iv (GL_COLOR_MATERIAL), 1846 const_iv (GL_COLOR_MATERIAL),
1302 const_iv (GL_SMOOTH), 1847 const_iv (GL_SMOOTH),
1303 const_iv (GL_FLAT), 1848 const_iv (GL_FLAT),
1849 const_iv (GL_DITHER),
1304 const_iv (GL_BLEND), 1850 const_iv (GL_BLEND),
1851 const_iv (GL_CULL_FACE),
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),
1305 const_iv (GL_AND), 1859 const_iv (GL_AND),
1860 const_iv (GL_ONE),
1861 const_iv (GL_ZERO),
1306 const_iv (GL_SRC_ALPHA), 1862 const_iv (GL_SRC_ALPHA),
1863 const_iv (GL_DST_ALPHA),
1307 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1864 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1865 const_iv (GL_ONE_MINUS_DST_ALPHA),
1866 const_iv (GL_SRC_ALPHA_SATURATE),
1308 const_iv (GL_RGB), 1867 const_iv (GL_RGB),
1309 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),
1310 const_iv (GL_UNSIGNED_BYTE), 1872 const_iv (GL_UNSIGNED_BYTE),
1311 const_iv (GL_ALPHA4), 1873 const_iv (GL_UNSIGNED_SHORT),
1874 const_iv (GL_UNSIGNED_INT),
1312 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),
1313 const_iv (GL_FLOAT), 1879 const_iv (GL_FLOAT),
1314 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1880 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1315 const_iv (GL_COMPILE), 1881 const_iv (GL_COMPILE),
1316 const_iv (GL_TEXTURE_1D), 1882 const_iv (GL_TEXTURE_1D),
1317 const_iv (GL_TEXTURE_2D), 1883 const_iv (GL_TEXTURE_2D),
1319 const_iv (GL_TEXTURE_MAG_FILTER), 1885 const_iv (GL_TEXTURE_MAG_FILTER),
1320 const_iv (GL_TEXTURE_MIN_FILTER), 1886 const_iv (GL_TEXTURE_MIN_FILTER),
1321 const_iv (GL_TEXTURE_ENV_MODE), 1887 const_iv (GL_TEXTURE_ENV_MODE),
1322 const_iv (GL_TEXTURE_WRAP_S), 1888 const_iv (GL_TEXTURE_WRAP_S),
1323 const_iv (GL_TEXTURE_WRAP_T), 1889 const_iv (GL_TEXTURE_WRAP_T),
1890 const_iv (GL_REPEAT),
1324 const_iv (GL_CLAMP), 1891 const_iv (GL_CLAMP),
1325 const_iv (GL_REPEAT), 1892 const_iv (GL_CLAMP_TO_EDGE),
1326 const_iv (GL_NEAREST), 1893 const_iv (GL_NEAREST),
1327 const_iv (GL_LINEAR), 1894 const_iv (GL_LINEAR),
1895 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1896 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1897 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1898 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1899 const_iv (GL_GENERATE_MIPMAP),
1328 const_iv (GL_MODULATE), 1900 const_iv (GL_MODULATE),
1901 const_iv (GL_DECAL),
1329 const_iv (GL_REPLACE), 1902 const_iv (GL_REPLACE),
1903 const_iv (GL_DEPTH_BUFFER_BIT),
1330 const_iv (GL_COLOR_BUFFER_BIT), 1904 const_iv (GL_COLOR_BUFFER_BIT),
1331 const_iv (GL_PROJECTION), 1905 const_iv (GL_PROJECTION),
1332 const_iv (GL_MODELVIEW), 1906 const_iv (GL_MODELVIEW),
1333 const_iv (GL_COLOR_LOGIC_OP), 1907 const_iv (GL_COLOR_LOGIC_OP),
1908 const_iv (GL_SEPARABLE_2D),
1334 const_iv (GL_CONVOLUTION_2D), 1909 const_iv (GL_CONVOLUTION_2D),
1335 const_iv (GL_CONVOLUTION_BORDER_MODE), 1910 const_iv (GL_CONVOLUTION_BORDER_MODE),
1336 const_iv (GL_CONSTANT_BORDER), 1911 const_iv (GL_CONSTANT_BORDER),
1337 const_iv (GL_LINES), 1912 const_iv (GL_LINES),
1913 const_iv (GL_LINE_STRIP),
1914 const_iv (GL_LINE_LOOP),
1338 const_iv (GL_QUADS), 1915 const_iv (GL_QUADS),
1339 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),
1340 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1920 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1341 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),
1342# undef const_iv 1926# undef const_iv
1343 }; 1927 };
1344 1928
1345 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; )
1346 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1930 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1347} 1931}
1348 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
1349int glGetError () 1954int glGetError ()
1955
1956void glFinish ()
1350 1957
1351void glClear (int mask) 1958void glClear (int mask)
1352 1959
1353void glClearColor (float r, float g, float b, float a = 1.0) 1960void glClearColor (float r, float g, float b, float a = 1.0)
1354 PROTOTYPE: @ 1961 PROTOTYPE: @
1361 1968
1362void glHint (int target, int mode) 1969void glHint (int target, int mode)
1363 1970
1364void glBlendFunc (int sfactor, int dfactor) 1971void glBlendFunc (int sfactor, int dfactor)
1365 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
1366void glLogicOp (int opcode) 1979void glLogicOp (int opcode)
1367 1980
1981void glColorMask (int red, int green, int blue, int alpha)
1982
1368void glMatrixMode (int mode) 1983void glMatrixMode (int mode)
1369 1984
1370void glPushMatrix () 1985void glPushMatrix ()
1371 1986
1372void glPopMatrix () 1987void glPopMatrix ()
1373 1988
1374void glLoadIdentity () 1989void glLoadIdentity ()
1375 1990
1991void glDrawBuffer (int buffer)
1992
1993void glReadBuffer (int buffer)
1994
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
1376void 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_)
1377 2000
1378void glViewport (int x, int y, int width, int height) 2001void glViewport (int x, int y, int width, int height)
2002
2003void glScissor (int x, int y, int width, int height)
1379 2004
1380void glTranslate (float x, float y, float z = 0.) 2005void glTranslate (float x, float y, float z = 0.)
1381 CODE: 2006 CODE:
1382 glTranslatef (x, y, z); 2007 glTranslatef (x, y, z);
1383 2008
1384void glScale (float x, float y, float z) 2009void glScale (float x, float y, float z = 1.)
1385 CODE: 2010 CODE:
1386 glScalef (x, y, z); 2011 glScalef (x, y, z);
1387 2012
1388void glRotate (float angle, float x, float y, float z) 2013void glRotate (float angle, float x, float y, float z)
1389 CODE: 2014 CODE:
1393 2018
1394void glEnd () 2019void glEnd ()
1395 2020
1396void glColor (float r, float g, float b, float a = 1.0) 2021void glColor (float r, float g, float b, float a = 1.0)
1397 PROTOTYPE: @ 2022 PROTOTYPE: @
2023 ALIAS:
2024 glColor_premultiply = 1
1398 CODE: 2025 CODE:
2026 if (ix)
2027 {
2028 r *= a;
2029 g *= a;
2030 b *= a;
2031 }
2032 // microsoft visual "c" rounds instead of truncating...
1399 glColor4f (r, g, b, a); 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);
1400 2045
1401void glVertex (float x, float y, float z = 0.) 2046void glVertex (float x, float y, float z = 0.)
1402 CODE: 2047 CODE:
1403 glVertex3f (x, y, z); 2048 glVertex3f (x, y, z);
1404 2049
1416 2061
1417void glBindTexture (int target, int name) 2062void glBindTexture (int target, int name)
1418 2063
1419void glConvolutionParameter (int target, int pname, float params) 2064void glConvolutionParameter (int target, int pname, float params)
1420 CODE: 2065 CODE:
2066 if (gl.ConvolutionParameterf)
1421 glConvolutionParameterf (target, pname, params); 2067 gl.ConvolutionParameterf (target, pname, params);
1422 2068
1423void 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)
2070 CODE:
2071 if (gl.ConvolutionFilter2D)
2072 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2073
2074void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2075 CODE:
2076 if (gl.SeparableFilter2D)
2077 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1424 2078
1425void 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)
1426 2080
1427void 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)
2082
2083void glDrawPixels (int width, int height, int format, int type, char *pixels)
2084
2085void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1428 2086
1429int glGenTexture () 2087int glGenTexture ()
1430 CODE: 2088 CODE:
1431{ 2089{
1432 GLuint name; 2090 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines