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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines