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.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines