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.153 by root, Tue Sep 19 22:02:38 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines