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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines