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.75 by root, Mon May 8 18:28:40 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>
3# pragma warning(disable:4244) 9# pragma warning(disable:4244)
4#endif 10#endif
5 11
6#include "EXTERN.h" 12#include "EXTERN.h"
7#include "perl.h" 13#include "perl.h"
8#include "XSUB.h" 14#include "XSUB.h"
9 15
16#ifdef _WIN32
17# undef pipe
18#endif
19
20#include <math.h>
10#include <string.h> 21#include <string.h>
11#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
12 24
13#include <SDL.h> 25#include <SDL.h>
26#include <SDL_endian.h>
14#include <SDL_image.h> 27#include <SDL_image.h>
15#include <SDL_mixer.h> 28#include <SDL_mixer.h>
16#include <SDL_opengl.h> 29#include <SDL_opengl.h>
17 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
18#include <glib/gmacros.h> 34#include <glib/gmacros.h>
19 35
20#include <pango/pango.h> 36#include <pango/pango.h>
21#include <pango/pangofc-fontmap.h>
22#include <pango/pangoft2.h>
23 37
24#ifndef _WIN32 38#ifndef _WIN32
25# include <sys/types.h> 39# include <sys/types.h>
26# include <sys/socket.h> 40# include <sys/socket.h>
27# include <netinet/in.h> 41# include <netinet/in.h>
34 typedef signed char int8_t; 48 typedef signed char int8_t;
35 typedef signed short int16_t; 49 typedef signed short int16_t;
36 typedef signed int int32_t; 50 typedef signed int int32_t;
37#endif 51#endif
38 52
39#include "glext.h" 53#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
40 54
41#define FOW_DARKNESS 32 55#define FOW_DARKNESS 32
42 56
43#define MAP_EXTEND_X 32 57#define MAP_EXTEND_X 32
44#define MAP_EXTEND_Y 512 58#define MAP_EXTEND_Y 512
45 59
46#define MIN_FONT_HEIGHT 10 60#define MIN_FONT_HEIGHT 10
47 61
48#define GL_CALL(type,func,args) \ 62#if 0
49 { \ 63# define PARACHUTE SDL_INIT_NOPARACHUTE
50 static int init_; \ 64#else
51 static type fptr_; \ 65# define PARACHUTE 0
52 \ 66#endif
53 if (!init_) \
54 { \
55 init_ = 1; \
56 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57 } \
58 \
59 if (fptr_) \
60 fptr_ args; \
61 }
62 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
63typedef Mix_Chunk *CFClient__MixChunk; 91typedef Mix_Chunk *CFPlus__MixChunk;
64typedef Mix_Music *CFClient__MixMusic; 92typedef Mix_Music *CFPlus__MixMusic;
65 93
66typedef 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}
67 113
68typedef struct cf_layout { 114typedef struct cf_layout {
69 PangoLayout *pl; 115 PangoLayout *pl;
116 float r, g, b, a; // default color for rgba mode
70 int base_height; 117 int base_height;
71 CFClient__Font font; 118 CFPlus__Font font;
72} *CFClient__Layout; 119} *CFPlus__Layout;
73 120
74static CFClient__Font default_font; 121static CFPlus__Font default_font;
75static PangoContext *context; 122static PangoContext *opengl_context;
76static PangoFontMap *fontmap; 123static PangoFontMap *opengl_fontmap;
77 124
78static void 125static void
79substitute_func (FcPattern *pattern, gpointer data) 126substitute_func (FcPattern *pattern, gpointer data)
80{ 127{
81 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
82 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 132 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
83} 133}
84 134
85static void 135static void
86layout_update_font (CFClient__Layout self) 136layout_update_font (CFPlus__Layout self)
87{ 137{
88 /* 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
89 * reasonably well with bitstream vera 139 * reasonably well with bitstream vera
90 */ 140 */
91 PangoFontDescription *font = self->font ? self->font : default_font; 141 PangoFontDescription *font = self->font ? self->font : default_font;
95 145
96 pango_layout_set_font_description (self->pl, font); 146 pango_layout_set_font_description (self->pl, font);
97} 147}
98 148
99static void 149static void
100layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 150layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
101{ 151{
152 PangoRectangle rect;
153
154 // get_pixel_* wrongly rounds down
102 pango_layout_get_pixel_size (self->pl, w, h); 155 pango_layout_get_extents (self->pl, 0, &rect);
103 156
104 *w = (*w + 3) & ~3; 157 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
105 if (!*w) *w = 1; 158 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
106 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;
107} 165}
108 166
109typedef uint16_t mapface; 167typedef uint16_t mapface;
110 168
111typedef struct { 169typedef struct {
114 float s, t; 172 float s, t;
115 uint8_t r, g, b, a; 173 uint8_t r, g, b, a;
116} maptex; 174} maptex;
117 175
118typedef struct { 176typedef struct {
119 int16_t darkness; 177 uint32_t player;
120 mapface face[3]; 178 mapface face[3];
179 uint16_t darkness;
180 uint8_t stat_width, stat_hp, flags;
121} mapcell; 181} mapcell;
122 182
123typedef struct { 183typedef struct {
124 int32_t c0, c1; 184 int32_t c0, c1;
125 mapcell *col; 185 mapcell *col;
134 int texs; 194 int texs;
135 maptex *tex; 195 maptex *tex;
136 196
137 int32_t rows; 197 int32_t rows;
138 maprow *row; 198 maprow *row;
139} *CFClient__Map; 199} *CFPlus__Map;
140 200
141static char * 201static char *
142prepend (char *ptr, int sze, int inc) 202prepend (char *ptr, int sze, int inc)
143{ 203{
144 char *p; 204 char *p;
162 222
163#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))
164#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))
165 225
166static maprow * 226static maprow *
167map_get_row (CFClient__Map self, int y) 227map_get_row (CFPlus__Map self, int y)
168{ 228{
169 if (0 > y) 229 if (0 > y)
170 { 230 {
171 int extend = - y + MAP_EXTEND_Y; 231 int extend = - y + MAP_EXTEND_Y;
172 Prepend (maprow, self->row, self->rows, extend); 232 Prepend (maprow, self->row, self->rows, extend);
210 270
211 return row->col + (x - row->c0); 271 return row->col + (x - row->c0);
212} 272}
213 273
214static mapcell * 274static mapcell *
215map_get_cell (CFClient__Map self, int x, int y) 275map_get_cell (CFPlus__Map self, int x, int y)
216{ 276{
217 return row_get_cell (map_get_row (self, y), x); 277 return row_get_cell (map_get_row (self, y), x);
218} 278}
219 279
220static void 280static void
221map_clear (CFClient__Map self) 281map_clear (CFPlus__Map self)
222{ 282{
223 int r; 283 int r;
224 284
225 for (r = 0; r < self->rows; r++) 285 for (r = 0; r < self->rows; r++)
226 Safefree (self->row[r].col); 286 Safefree (self->row[r].col);
234 self->row = 0; 294 self->row = 0;
235 self->rows = 0; 295 self->rows = 0;
236} 296}
237 297
238static void 298static void
239map_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)
240{ 300{
241 int x, y; 301 int x, y;
242 maprow *row; 302 maprow *row;
303 mapcell *cell;
243 304
244 for (y = y0; y < y0 + h; y++) 305 for (y = y0; y < y0 + h; y++)
245 if (y >= 0) 306 if (y >= 0)
246 { 307 {
247 if (y >= self->rows) 308 if (y >= self->rows)
253 if (x >= row->c0) 314 if (x >= row->c0)
254 { 315 {
255 if (x >= row->c1) 316 if (x >= row->c1)
256 break; 317 break;
257 318
258 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;
259 } 325 }
260 } 326 }
261} 327}
262 328
263static void 329static void
284 ev.data2 = 0; 350 ev.data2 = 0;
285 351
286 SDL_PushEvent ((SDL_Event *)&ev); 352 SDL_PushEvent ((SDL_Event *)&ev);
287} 353}
288 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
289MODULE = CFClient PACKAGE = CFClient 372MODULE = CFPlus PACKAGE = CFPlus
290 373
291PROTOTYPES: ENABLE 374PROTOTYPES: ENABLE
292 375
293BOOT: 376BOOT:
294{ 377{
295 HV *stash = gv_stashpv ("CFClient", 1); 378 HV *stash = gv_stashpv ("CFPlus", 1);
296 static const struct { 379 static const struct {
297 const char *name; 380 const char *name;
298 IV iv; 381 IV iv;
299 } *civ, const_iv[] = { 382 } *civ, const_iv[] = {
300# define const_iv(name) { # name, (IV)name } 383# define const_iv(name) { # name, (IV)name }
399# undef const_iv 482# undef const_iv
400 }; 483 };
401 484
402 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; )
403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 486 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404
405 fontmap = pango_ft2_font_map_new ();
406 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
407 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
408} 487}
409 488
410int 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
411SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 510SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
412 511
413void 512void
414SDL_Quit () 513SDL_Quit ()
415 514
416void 515void
422 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 521 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 522 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 523 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 524 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426 525
526 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
527 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
528
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 529 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 530 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 531 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 532 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431 533
432 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 534 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
535#if SDL_VERSION_ATLEAST(1,2,10)
433 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 536 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 537 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
538#endif
435 539
436 SDL_EnableUNICODE (1); 540 SDL_EnableUNICODE (1);
437 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 541 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438 542
439 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 543 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
448 552
449 ++m; 553 ++m;
450 } 554 }
451} 555}
452 556
557char *
558SDL_GetError ()
559
453int 560int
454SDL_SetVideoMode (int w, int h, int fullscreen) 561SDL_SetVideoMode (int w, int h, int fullscreen)
455 CODE: 562 CODE:
456 RETVAL = !!SDL_SetVideoMode ( 563 RETVAL = !!SDL_SetVideoMode (
457 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 564 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
458 ); 565 );
566 if (RETVAL)
567 {
459 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 }
460 OUTPUT: 573 OUTPUT:
461 RETVAL 574 RETVAL
462 575
463void 576void
464SDL_GL_SwapBuffers () 577SDL_GL_SwapBuffers ()
578
579char *
580SDL_GetKeyName (int sym)
465 581
466void 582void
467SDL_PollEvent () 583SDL_PollEvent ()
468 PPCODE: 584 PPCODE:
469{ 585{
488 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 604 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490 break; 606 break;
491 607
492 case SDL_MOUSEMOTION: 608 case SDL_MOUSEMOTION:
609 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
493 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 611 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 612 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 613 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 614 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 615 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498 break; 616 break;
499 617
500 case SDL_MOUSEBUTTONDOWN: 618 case SDL_MOUSEBUTTONDOWN:
501 case SDL_MOUSEBUTTONUP: 619 case SDL_MOUSEBUTTONUP:
620 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
621
502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 622 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 623 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 624 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 625 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break; 626 break;
510 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 630 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 631 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512 break; 632 break;
513 } 633 }
514 634
515 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 635 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516 } 636 }
517} 637}
518 638
519int 639int
520Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 640Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
533 CODE: 653 CODE:
534#ifndef _WIN32 654#ifndef _WIN32
535 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 655 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536#endif 656#endif
537 657
538char * 658void
539gl_version () 659win32_proxy_info ()
540 CODE: 660 PPCODE:
541 RETVAL = (char *)glGetString (GL_VERSION); 661{
542 OUTPUT: 662#ifdef _WIN32
543 RETVAL 663 char buffer[2048];
664 DWORD buflen;
544 665
545char * 666 EXTEND (SP, 3);
546gl_extensions () 667
547 CODE: 668 buflen = sizeof (buffer);
548 RETVAL = (char *)glGetString (GL_EXTENSIONS); 669 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
549 OUTPUT: 670 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
550 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}
551 686
552void 687void
553add_font (char *file) 688add_font (char *file)
554 CODE: 689 CODE:
555 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 690 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556 691
557void 692void
558load_image_inline (SV *image_) 693load_image_inline (SV *image_)
559 ALIAS: 694 ALIAS:
560 load_image_file = 1 695 load_image_file = 1
602 737
603 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 738 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604 739
605 assert (surface2->pitch == surface2->w * 4); 740 assert (surface2->pitch == surface2->w * 4);
606 741
742 SDL_LockSurface (surface2);
607 EXTEND (SP, 5); 743 EXTEND (SP, 6);
608 PUSHs (sv_2mortal (newSViv (surface2->w))); 744 PUSHs (sv_2mortal (newSViv (surface2->w)));
609 PUSHs (sv_2mortal (newSViv (surface2->h))); 745 PUSHs (sv_2mortal (newSViv (surface2->h)));
610 SDL_LockSurface (surface2);
611 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 746 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
612 SDL_UnlockSurface (surface2);
613 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)));
614 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 748 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 749 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
750 SDL_UnlockSurface (surface2);
616 751
617 SDL_FreeSurface (surface); 752 SDL_FreeSurface (surface);
618 SDL_FreeSurface (surface2); 753 SDL_FreeSurface (surface2);
619} 754}
620 755
644} 779}
645 780
646void 781void
647error (char *message) 782error (char *message)
648 CODE: 783 CODE:
784 fprintf (stderr, "ERROR: %s\n", message);
649#ifdef _WIN32 785#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 786 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
651#else
652 fprintf (stderr, "ERROR: %s\n", message);
653#endif 787#endif
654 788
655void 789void
656fatal (char *message) 790fatal (char *message)
657 CODE: 791 CODE:
792 fprintf (stderr, "FATAL: %s\n", message);
658#ifdef _WIN32 793#ifdef _WIN32
659 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 794 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
660#else
661 fprintf (stderr, "FATAL: %s\n", message);
662#endif 795#endif
663 exit (1); 796 _exit (1);
664 797
798void
799_exit (int retval = 0)
800 CODE:
801 _exit (retval);
802
665MODULE = CFClient PACKAGE = CFClient::Font 803MODULE = CFPlus PACKAGE = CFPlus::Font
666 804
667CFClient::Font 805CFPlus::Font
668new_from_file (SV *class, char *path, int id = 0) 806new_from_file (SV *class, char *path, int id = 0)
669 CODE: 807 CODE:
670{ 808{
671 int count; 809 int count;
672 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 810 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
675} 813}
676 OUTPUT: 814 OUTPUT:
677 RETVAL 815 RETVAL
678 816
679void 817void
680DESTROY (CFClient::Font self) 818DESTROY (CFPlus::Font self)
681 CODE: 819 CODE:
682 pango_font_description_free (self); 820 pango_font_description_free (self);
683 821
684void 822void
685make_default (CFClient::Font self) 823make_default (CFPlus::Font self)
686 CODE: 824 CODE:
687 default_font = self; 825 default_font = self;
688 826
689MODULE = CFClient PACKAGE = CFClient::Layout 827MODULE = CFPlus PACKAGE = CFPlus::Layout
690 828
691CFClient::Layout 829void
692new (SV *class, int base_height = MIN_FONT_HEIGHT) 830reset_glyph_cache ()
831 CODE:
832 tc_clear ();
833
834CFPlus::Layout
835new (SV *class)
693 CODE: 836 CODE:
694 New (0, RETVAL, 1, struct cf_layout); 837 New (0, RETVAL, 1, struct cf_layout);
838
695 RETVAL->pl = pango_layout_new (context); 839 RETVAL->pl = pango_layout_new (opengl_context);
696 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;
697 RETVAL->font = 0; 845 RETVAL->font = 0;
846
698 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 847 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699 pango_layout_set_font_description (RETVAL->pl, default_font); 848 layout_update_font (RETVAL);
700 OUTPUT: 849 OUTPUT:
701 RETVAL 850 RETVAL
702 851
703void 852void
704DESTROY (CFClient::Layout self) 853DESTROY (CFPlus::Layout self)
705 CODE: 854 CODE:
706 g_object_unref (self->pl); 855 g_object_unref (self->pl);
707 Safefree (self); 856 Safefree (self);
708 857
709void 858void
710set_text (CFClient::Layout self, SV *text_) 859set_text (CFPlus::Layout self, SV *text_)
711 CODE: 860 CODE:
712{ 861{
713 STRLEN textlen; 862 STRLEN textlen;
714 char *text = SvPVutf8 (text_, textlen); 863 char *text = SvPVutf8 (text_, textlen);
715 864
716 pango_layout_set_text (self->pl, text, textlen); 865 pango_layout_set_text (self->pl, text, textlen);
717} 866}
718 867
719void 868void
720set_markup (CFClient::Layout self, SV *text_) 869set_markup (CFPlus::Layout self, SV *text_)
721 CODE: 870 CODE:
722{ 871{
723 STRLEN textlen; 872 STRLEN textlen;
724 char *text = SvPVutf8 (text_, textlen); 873 char *text = SvPVutf8 (text_, textlen);
725 874
726 pango_layout_set_markup (self->pl, text, textlen); 875 pango_layout_set_markup (self->pl, text, textlen);
727} 876}
728 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
729SV * 963SV *
730get_text (CFClient::Layout self) 964get_text (CFPlus::Layout self)
731 CODE: 965 CODE:
732 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 966 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733 SvUTF8_on (RETVAL); 967 sv_utf8_decode (RETVAL);
734 OUTPUT: 968 OUTPUT:
735 RETVAL 969 RETVAL
736 970
737void 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
738set_font (CFClient::Layout self, CFClient::Font font = 0) 980set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739 CODE: 981 CODE:
740 if (self->font != font) 982 if (self->font != font)
741 { 983 {
742 self->font = font; 984 self->font = font;
743 layout_update_font (self); 985 layout_update_font (self);
744 } 986 }
745 987
746void 988void
747set_height (CFClient::Layout self, int base_height) 989set_height (CFPlus::Layout self, int base_height)
748 CODE: 990 CODE:
749 if (self->base_height != base_height) 991 if (self->base_height != base_height)
750 { 992 {
751 self->base_height = base_height; 993 self->base_height = base_height;
752 layout_update_font (self); 994 layout_update_font (self);
753 } 995 }
754 996
755void 997void
756set_width (CFClient::Layout self, int max_width = -1) 998set_width (CFPlus::Layout self, int max_width = -1)
757 CODE: 999 CODE:
758 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);
759 1001
760void 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
761size (CFClient::Layout self) 1028size (CFPlus::Layout self)
762 PPCODE: 1029 PPCODE:
763{ 1030{
764 int w, h; 1031 int w, h;
765 1032
766 layout_get_pixel_size (self, &w, &h); 1033 layout_get_pixel_size (self, &w, &h);
769 PUSHs (sv_2mortal (newSViv (w))); 1036 PUSHs (sv_2mortal (newSViv (w)));
770 PUSHs (sv_2mortal (newSViv (h))); 1037 PUSHs (sv_2mortal (newSViv (h)));
771} 1038}
772 1039
773int 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
774xy_to_index (CFClient::Layout self, int x, int y) 1053xy_to_index (CFPlus::Layout self, int x, int y)
775 CODE: 1054 CODE:
776{ 1055{
777 int index, trailing; 1056 int index, trailing;
778 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);
779 RETVAL = index; 1058 RETVAL = index;
780} 1059}
781 OUTPUT: 1060 OUTPUT:
782 RETVAL 1061 RETVAL
783 1062
784void 1063void
785cursor_pos (CFClient::Layout self, int index) 1064cursor_pos (CFPlus::Layout self, int index)
786 PPCODE: 1065 PPCODE:
787{ 1066{
788 PangoRectangle strong_pos; 1067 PangoRectangle strong_pos;
789 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1068 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790 1069
793 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1072 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1073 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795} 1074}
796 1075
797void 1076void
798render (CFClient::Layout self) 1077render (CFPlus::Layout self, float x, float y, int flags = 0)
799 PPCODE: 1078 PPCODE:
800{ 1079 pango_opengl_render_layout_subpixel (
801 SV *retval; 1080 self->pl,
802 int w, h; 1081 x * PANGO_SCALE, y * PANGO_SCALE,
803 FT_Bitmap bitmap; 1082 self->r, self->g, self->b, self->a,
1083 flags
1084 );
804 1085
805 layout_get_pixel_size (self, &w, &h); 1086MODULE = CFPlus PACKAGE = CFPlus::Texture
806 1087
807 retval = newSV (w * h); 1088void
808 SvPOK_only (retval); 1089pad2pot (SV *data_, SV *w_, SV *h_)
809 SvCUR_set (retval, w * h); 1090 CODE:
1091{
1092 int ow = SvIV (w_);
1093 int oh = SvIV (h_);
810 1094
811 bitmap.rows = h; 1095 if (ow && oh)
812 bitmap.width = w; 1096 {
813 bitmap.pitch = w; 1097 int nw = minpot (ow);
814 bitmap.buffer = (unsigned char*)SvPVX (retval); 1098 int nh = minpot (oh);
815 bitmap.num_grays = 256;
816 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817 1099
818 memset (bitmap.buffer, 0, w * h); 1100 if (nw != ow || nh != oh)
819 1101 {
820 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));
821 1108
822 EXTEND (SP, 3); 1109 SvPOK_only (result_);
823 PUSHs (sv_2mortal (newSViv (w))); 1110 SvCUR_set (result_, nw * nh * bpp);
824 PUSHs (sv_2mortal (newSViv (h)));
825 PUSHs (sv_2mortal (retval));
826}
827 1111
828MODULE = 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);
829 1115
1116 sv_setsv (data_, result_);
1117 }
1118
1119 sv_setiv (w_, nw);
1120 sv_setiv (h_, nh);
1121 }
1122 }
1123}
1124
830void 1125void
831draw_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.)
832 PROTOTYPE: $$$;$$ 1127 PROTOTYPE: $$$;$$
1128 ALIAS:
1129 draw_quad_alpha = 1
1130 draw_quad_alpha_premultiplied = 2
833 CODE: 1131 CODE:
834{ 1132{
835 HV *hv = (HV *)SvRV (self); 1133 HV *hv = (HV *)SvRV (self);
836 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1134 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1135 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1136 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840 1137
841 if (items < 5) 1138 if (items < 5)
842 { 1139 {
843 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1140 w = SvNV (*hv_fetch (hv, "w", 1, 1));
844 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1141 h = SvNV (*hv_fetch (hv, "h", 1, 1));
845 } 1142 }
846 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
847 glBindTexture (GL_TEXTURE_2D, name); 1158 glBindTexture (GL_TEXTURE_2D, name);
848 if (wrap_mode) { 1159
849 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851 }
852 glBegin (GL_QUADS); 1160 glBegin (GL_QUADS);
853 glTexCoord2f (0, 0); glVertex2f (x , y ); 1161 glTexCoord2f (0, 0); glVertex2f (x , y );
854 glTexCoord2f (0, t); glVertex2f (x , y + h); 1162 glTexCoord2f (0, t); glVertex2f (x , y + h);
855 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1163 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1164 glTexCoord2f (s, 0); glVertex2f (x + w, y );
857 glEnd (); 1165 glEnd ();
858}
859 1166
1167 if (ix)
1168 {
1169 glDisable (GL_ALPHA_TEST);
1170 glDisable (GL_BLEND);
1171 }
1172}
1173
860MODULE = CFClient PACKAGE = CFClient::Map 1174MODULE = CFPlus PACKAGE = CFPlus::Map
861 1175
862CFClient::Map 1176CFPlus::Map
863new (SV *class, int map_width, int map_height) 1177new (SV *class, int map_width, int map_height)
864 CODE: 1178 CODE:
865 New (0, RETVAL, 1, struct map); 1179 New (0, RETVAL, 1, struct map);
866 RETVAL->x = 0; 1180 RETVAL->x = 0;
867 RETVAL->y = 0; 1181 RETVAL->y = 0;
877 RETVAL->row = 0; 1191 RETVAL->row = 0;
878 OUTPUT: 1192 OUTPUT:
879 RETVAL 1193 RETVAL
880 1194
881void 1195void
882DESTROY (CFClient::Map self) 1196DESTROY (CFPlus::Map self)
883 CODE: 1197 CODE:
884{ 1198{
885 map_clear (self); 1199 map_clear (self);
886 Safefree (self->face); 1200 Safefree (self->face);
1201 Safefree (self->tex);
887 Safefree (self); 1202 Safefree (self);
888} 1203}
889 1204
890void 1205void
891clear (CFClient::Map self) 1206clear (CFPlus::Map self)
892 CODE: 1207 CODE:
893 map_clear (self); 1208 map_clear (self);
894 1209
895void 1210void
896set_face (CFClient::Map self, int face, int texid) 1211set_face (CFPlus::Map self, int face, int texid)
897 CODE: 1212 CODE:
898{ 1213{
899 while (self->faces <= face) 1214 while (self->faces <= face)
900 { 1215 {
901 Append (mapface, self->face, self->faces, self->faces); 1216 Append (mapface, self->face, self->faces, self->faces);
904 1219
905 self->face [face] = texid; 1220 self->face [face] = texid;
906} 1221}
907 1222
908void 1223void
909set_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)
910 CODE: 1225 CODE:
911{ 1226{
912 while (self->texs <= texid) 1227 while (self->texs <= texid)
913 { 1228 {
914 Append (maptex, self->tex, self->texs, self->texs); 1229 Append (maptex, self->tex, self->texs, self->texs);
926 tex->r = r; 1241 tex->r = r;
927 tex->g = g; 1242 tex->g = g;
928 tex->b = b; 1243 tex->b = b;
929 tex->a = a; 1244 tex->a = a;
930 } 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);
931} 1255}
932 1256
933int 1257int
934ox (CFClient::Map self) 1258ox (CFPlus::Map self)
935 ALIAS: 1259 ALIAS:
936 oy = 1 1260 oy = 1
1261 x = 2
1262 y = 3
1263 w = 4
1264 h = 5
937 CODE: 1265 CODE:
938 switch (ix) 1266 switch (ix)
939 { 1267 {
940 case 0: RETVAL = self->ox; break; 1268 case 0: RETVAL = self->ox; break;
941 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;
942 } 1274 }
943 OUTPUT: 1275 OUTPUT:
944 RETVAL 1276 RETVAL
945 1277
946void 1278void
947scroll (CFClient::Map self, int dx, int dy) 1279scroll (CFPlus::Map self, int dx, int dy)
948 CODE: 1280 CODE:
949{ 1281{
950 if (dx > 0) 1282 if (dx > 0)
951 map_blank (self, self->x, self->y, dx - 1, self->h); 1283 map_blank (self, self->x, self->y, dx, self->h);
952 else if (dx < 0) 1284 else if (dx < 0)
953 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);
954 1286
955 if (dy > 0) 1287 if (dy > 0)
956 map_blank (self, self->x, self->y, self->w, dy - 1); 1288 map_blank (self, self->x, self->y, self->w, dy);
957 else if (dy < 0) 1289 else if (dy < 0)
958 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);
959 1291
960 self->ox += dx; self->x += dx; 1292 self->ox += dx; self->x += dx;
961 self->oy += dy; self->y += dy; 1293 self->oy += dy; self->y += dy;
962 1294
963 while (self->y < 0) 1295 while (self->y < 0)
968 self->y += MAP_EXTEND_Y; 1300 self->y += MAP_EXTEND_Y;
969 } 1301 }
970} 1302}
971 1303
972void 1304void
973map1a_update (CFClient::Map self, SV *data_) 1305map1a_update (CFPlus::Map self, SV *data_, int extmap)
974 CODE: 1306 CODE:
975{ 1307{
976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1308 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
977 uint8_t *data_end = (uint8_t *)SvEND (data_); 1309 uint8_t *data_end = (uint8_t *)SvEND (data_);
978 mapcell *cell; 1310 mapcell *cell;
979 int x, y, flags; 1311 int x, y, flags;
980 1312
981 while (data < data_end) 1313 while (data < data_end - 1)
982 { 1314 {
983 flags = (data [0] << 8) + data [1]; data += 2; 1315 flags = (data [0] << 8) + data [1]; data += 2;
984 1316
985 x = ((flags >> 10) & 63) + self->x; 1317 x = self->x + ((flags >> 10) & 63);
986 y = ((flags >> 4) & 63) + self->y; 1318 y = self->y + ((flags >> 4) & 63);
987 1319
988 cell = map_get_cell (self, x, y); 1320 cell = map_get_cell (self, x, y);
989 1321
990 if (flags & 15) 1322 if (flags & 15)
991 { 1323 {
992 if (cell->darkness < 0) 1324 if (!cell->darkness)
993 { 1325 {
1326 memset (cell, 0, sizeof (*cell));
994 cell->darkness = 0; 1327 cell->darkness = 256;
995 cell->face [0] = 0;
996 cell->face [1] = 0;
997 cell->face [2] = 0;
998 } 1328 }
999 1329
1000 cell->darkness = flags & 8 ? *data++ : 255;
1001
1002 //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 }
1003 1371
1004 if (flags & 4) 1372 if (flags & 4)
1005 { 1373 {
1006 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;
1007 } 1375 }
1015 { 1383 {
1016 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;
1017 } 1385 }
1018 } 1386 }
1019 else 1387 else
1020 cell->darkness = -1; 1388 cell->darkness = 0;
1021 } 1389 }
1022} 1390}
1023 1391
1024SV * 1392SV *
1025mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1393mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1026 CODE: 1394 CODE:
1027{ 1395{
1028 int x1, x; 1396 int x1, x;
1029 int y1, y; 1397 int y1, y;
1030 int z; 1398 int z;
1080} 1448}
1081 OUTPUT: 1449 OUTPUT:
1082 RETVAL 1450 RETVAL
1083 1451
1084void 1452void
1085draw (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)
1086 PPCODE: 1454 CODE:
1087{ 1455{
1088 int vx, vy; 1456 int vx, vy;
1089 int x, y, z; 1457 int x, y, z;
1090 int last_name; 1458 int last_name;
1091 mapface face; 1459 mapface face;
1092 int sw4 = (sw + 3) & ~3;
1093 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1094 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1095 1460
1096 memset (darkness, 255, sw4 * sh);
1097 SvPOK_only (darkness_sv);
1098 SvCUR_set (darkness_sv, sw4 * sh);
1099
1100 vx = self->x + (self->w - sw) / 2 - shift_x; 1461 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101 vy = self->y + (self->h - sh) / 2 - shift_y; 1462 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102 1463
1103 /* 1464 /*
1104 int vx = self->vx = self->w >= sw 1465 int vx = self->vx = self->w >= sw
1105 ? self->x + (self->w - sw) / 2 1466 ? self->x + (self->w - sw) / 2
1106 : 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));
1110 : 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));
1111 */ 1472 */
1112 1473
1113 glColor4ub (255, 255, 255, 255); 1474 glColor4ub (255, 255, 255, 255);
1114 1475
1476 glEnable (GL_BLEND);
1115 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1477 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116 glEnable (GL_BLEND);
1117 glEnable (GL_TEXTURE_2D); 1478 glEnable (GL_TEXTURE_2D);
1118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1479 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119 1480
1120 glBegin (GL_QUADS); 1481 glBegin (GL_QUADS);
1121 1482
1130 for (x = 0; x < sw; x++) 1491 for (x = 0; x < sw; x++)
1131 if (row->c0 <= x + vx && x + vx < row->c1) 1492 if (row->c0 <= x + vx && x + vx < row->c1)
1132 { 1493 {
1133 mapcell *cell = row->col + (x + vx - row->c0); 1494 mapcell *cell = row->col + (x + vx - row->c0);
1134 1495
1135 darkness[y * sw4 + x] = cell->darkness < 0
1136 ? 255 - FOW_DARKNESS
1137 : 255 - cell->darkness;
1138
1139 face = cell->face [z]; 1496 face = cell->face [z];
1140 1497
1141 if (face) 1498 if (face && face < self->texs)
1142 { 1499 {
1143 maptex tex = self->tex [face]; 1500 maptex tex = self->tex [face];
1144
1145 int px = (x + 1) * 32 - tex.w; 1501 int px = (x + 1) * 32 - tex.w;
1146 int py = (y + 1) * 32 - tex.h; 1502 int py = (y + 1) * 32 - tex.h;
1147 1503
1148 if (last_name != tex.name) 1504 if (last_name != tex.name)
1149 { 1505 {
1150 glEnd (); 1506 glEnd ();
1151 last_name = tex.name;
1152 glBindTexture (GL_TEXTURE_2D, last_name); 1507 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1153 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1154 } 1509 }
1155 1510
1156 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1511 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1157 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1512 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1158 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);
1159 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1514 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1160 } 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 }
1161 } 1535 }
1162 } 1536 }
1163 1537
1164 glEnd (); 1538 glEnd ();
1165 1539
1166 glDisable (GL_TEXTURE_2D); 1540 glDisable (GL_TEXTURE_2D);
1167 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 }
1168 1667
1169 EXTEND (SP, 3); 1668 EXTEND (SP, 3);
1170 PUSHs (sv_2mortal (newSViv (sw4))); 1669 PUSHs (sv_2mortal (newSViv (sw4)));
1171 PUSHs (sv_2mortal (newSViv (sh))); 1670 PUSHs (sv_2mortal (newSViv (sh)));
1172 PUSHs (darkness_sv); 1671 PUSHs (darkness_sv);
1173} 1672}
1174 1673
1175SV * 1674SV *
1176get_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)
1177 CODE: 1676 CODE:
1178{ 1677{
1179 int x, y, x1, y1; 1678 int x, y, x1, y1;
1180 SV *data_sv = newSV (w * h * 7 + 5); 1679 SV *data_sv = newSV (w * h * 7 + 5);
1181 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1680 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1243} 1742}
1244 OUTPUT: 1743 OUTPUT:
1245 RETVAL 1744 RETVAL
1246 1745
1247void 1746void
1248set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1747set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1249 PPCODE: 1748 PPCODE:
1250{ 1749{
1251 int x, y, z; 1750 int x, y, z;
1252 int w, h; 1751 int w, h;
1253 int x1, y1; 1752 int x1, y1;
1285 1784
1286 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1785 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1287 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1786 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1288 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1787 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1289 1788
1290 if (cell->darkness <= 0) 1789 if (cell->darkness == 0)
1291 { 1790 {
1292 cell->darkness = -1; 1791 cell->darkness = 0;
1293 1792
1294 for (z = 0; z <= 2; z++) 1793 for (z = 0; z <= 2; z++)
1295 { 1794 {
1296 cell->face[z] = face[z]; 1795 cell->face[z] = face[z];
1297 1796
1302 } 1801 }
1303 } 1802 }
1304 } 1803 }
1305} 1804}
1306 1805
1307MODULE = CFClient PACKAGE = CFClient::MixChunk 1806MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308 1807
1309CFClient::MixChunk 1808CFPlus::MixChunk
1310new_from_file (SV *class, char *path) 1809new_from_file (SV *class, char *path)
1311 CODE: 1810 CODE:
1312 RETVAL = Mix_LoadWAV (path); 1811 RETVAL = Mix_LoadWAV (path);
1313 OUTPUT: 1812 OUTPUT:
1314 RETVAL 1813 RETVAL
1315 1814
1316void 1815void
1317DESTROY (CFClient::MixChunk self) 1816DESTROY (CFPlus::MixChunk self)
1318 CODE: 1817 CODE:
1319 Mix_FreeChunk (self); 1818 Mix_FreeChunk (self);
1320 1819
1321int 1820int
1322volume (CFClient::MixChunk self, int volume = -1) 1821volume (CFPlus::MixChunk self, int volume = -1)
1323 CODE: 1822 CODE:
1324 RETVAL = Mix_VolumeChunk (self, volume); 1823 RETVAL = Mix_VolumeChunk (self, volume);
1325 OUTPUT: 1824 OUTPUT:
1326 RETVAL 1825 RETVAL
1327 1826
1328int 1827int
1329play (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)
1330 CODE: 1829 CODE:
1331 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1830 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332 OUTPUT: 1831 OUTPUT:
1333 RETVAL 1832 RETVAL
1334 1833
1335MODULE = CFClient PACKAGE = CFClient::MixMusic 1834MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336 1835
1337int 1836int
1338volume (int volume = -1) 1837volume (int volume = -1)
1339 CODE: 1838 CODE:
1340 RETVAL = Mix_VolumeMusic (volume); 1839 RETVAL = Mix_VolumeMusic (volume);
1341 OUTPUT: 1840 OUTPUT:
1342 RETVAL 1841 RETVAL
1343 1842
1344CFClient::MixMusic 1843CFPlus::MixMusic
1345new_from_file (SV *class, char *path) 1844new_from_file (SV *class, char *path)
1346 CODE: 1845 CODE:
1347 RETVAL = Mix_LoadMUS (path); 1846 RETVAL = Mix_LoadMUS (path);
1348 OUTPUT: 1847 OUTPUT:
1349 RETVAL 1848 RETVAL
1350 1849
1351void 1850void
1352DESTROY (CFClient::MixMusic self) 1851DESTROY (CFPlus::MixMusic self)
1353 CODE: 1852 CODE:
1354 Mix_FreeMusic (self); 1853 Mix_FreeMusic (self);
1355 1854
1356int 1855int
1357play (CFClient::MixMusic self, int loops = -1) 1856play (CFPlus::MixMusic self, int loops = -1)
1358 CODE: 1857 CODE:
1359 RETVAL = Mix_PlayMusic (self, loops); 1858 RETVAL = Mix_PlayMusic (self, loops);
1360 OUTPUT: 1859 OUTPUT:
1361 RETVAL 1860 RETVAL
1362 1861
1363MODULE = CFClient PACKAGE = CFClient::OpenGL 1862MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364 1863
1365BOOT: 1864BOOT:
1366{ 1865{
1367 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1866 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368 static const struct { 1867 static const struct {
1369 const char *name; 1868 const char *name;
1370 IV iv; 1869 IV iv;
1371 } *civ, const_iv[] = { 1870 } *civ, const_iv[] = {
1372# define const_iv(name) { # name, (IV)name } 1871# define const_iv(name) { # name, (IV)name }
1373 const_iv (GL_COLOR_MATERIAL), 1872 const_iv (GL_COLOR_MATERIAL),
1374 const_iv (GL_SMOOTH), 1873 const_iv (GL_SMOOTH),
1375 const_iv (GL_FLAT), 1874 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER), 1875 const_iv (GL_DITHER),
1377 const_iv (GL_BLEND), 1876 const_iv (GL_BLEND),
1877 const_iv (GL_CULL_FACE),
1378 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),
1379 const_iv (GL_AND), 1885 const_iv (GL_AND),
1380 const_iv (GL_ONE), 1886 const_iv (GL_ONE),
1381 const_iv (GL_ZERO), 1887 const_iv (GL_ZERO),
1382 const_iv (GL_SRC_ALPHA), 1888 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE), 1889 const_iv (GL_DST_ALPHA),
1384 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1890 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA), 1891 const_iv (GL_ONE_MINUS_DST_ALPHA),
1892 const_iv (GL_SRC_ALPHA_SATURATE),
1386 const_iv (GL_RGB), 1893 const_iv (GL_RGB),
1387 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),
1388 const_iv (GL_UNSIGNED_BYTE), 1898 const_iv (GL_UNSIGNED_BYTE),
1899 const_iv (GL_UNSIGNED_SHORT),
1900 const_iv (GL_UNSIGNED_INT),
1389 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),
1390 const_iv (GL_FLOAT), 1905 const_iv (GL_FLOAT),
1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1906 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392 const_iv (GL_COMPILE), 1907 const_iv (GL_COMPILE),
1393 const_iv (GL_TEXTURE_1D), 1908 const_iv (GL_TEXTURE_1D),
1394 const_iv (GL_TEXTURE_2D), 1909 const_iv (GL_TEXTURE_2D),
1396 const_iv (GL_TEXTURE_MAG_FILTER), 1911 const_iv (GL_TEXTURE_MAG_FILTER),
1397 const_iv (GL_TEXTURE_MIN_FILTER), 1912 const_iv (GL_TEXTURE_MIN_FILTER),
1398 const_iv (GL_TEXTURE_ENV_MODE), 1913 const_iv (GL_TEXTURE_ENV_MODE),
1399 const_iv (GL_TEXTURE_WRAP_S), 1914 const_iv (GL_TEXTURE_WRAP_S),
1400 const_iv (GL_TEXTURE_WRAP_T), 1915 const_iv (GL_TEXTURE_WRAP_T),
1916 const_iv (GL_REPEAT),
1401 const_iv (GL_CLAMP), 1917 const_iv (GL_CLAMP),
1402 const_iv (GL_REPEAT), 1918 const_iv (GL_CLAMP_TO_EDGE),
1403 const_iv (GL_NEAREST), 1919 const_iv (GL_NEAREST),
1404 const_iv (GL_LINEAR), 1920 const_iv (GL_LINEAR),
1405 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1921 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1922 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1923 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1924 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409 const_iv (GL_GENERATE_MIPMAP), 1925 const_iv (GL_GENERATE_MIPMAP),
1410 const_iv (GL_MODULATE), 1926 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL), 1927 const_iv (GL_DECAL),
1412 const_iv (GL_REPLACE), 1928 const_iv (GL_REPLACE),
1929 const_iv (GL_DEPTH_BUFFER_BIT),
1413 const_iv (GL_COLOR_BUFFER_BIT), 1930 const_iv (GL_COLOR_BUFFER_BIT),
1414 const_iv (GL_PROJECTION), 1931 const_iv (GL_PROJECTION),
1415 const_iv (GL_MODELVIEW), 1932 const_iv (GL_MODELVIEW),
1416 const_iv (GL_COLOR_LOGIC_OP), 1933 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D), 1934 const_iv (GL_SEPARABLE_2D),
1418 const_iv (GL_CONVOLUTION_2D), 1935 const_iv (GL_CONVOLUTION_2D),
1419 const_iv (GL_CONVOLUTION_BORDER_MODE), 1936 const_iv (GL_CONVOLUTION_BORDER_MODE),
1420 const_iv (GL_CONSTANT_BORDER), 1937 const_iv (GL_CONSTANT_BORDER),
1421 const_iv (GL_LINES), 1938 const_iv (GL_LINES),
1939 const_iv (GL_LINE_STRIP),
1940 const_iv (GL_LINE_LOOP),
1422 const_iv (GL_QUADS), 1941 const_iv (GL_QUADS),
1423 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),
1424 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1946 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425 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),
1426# undef const_iv 1952# undef const_iv
1427 }; 1953 };
1428 1954
1429 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; )
1430 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1956 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431} 1957}
1432 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
1433int glGetError () 1980int glGetError ()
1981
1982void glFinish ()
1434 1983
1435void glClear (int mask) 1984void glClear (int mask)
1436 1985
1437void glClearColor (float r, float g, float b, float a = 1.0) 1986void glClearColor (float r, float g, float b, float a = 1.0)
1438 PROTOTYPE: @ 1987 PROTOTYPE: @
1445 1994
1446void glHint (int target, int mode) 1995void glHint (int target, int mode)
1447 1996
1448void glBlendFunc (int sfactor, int dfactor) 1997void glBlendFunc (int sfactor, int dfactor)
1449 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
1450void glLogicOp (int opcode) 2005void glLogicOp (int opcode)
1451 2006
1452void glColorMask (int red, int green, int blue, int alpha) 2007void glColorMask (int red, int green, int blue, int alpha)
1453 2008
1454void glMatrixMode (int mode) 2009void glMatrixMode (int mode)
1457 2012
1458void glPopMatrix () 2013void glPopMatrix ()
1459 2014
1460void glLoadIdentity () 2015void glLoadIdentity ()
1461 2016
2017void glDrawBuffer (int buffer)
2018
2019void glReadBuffer (int buffer)
2020
1462# 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
1463void 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_)
1464 2026
1465void glViewport (int x, int y, int width, int height) 2027void glViewport (int x, int y, int width, int height)
1466 2028
1467void glScissor (int x, int y, int width, int height) 2029void glScissor (int x, int y, int width, int height)
1482 2044
1483void glEnd () 2045void glEnd ()
1484 2046
1485void glColor (float r, float g, float b, float a = 1.0) 2047void glColor (float r, float g, float b, float a = 1.0)
1486 PROTOTYPE: @ 2048 PROTOTYPE: @
2049 ALIAS:
2050 glColor_premultiply = 1
1487 CODE: 2051 CODE:
1488 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);
1489 2071
1490void glVertex (float x, float y, float z = 0.) 2072void glVertex (float x, float y, float z = 0.)
1491 CODE: 2073 CODE:
1492 glVertex3f (x, y, z); 2074 glVertex3f (x, y, z);
1493 2075
1505 2087
1506void glBindTexture (int target, int name) 2088void glBindTexture (int target, int name)
1507 2089
1508void glConvolutionParameter (int target, int pname, float params) 2090void glConvolutionParameter (int target, int pname, float params)
1509 CODE: 2091 CODE:
1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2092 if (gl.ConvolutionParameterf)
2093 gl.ConvolutionParameterf (target, pname, params);
1511 2094
1512void 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)
1513 CODE: 2096 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2097 if (gl.ConvolutionFilter2D)
1515 (target, internalformat, width, height, format, type, data)); 2098 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516 2099
1517void 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)
1518 CODE: 2101 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2102 if (gl.SeparableFilter2D)
1520 (target, internalformat, width, height, format, type, row, column)); 2103 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521 2104
1522void 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)
1523 2106
1524void 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)
1525 2108
1526void glRasterPos (int x, int y) 2109void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527 CODE:
1528 glRasterPos2i (x, y);
1529 2110
1530void 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)
1531 2112
1532int glGenTexture () 2113int glGenTexture ()
1533 CODE: 2114 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines