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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines