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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines