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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines