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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines