ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.71 by root, Fri May 5 19:05:47 2006 UTC vs.
Revision 1.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>
6# pragma warning(disable:4244)
3#endif 7#endif
4 8
5#include "EXTERN.h" 9#include "EXTERN.h"
6#include "perl.h" 10#include "perl.h"
7#include "XSUB.h" 11#include "XSUB.h"
8 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
17#include <math.h>
9#include <string.h> 18#include <string.h>
10#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
11 21
12#include <SDL.h> 22#include <SDL.h>
23#include <SDL_endian.h>
13#include <SDL_image.h> 24#include <SDL_image.h>
14#include <SDL_mixer.h> 25#include <SDL_mixer.h>
15#include <SDL_opengl.h> 26#include <SDL_opengl.h>
16 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
17#include <glib/gmacros.h> 31#include <glib/gmacros.h>
18 32
19#include <pango/pango.h> 33#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 34
23#ifndef _WIN32 35#ifndef _WIN32
24# include <sys/types.h> 36# include <sys/types.h>
25# include <sys/socket.h> 37# include <sys/socket.h>
26# include <netinet/in.h> 38# include <netinet/in.h>
33 typedef signed char int8_t; 45 typedef signed char int8_t;
34 typedef signed short int16_t; 46 typedef signed short int16_t;
35 typedef signed int int32_t; 47 typedef signed int int32_t;
36#endif 48#endif
37 49
38#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39 51
40#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
41 53
42#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
44 56
45#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
46 58
47#define GL_CALL(type,func,args) \ 59#if 0
48 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
49 static int init_; \ 61#else
50 static type fptr_; \ 62# define PARACHUTE 0
51 \ 63#endif
52 if (!init_) \
53 { \
54 init_ = 1; \
55 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56 } \
57 \
58 if (fptr_) \
59 fptr_ args; \
60 }
61 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
62typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
63typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
64 90
65typedef 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}
66 110
67typedef struct cf_layout { 111typedef struct cf_layout {
68 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
69 int base_height; 114 int base_height;
70 CFClient__Font font; 115 CFPlus__Font font;
71} *CFClient__Layout; 116} *CFPlus__Layout;
72 117
73static CFClient__Font default_font; 118static CFPlus__Font default_font;
74static PangoContext *context; 119static PangoContext *opengl_context;
75static PangoFontMap *fontmap; 120static PangoFontMap *opengl_fontmap;
76 121
77static void 122static void
78substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
79{ 124{
80 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
81 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82} 130}
83 131
84static void 132static void
85layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
86{ 134{
87 /* 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
88 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
89 */ 137 */
90 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
94 142
95 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
96} 144}
97 145
98static void 146static void
99layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
100{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
101 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
102 153
103 *w = (*w + 3) & ~3; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104 if (!*w) *w = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105 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;
106} 162}
107 163
108typedef uint16_t mapface; 164typedef uint16_t mapface;
109 165
110typedef struct { 166typedef struct {
113 float s, t; 169 float s, t;
114 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
115} maptex; 171} maptex;
116 172
117typedef struct { 173typedef struct {
118 int16_t darkness; 174 uint32_t player;
119 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
120} mapcell; 178} mapcell;
121 179
122typedef struct { 180typedef struct {
123 int32_t c0, c1; 181 int32_t c0, c1;
124 mapcell *col; 182 mapcell *col;
133 int texs; 191 int texs;
134 maptex *tex; 192 maptex *tex;
135 193
136 int32_t rows; 194 int32_t rows;
137 maprow *row; 195 maprow *row;
138} *CFClient__Map; 196} *CFPlus__Map;
139 197
140static char * 198static char *
141prepend (char *ptr, int sze, int inc) 199prepend (char *ptr, int sze, int inc)
142{ 200{
143 char *p; 201 char *p;
161 219
162#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))
163#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))
164 222
165static maprow * 223static maprow *
166map_get_row (CFClient__Map self, int y) 224map_get_row (CFPlus__Map self, int y)
167{ 225{
168 if (0 > y) 226 if (0 > y)
169 { 227 {
170 int extend = - y + MAP_EXTEND_Y; 228 int extend = - y + MAP_EXTEND_Y;
171 Prepend (maprow, self->row, self->rows, extend); 229 Prepend (maprow, self->row, self->rows, extend);
209 267
210 return row->col + (x - row->c0); 268 return row->col + (x - row->c0);
211} 269}
212 270
213static mapcell * 271static mapcell *
214map_get_cell (CFClient__Map self, int x, int y) 272map_get_cell (CFPlus__Map self, int x, int y)
215{ 273{
216 return row_get_cell (map_get_row (self, y), x); 274 return row_get_cell (map_get_row (self, y), x);
217} 275}
218 276
219static void 277static void
220map_clear (CFClient__Map self) 278map_clear (CFPlus__Map self)
221{ 279{
222 int r; 280 int r;
223 281
224 for (r = 0; r < self->rows; r++) 282 for (r = 0; r < self->rows; r++)
225 Safefree (self->row[r].col); 283 Safefree (self->row[r].col);
233 self->row = 0; 291 self->row = 0;
234 self->rows = 0; 292 self->rows = 0;
235} 293}
236 294
237static void 295static void
238map_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)
239{ 297{
240 int x, y; 298 int x, y;
241 maprow *row; 299 maprow *row;
300 mapcell *cell;
242 301
243 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
244 if (y >= 0) 303 if (y >= 0)
245 { 304 {
246 if (y >= self->rows) 305 if (y >= self->rows)
252 if (x >= row->c0) 311 if (x >= row->c0)
253 { 312 {
254 if (x >= row->c1) 313 if (x >= row->c1)
255 break; 314 break;
256 315
257 row->col[x - row->c0].darkness = -1; 316 cell = row->col + x - row->c0;
317
318 cell->darkness = 0;
319 cell->stat_hp = 0;
258 } 320 }
259 } 321 }
260} 322}
261 323
262static void 324static void
263music_finished () 325music_finished (void)
264{ 326{
265 SDL_UserEvent ev; 327 SDL_UserEvent ev;
266 328
267 ev.type = SDL_USEREVENT; 329 ev.type = SDL_USEREVENT;
268 ev.code = 0; 330 ev.code = 0;
277{ 339{
278 SDL_UserEvent ev; 340 SDL_UserEvent ev;
279 341
280 ev.type = SDL_USEREVENT; 342 ev.type = SDL_USEREVENT;
281 ev.code = 1; 343 ev.code = 1;
282 ev.data1 = channel; 344 ev.data1 = (void *)(long)channel;
283 ev.data2 = 0; 345 ev.data2 = 0;
284 346
285 SDL_PushEvent ((SDL_Event *)&ev); 347 SDL_PushEvent ((SDL_Event *)&ev);
286} 348}
287 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
288MODULE = CFClient PACKAGE = CFClient 367MODULE = CFPlus PACKAGE = CFPlus
289 368
290PROTOTYPES: ENABLE 369PROTOTYPES: ENABLE
291 370
292BOOT: 371BOOT:
293{ 372{
294 HV *stash = gv_stashpv ("CFClient", 1); 373 HV *stash = gv_stashpv ("CFPlus", 1);
295 static const struct { 374 static const struct {
296 const char *name; 375 const char *name;
297 IV iv; 376 IV iv;
298 } *civ, const_iv[] = { 377 } *civ, const_iv[] = {
299# define const_iv(name) { # name, (IV)name } 378# define const_iv(name) { # name, (IV)name }
398# undef const_iv 477# undef const_iv
399 }; 478 };
400 479
401 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; )
402 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 481 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
403
404 fontmap = pango_ft2_font_map_new ();
405 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
406 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
407} 482}
408 483
409int 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
410SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 505SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
411 506
412void 507void
413SDL_Quit () 508SDL_Quit ()
414 509
415void 510void
421 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 516 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
422 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 517 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 518 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 519 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
425 520
521 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
522 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
523
426 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 524 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 525 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 526 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 527 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
430 528
431 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 529 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
530#if SDL_VERSION_ATLEAST(1,2,10)
432 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 531 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
433 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 532 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
533#endif
434 534
435 SDL_EnableUNICODE (1); 535 SDL_EnableUNICODE (1);
436 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 536 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
437 537
438 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 538 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
447 547
448 ++m; 548 ++m;
449 } 549 }
450} 550}
451 551
552char *
553SDL_GetError ()
554
452int 555int
453SDL_SetVideoMode (int w, int h, int fullscreen) 556SDL_SetVideoMode (int w, int h, int fullscreen)
454 CODE: 557 CODE:
455 RETVAL = !!SDL_SetVideoMode ( 558 RETVAL = !!SDL_SetVideoMode (
456 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 559 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
457 ); 560 );
561 if (RETVAL)
562 {
458 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 }
459 OUTPUT: 568 OUTPUT:
460 RETVAL 569 RETVAL
461 570
462void 571void
463SDL_GL_SwapBuffers () 572SDL_GL_SwapBuffers ()
573
574char *
575SDL_GetKeyName (int sym)
464 576
465void 577void
466SDL_PollEvent () 578SDL_PollEvent ()
467 PPCODE: 579 PPCODE:
468{ 580{
487 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 599 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
488 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 600 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
489 break; 601 break;
490 602
491 case SDL_MOUSEMOTION: 603 case SDL_MOUSEMOTION:
604 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
605
492 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 606 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
493 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 607 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
494 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 608 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
495 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 609 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
496 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 610 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
497 break; 611 break;
498 612
499 case SDL_MOUSEBUTTONDOWN: 613 case SDL_MOUSEBUTTONDOWN:
500 case SDL_MOUSEBUTTONUP: 614 case SDL_MOUSEBUTTONUP:
615 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
616
501 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 617 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
502 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 618 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
503 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 619 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
504 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 620 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
505 break; 621 break;
622
623 case SDL_USEREVENT:
624 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
625 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
626 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
627 break;
506 } 628 }
507 629
508 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 630 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
509 } 631 }
510} 632}
511 633
512int 634int
513Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 635Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
514 POSTCALL: 636 POSTCALL:
515 Mix_HookMusicFinished (music_finished); 637 Mix_HookMusicFinished (music_finished);
516 Mix_ChannelFinished (channel_finished); 638 Mix_ChannelFinished (channel_finished);
517 639
518void 640void
526 CODE: 648 CODE:
527#ifndef _WIN32 649#ifndef _WIN32
528 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
529#endif 651#endif
530 652
531char *
532gl_version ()
533 CODE:
534 RETVAL = (char *)glGetString (GL_VERSION);
535 OUTPUT:
536 RETVAL
537
538char *
539gl_extensions ()
540 CODE:
541 RETVAL = (char *)glGetString (GL_EXTENSIONS);
542 OUTPUT:
543 RETVAL
544
545void 653void
546add_font (char *file) 654add_font (char *file)
547 CODE: 655 CODE:
548 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 656 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
549 657
550void 658void
551load_image_inline (SV *image_) 659load_image_inline (SV *image_)
552 ALIAS: 660 ALIAS:
553 load_image_file = 1 661 load_image_file = 1
595 703
596 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 704 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
597 705
598 assert (surface2->pitch == surface2->w * 4); 706 assert (surface2->pitch == surface2->w * 4);
599 707
708 SDL_LockSurface (surface2);
600 EXTEND (SP, 5); 709 EXTEND (SP, 6);
601 PUSHs (sv_2mortal (newSViv (surface2->w))); 710 PUSHs (sv_2mortal (newSViv (surface2->w)));
602 PUSHs (sv_2mortal (newSViv (surface2->h))); 711 PUSHs (sv_2mortal (newSViv (surface2->h)));
603 SDL_LockSurface (surface2);
604 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 712 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
605 SDL_UnlockSurface (surface2);
606 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 713 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
607 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 714 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
608 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 715 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
716 SDL_UnlockSurface (surface2);
609 717
610 SDL_FreeSurface (surface); 718 SDL_FreeSurface (surface);
611 SDL_FreeSurface (surface2); 719 SDL_FreeSurface (surface2);
612} 720}
613 721
637} 745}
638 746
639void 747void
640error (char *message) 748error (char *message)
641 CODE: 749 CODE:
750 fprintf (stderr, "ERROR: %s\n", message);
642#ifdef _WIN32 751#ifdef _WIN32
643 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 752 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
644#else
645 fprintf (stderr, "ERROR: %s\n", message);
646#endif 753#endif
647 754
648void 755void
649fatal (char *message) 756fatal (char *message)
650 CODE: 757 CODE:
758 fprintf (stderr, "FATAL: %s\n", message);
651#ifdef _WIN32 759#ifdef _WIN32
652 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
653#else
654 fprintf (stderr, "FATAL: %s\n", message);
655#endif 761#endif
656 exit (1); 762 _exit (1);
657 763
764void
765_exit (int retval)
766 CODE:
767 _exit (retval);
768
658MODULE = CFClient PACKAGE = CFClient::Font 769MODULE = CFPlus PACKAGE = CFPlus::Font
659 770
660CFClient::Font 771CFPlus::Font
661new_from_file (SV *class, char *path, int id = 0) 772new_from_file (SV *class, char *path, int id = 0)
662 CODE: 773 CODE:
663{ 774{
664 int count; 775 int count;
665 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 776 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
668} 779}
669 OUTPUT: 780 OUTPUT:
670 RETVAL 781 RETVAL
671 782
672void 783void
673DESTROY (CFClient::Font self) 784DESTROY (CFPlus::Font self)
674 CODE: 785 CODE:
675 pango_font_description_free (self); 786 pango_font_description_free (self);
676 787
677void 788void
678make_default (CFClient::Font self) 789make_default (CFPlus::Font self)
679 CODE: 790 CODE:
680 default_font = self; 791 default_font = self;
681 792
682MODULE = CFClient PACKAGE = CFClient::Layout 793MODULE = CFPlus PACKAGE = CFPlus::Layout
683 794
684CFClient::Layout 795void
685new (SV *class, int base_height = MIN_FONT_HEIGHT) 796reset_glyph_cache ()
797 CODE:
798 tc_clear ();
799
800CFPlus::Layout
801new (SV *class)
686 CODE: 802 CODE:
687 New (0, RETVAL, 1, struct cf_layout); 803 New (0, RETVAL, 1, struct cf_layout);
804
688 RETVAL->pl = pango_layout_new (context); 805 RETVAL->pl = pango_layout_new (opengl_context);
689 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;
690 RETVAL->font = 0; 811 RETVAL->font = 0;
812
691 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 813 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
692 pango_layout_set_font_description (RETVAL->pl, default_font); 814 layout_update_font (RETVAL);
693 OUTPUT: 815 OUTPUT:
694 RETVAL 816 RETVAL
695 817
696void 818void
697DESTROY (CFClient::Layout self) 819DESTROY (CFPlus::Layout self)
698 CODE: 820 CODE:
699 g_object_unref (self->pl); 821 g_object_unref (self->pl);
700 Safefree (self); 822 Safefree (self);
701 823
702void 824void
703set_text (CFClient::Layout self, SV *text_) 825set_text (CFPlus::Layout self, SV *text_)
704 CODE: 826 CODE:
705{ 827{
706 STRLEN textlen; 828 STRLEN textlen;
707 char *text = SvPVutf8 (text_, textlen); 829 char *text = SvPVutf8 (text_, textlen);
708 830
709 pango_layout_set_text (self->pl, text, textlen); 831 pango_layout_set_text (self->pl, text, textlen);
710} 832}
711 833
712void 834void
713set_markup (CFClient::Layout self, SV *text_) 835set_markup (CFPlus::Layout self, SV *text_)
714 CODE: 836 CODE:
715{ 837{
716 STRLEN textlen; 838 STRLEN textlen;
717 char *text = SvPVutf8 (text_, textlen); 839 char *text = SvPVutf8 (text_, textlen);
718 840
719 pango_layout_set_markup (self->pl, text, textlen); 841 pango_layout_set_markup (self->pl, text, textlen);
720} 842}
721 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
722SV * 929SV *
723get_text (CFClient::Layout self) 930get_text (CFPlus::Layout self)
724 CODE: 931 CODE:
725 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 932 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
726 SvUTF8_on (RETVAL); 933 sv_utf8_decode (RETVAL);
727 OUTPUT: 934 OUTPUT:
728 RETVAL 935 RETVAL
729 936
730void 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
731set_font (CFClient::Layout self, CFClient::Font font = 0) 946set_font (CFPlus::Layout self, CFPlus::Font font = 0)
732 CODE: 947 CODE:
733 if (self->font != font) 948 if (self->font != font)
734 { 949 {
735 self->font = font; 950 self->font = font;
736 layout_update_font (self); 951 layout_update_font (self);
737 } 952 }
738 953
739void 954void
740set_height (CFClient::Layout self, int base_height) 955set_height (CFPlus::Layout self, int base_height)
741 CODE: 956 CODE:
742 if (self->base_height != base_height) 957 if (self->base_height != base_height)
743 { 958 {
744 self->base_height = base_height; 959 self->base_height = base_height;
745 layout_update_font (self); 960 layout_update_font (self);
746 } 961 }
747 962
748void 963void
749set_width (CFClient::Layout self, int max_width = -1) 964set_width (CFPlus::Layout self, int max_width = -1)
750 CODE: 965 CODE:
751 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);
752 967
753void 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
754size (CFClient::Layout self) 994size (CFPlus::Layout self)
755 PPCODE: 995 PPCODE:
756{ 996{
757 int w, h; 997 int w, h;
758 998
759 layout_get_pixel_size (self, &w, &h); 999 layout_get_pixel_size (self, &w, &h);
762 PUSHs (sv_2mortal (newSViv (w))); 1002 PUSHs (sv_2mortal (newSViv (w)));
763 PUSHs (sv_2mortal (newSViv (h))); 1003 PUSHs (sv_2mortal (newSViv (h)));
764} 1004}
765 1005
766int 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
767xy_to_index (CFClient::Layout self, int x, int y) 1019xy_to_index (CFPlus::Layout self, int x, int y)
768 CODE: 1020 CODE:
769{ 1021{
770 int index, trailing; 1022 int index, trailing;
771 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);
772 RETVAL = index; 1024 RETVAL = index;
773} 1025}
774 OUTPUT: 1026 OUTPUT:
775 RETVAL 1027 RETVAL
776 1028
777void 1029void
778cursor_pos (CFClient::Layout self, int index) 1030cursor_pos (CFPlus::Layout self, int index)
779 PPCODE: 1031 PPCODE:
780{ 1032{
781 PangoRectangle strong_pos; 1033 PangoRectangle strong_pos;
782 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1034 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
783 1035
786 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1038 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
787 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1039 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
788} 1040}
789 1041
790void 1042void
791render (CFClient::Layout self) 1043render (CFPlus::Layout self, float x, float y, int flags = 0)
792 PPCODE: 1044 PPCODE:
793{ 1045 pango_opengl_render_layout_subpixel (
794 SV *retval; 1046 self->pl,
795 int w, h; 1047 x * PANGO_SCALE, y * PANGO_SCALE,
796 FT_Bitmap bitmap; 1048 self->r, self->g, self->b, self->a,
1049 flags
1050 );
797 1051
798 layout_get_pixel_size (self, &w, &h); 1052MODULE = CFPlus PACKAGE = CFPlus::Texture
799 1053
800 retval = newSV (w * h); 1054void
801 SvPOK_only (retval); 1055pad2pot (SV *data_, SV *w_, SV *h_)
802 SvCUR_set (retval, w * h); 1056 CODE:
1057{
1058 int ow = SvIV (w_);
1059 int oh = SvIV (h_);
803 1060
804 bitmap.rows = h; 1061 if (ow && oh)
805 bitmap.width = w; 1062 {
806 bitmap.pitch = w; 1063 int nw = minpot (ow);
807 bitmap.buffer = (unsigned char*)SvPVX (retval); 1064 int nh = minpot (oh);
808 bitmap.num_grays = 256;
809 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
810 1065
811 memset (bitmap.buffer, 0, w * h); 1066 if (nw != ow || nh != oh)
812 1067 {
813 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));
814 1074
815 EXTEND (SP, 3); 1075 SvPOK_only (result_);
816 PUSHs (sv_2mortal (newSViv (w))); 1076 SvCUR_set (result_, nw * nh * bpp);
817 PUSHs (sv_2mortal (newSViv (h)));
818 PUSHs (sv_2mortal (retval));
819}
820 1077
821MODULE = 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);
822 1081
1082 sv_setsv (data_, result_);
1083 }
1084
1085 sv_setiv (w_, nw);
1086 sv_setiv (h_, nh);
1087 }
1088 }
1089}
1090
823void 1091void
824draw_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.)
825 PROTOTYPE: $$$;$$ 1093 PROTOTYPE: $$$;$$
1094 ALIAS:
1095 draw_quad_alpha = 1
1096 draw_quad_alpha_premultiplied = 2
826 CODE: 1097 CODE:
827{ 1098{
828 HV *hv = (HV *)SvRV (self); 1099 HV *hv = (HV *)SvRV (self);
829 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1100 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
830 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1101 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
831 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1102 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
832 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
833 1103
834 if (items < 5) 1104 if (items < 5)
835 { 1105 {
836 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1106 w = SvNV (*hv_fetch (hv, "w", 1, 1));
837 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1107 h = SvNV (*hv_fetch (hv, "h", 1, 1));
838 } 1108 }
839 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
840 glBindTexture (GL_TEXTURE_2D, name); 1124 glBindTexture (GL_TEXTURE_2D, name);
841 if (wrap_mode) { 1125
842 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
843 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
844 }
845 glBegin (GL_QUADS); 1126 glBegin (GL_QUADS);
846 glTexCoord2f (0, 0); glVertex2f (x , y ); 1127 glTexCoord2f (0, 0); glVertex2f (x , y );
847 glTexCoord2f (0, t); glVertex2f (x , y + h); 1128 glTexCoord2f (0, t); glVertex2f (x , y + h);
848 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1129 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
849 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1130 glTexCoord2f (s, 0); glVertex2f (x + w, y );
850 glEnd (); 1131 glEnd ();
851}
852 1132
1133 if (ix)
1134 {
1135 glDisable (GL_ALPHA_TEST);
1136 glDisable (GL_BLEND);
1137 }
1138}
1139
853MODULE = CFClient PACKAGE = CFClient::Map 1140MODULE = CFPlus PACKAGE = CFPlus::Map
854 1141
855CFClient::Map 1142CFPlus::Map
856new (SV *class, int map_width, int map_height) 1143new (SV *class, int map_width, int map_height)
857 CODE: 1144 CODE:
858 New (0, RETVAL, 1, struct map); 1145 New (0, RETVAL, 1, struct map);
859 RETVAL->x = 0; 1146 RETVAL->x = 0;
860 RETVAL->y = 0; 1147 RETVAL->y = 0;
870 RETVAL->row = 0; 1157 RETVAL->row = 0;
871 OUTPUT: 1158 OUTPUT:
872 RETVAL 1159 RETVAL
873 1160
874void 1161void
875DESTROY (CFClient::Map self) 1162DESTROY (CFPlus::Map self)
876 CODE: 1163 CODE:
877{ 1164{
878 map_clear (self); 1165 map_clear (self);
879 Safefree (self->face); 1166 Safefree (self->face);
1167 Safefree (self->tex);
880 Safefree (self); 1168 Safefree (self);
881} 1169}
882 1170
883void 1171void
884clear (CFClient::Map self) 1172clear (CFPlus::Map self)
885 CODE: 1173 CODE:
886 map_clear (self); 1174 map_clear (self);
887 1175
888void 1176void
889set_face (CFClient::Map self, int face, int texid) 1177set_face (CFPlus::Map self, int face, int texid)
890 CODE: 1178 CODE:
891{ 1179{
892 while (self->faces <= face) 1180 while (self->faces <= face)
893 { 1181 {
894 Append (mapface, self->face, self->faces, self->faces); 1182 Append (mapface, self->face, self->faces, self->faces);
897 1185
898 self->face [face] = texid; 1186 self->face [face] = texid;
899} 1187}
900 1188
901void 1189void
902set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 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)
903 CODE: 1191 CODE:
904{ 1192{
905 while (self->texs <= texid) 1193 while (self->texs <= texid)
906 { 1194 {
907 Append (maptex, self->tex, self->texs, self->texs); 1195 Append (maptex, self->tex, self->texs, self->texs);
919 tex->r = r; 1207 tex->r = r;
920 tex->g = g; 1208 tex->g = g;
921 tex->b = b; 1209 tex->b = b;
922 tex->a = a; 1210 tex->a = a;
923 } 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);
924} 1221}
925 1222
926int 1223int
927ox (CFClient::Map self) 1224ox (CFPlus::Map self)
928 ALIAS: 1225 ALIAS:
929 oy = 1 1226 oy = 1
1227 x = 2
1228 y = 3
1229 w = 4
1230 h = 5
930 CODE: 1231 CODE:
931 switch (ix) 1232 switch (ix)
932 { 1233 {
933 case 0: RETVAL = self->ox; break; 1234 case 0: RETVAL = self->ox; break;
934 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;
935 } 1240 }
936 OUTPUT: 1241 OUTPUT:
937 RETVAL 1242 RETVAL
938 1243
939void 1244void
940scroll (CFClient::Map self, int dx, int dy) 1245scroll (CFPlus::Map self, int dx, int dy)
941 CODE: 1246 CODE:
942{ 1247{
943 if (dx > 0) 1248 if (dx > 0)
944 map_blank (self, self->x, self->y, dx - 1, self->h); 1249 map_blank (self, self->x, self->y, dx - 1, self->h);
945 else if (dx < 0) 1250 else if (dx < 0)
961 self->y += MAP_EXTEND_Y; 1266 self->y += MAP_EXTEND_Y;
962 } 1267 }
963} 1268}
964 1269
965void 1270void
966map1a_update (CFClient::Map self, SV *data_) 1271map1a_update (CFPlus::Map self, SV *data_, int extmap)
967 CODE: 1272 CODE:
968{ 1273{
969 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1274 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
970 uint8_t *data_end = (uint8_t *)SvEND (data_); 1275 uint8_t *data_end = (uint8_t *)SvEND (data_);
971 mapcell *cell; 1276 mapcell *cell;
972 int x, y, flags; 1277 int x, y, flags;
973 1278
974 while (data < data_end) 1279 while (data < data_end - 1)
975 { 1280 {
976 flags = (data [0] << 8) + data [1]; data += 2; 1281 flags = (data [0] << 8) + data [1]; data += 2;
977 1282
978 x = ((flags >> 10) & 63) + self->x; 1283 x = self->x + ((flags >> 10) & 63);
979 y = ((flags >> 4) & 63) + self->y; 1284 y = self->y + ((flags >> 4) & 63);
980 1285
981 cell = map_get_cell (self, x, y); 1286 cell = map_get_cell (self, x, y);
982 1287
983 if (flags & 15) 1288 if (flags & 15)
984 { 1289 {
985 if (cell->darkness < 0) 1290 if (!cell->darkness)
986 { 1291 {
987 cell->darkness = 0; 1292 cell->darkness = 256;
988 cell->face [0] = 0; 1293 cell->face [0] = 0;
989 cell->face [1] = 0; 1294 cell->face [1] = 0;
990 cell->face [2] = 0; 1295 cell->face [2] = 0;
991 } 1296 }
992 1297
993 cell->darkness = flags & 8 ? *data++ : 255;
994
995 //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 }
996 1339
997 if (flags & 4) 1340 if (flags & 4)
998 { 1341 {
999 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;
1000 } 1343 }
1008 { 1351 {
1009 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;
1010 } 1353 }
1011 } 1354 }
1012 else 1355 else
1356 {
1013 cell->darkness = -1; 1357 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1014 } 1360 }
1015} 1361}
1016 1362
1017SV * 1363SV *
1018mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1019 CODE: 1365 CODE:
1020{ 1366{
1021 int x1, x; 1367 int x1, x;
1022 int y1, y; 1368 int y1, y;
1023 int z; 1369 int z;
1073} 1419}
1074 OUTPUT: 1420 OUTPUT:
1075 RETVAL 1421 RETVAL
1076 1422
1077void 1423void
1078draw (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)
1079 PPCODE: 1425 CODE:
1080{ 1426{
1081 int vx, vy; 1427 int vx, vy;
1082 int x, y, z; 1428 int x, y, z;
1083 int last_name; 1429 int last_name;
1084 mapface face; 1430 mapface face;
1085 int sw4 = (sw + 3) & ~3;
1086 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1087 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1088 1431
1089 memset (darkness, 255, sw4 * sh);
1090 SvPOK_only (darkness_sv);
1091 SvCUR_set (darkness_sv, sw4 * sh);
1092
1093 vx = self->x + (self->w - sw) / 2 - shift_x; 1432 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1094 vy = self->y + (self->h - sh) / 2 - shift_y; 1433 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1095 1434
1096 /* 1435 /*
1097 int vx = self->vx = self->w >= sw 1436 int vx = self->vx = self->w >= sw
1098 ? self->x + (self->w - sw) / 2 1437 ? self->x + (self->w - sw) / 2
1099 : 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));
1103 : 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));
1104 */ 1443 */
1105 1444
1106 glColor4ub (255, 255, 255, 255); 1445 glColor4ub (255, 255, 255, 255);
1107 1446
1447 glEnable (GL_BLEND);
1108 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1109 glEnable (GL_BLEND);
1110 glEnable (GL_TEXTURE_2D); 1449 glEnable (GL_TEXTURE_2D);
1111 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1450 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1112 1451
1113 glBegin (GL_QUADS); 1452 glBegin (GL_QUADS);
1114 1453
1123 for (x = 0; x < sw; x++) 1462 for (x = 0; x < sw; x++)
1124 if (row->c0 <= x + vx && x + vx < row->c1) 1463 if (row->c0 <= x + vx && x + vx < row->c1)
1125 { 1464 {
1126 mapcell *cell = row->col + (x + vx - row->c0); 1465 mapcell *cell = row->col + (x + vx - row->c0);
1127 1466
1128 darkness[y * sw4 + x] = cell->darkness < 0
1129 ? 255 - FOW_DARKNESS
1130 : 255 - cell->darkness;
1131
1132 face = cell->face [z]; 1467 face = cell->face [z];
1133 1468
1134 if (face) 1469 if (face && face < self->texs)
1135 { 1470 {
1136 maptex tex = self->tex [face]; 1471 maptex tex = self->tex [face];
1137
1138 int px = (x + 1) * 32 - tex.w; 1472 int px = (x + 1) * 32 - tex.w;
1139 int py = (y + 1) * 32 - tex.h; 1473 int py = (y + 1) * 32 - tex.h;
1140 1474
1141 if (last_name != tex.name) 1475 if (last_name != tex.name)
1142 { 1476 {
1143 glEnd (); 1477 glEnd ();
1144 last_name = tex.name;
1145 glBindTexture (GL_TEXTURE_2D, last_name); 1478 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1146 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1147 } 1480 }
1148 1481
1149 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1482 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1150 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1483 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1151 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);
1152 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1485 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1153 } 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 }
1154 } 1506 }
1155 } 1507 }
1156 1508
1157 glEnd (); 1509 glEnd ();
1158 1510
1159 glDisable (GL_TEXTURE_2D); 1511 glDisable (GL_TEXTURE_2D);
1160 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 }
1161 1638
1162 EXTEND (SP, 3); 1639 EXTEND (SP, 3);
1163 PUSHs (sv_2mortal (newSViv (sw4))); 1640 PUSHs (sv_2mortal (newSViv (sw4)));
1164 PUSHs (sv_2mortal (newSViv (sh))); 1641 PUSHs (sv_2mortal (newSViv (sh)));
1165 PUSHs (darkness_sv); 1642 PUSHs (darkness_sv);
1166} 1643}
1167 1644
1168SV * 1645SV *
1169get_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)
1170 CODE: 1647 CODE:
1171{ 1648{
1172 int x, y, x1, y1; 1649 int x, y, x1, y1;
1173 SV *data_sv = newSV (w * h * 7 + 5); 1650 SV *data_sv = newSV (w * h * 7 + 5);
1174 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1651 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1236} 1713}
1237 OUTPUT: 1714 OUTPUT:
1238 RETVAL 1715 RETVAL
1239 1716
1240void 1717void
1241set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1718set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1242 PPCODE: 1719 PPCODE:
1243{ 1720{
1244 int x, y, z; 1721 int x, y, z;
1245 int w, h; 1722 int w, h;
1246 int x1, y1; 1723 int x1, y1;
1278 1755
1279 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1756 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1280 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1757 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1281 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1758 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1282 1759
1283 if (cell->darkness <= 0) 1760 if (cell->darkness == 0)
1284 { 1761 {
1285 cell->darkness = -1; 1762 cell->darkness = 0;
1286 1763
1287 for (z = 0; z <= 2; z++) 1764 for (z = 0; z <= 2; z++)
1288 { 1765 {
1289 cell->face[z] = face[z]; 1766 cell->face[z] = face[z];
1290 1767
1295 } 1772 }
1296 } 1773 }
1297 } 1774 }
1298} 1775}
1299 1776
1300MODULE = CFClient PACKAGE = CFClient::MixChunk 1777MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1301 1778
1302CFClient::MixChunk 1779CFPlus::MixChunk
1303new_from_file (SV *class, char *path) 1780new_from_file (SV *class, char *path)
1304 CODE: 1781 CODE:
1305 RETVAL = Mix_LoadWAV (path); 1782 RETVAL = Mix_LoadWAV (path);
1306 OUTPUT: 1783 OUTPUT:
1307 RETVAL 1784 RETVAL
1308 1785
1309void 1786void
1310DESTROY (CFClient::MixChunk self) 1787DESTROY (CFPlus::MixChunk self)
1311 CODE: 1788 CODE:
1312 Mix_FreeChunk (self); 1789 Mix_FreeChunk (self);
1313 1790
1314int 1791int
1315volume (CFClient::MixChunk self, int volume = -1) 1792volume (CFPlus::MixChunk self, int volume = -1)
1316 CODE: 1793 CODE:
1317 RETVAL = Mix_VolumeChunk (self, volume); 1794 RETVAL = Mix_VolumeChunk (self, volume);
1318 OUTPUT: 1795 OUTPUT:
1319 RETVAL 1796 RETVAL
1320 1797
1321int 1798int
1322play (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)
1323 CODE: 1800 CODE:
1324 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1801 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1325 OUTPUT: 1802 OUTPUT:
1326 RETVAL 1803 RETVAL
1327 1804
1328MODULE = CFClient PACKAGE = CFClient::MixMusic 1805MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1329 1806
1330int 1807int
1331volume (int volume = -1) 1808volume (int volume = -1)
1332 CODE: 1809 CODE:
1333 RETVAL = Mix_VolumeMusic (volume); 1810 RETVAL = Mix_VolumeMusic (volume);
1334 OUTPUT: 1811 OUTPUT:
1335 RETVAL 1812 RETVAL
1336 1813
1337CFClient::MixMusic 1814CFPlus::MixMusic
1338new_from_file (SV *class, char *path) 1815new_from_file (SV *class, char *path)
1339 CODE: 1816 CODE:
1340 RETVAL = Mix_LoadMUS (path); 1817 RETVAL = Mix_LoadMUS (path);
1341 OUTPUT: 1818 OUTPUT:
1342 RETVAL 1819 RETVAL
1343 1820
1344void 1821void
1345DESTROY (CFClient::MixMusic self) 1822DESTROY (CFPlus::MixMusic self)
1346 CODE: 1823 CODE:
1347 Mix_FreeMusic (self); 1824 Mix_FreeMusic (self);
1348 1825
1349int 1826int
1350play (CFClient::MixMusic self, int loops = -1) 1827play (CFPlus::MixMusic self, int loops = -1)
1351 CODE: 1828 CODE:
1352 RETVAL = Mix_PlayMusic (self, loops); 1829 RETVAL = Mix_PlayMusic (self, loops);
1353 OUTPUT: 1830 OUTPUT:
1354 RETVAL 1831 RETVAL
1355 1832
1356MODULE = CFClient PACKAGE = CFClient::OpenGL 1833MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1357 1834
1358BOOT: 1835BOOT:
1359{ 1836{
1360 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1837 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1361 static const struct { 1838 static const struct {
1362 const char *name; 1839 const char *name;
1363 IV iv; 1840 IV iv;
1364 } *civ, const_iv[] = { 1841 } *civ, const_iv[] = {
1365# define const_iv(name) { # name, (IV)name } 1842# define const_iv(name) { # name, (IV)name }
1366 const_iv (GL_COLOR_MATERIAL), 1843 const_iv (GL_COLOR_MATERIAL),
1367 const_iv (GL_SMOOTH), 1844 const_iv (GL_SMOOTH),
1368 const_iv (GL_FLAT), 1845 const_iv (GL_FLAT),
1369 const_iv (GL_DITHER), 1846 const_iv (GL_DITHER),
1370 const_iv (GL_BLEND), 1847 const_iv (GL_BLEND),
1848 const_iv (GL_CULL_FACE),
1371 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),
1372 const_iv (GL_AND), 1856 const_iv (GL_AND),
1373 const_iv (GL_ONE), 1857 const_iv (GL_ONE),
1374 const_iv (GL_ZERO), 1858 const_iv (GL_ZERO),
1375 const_iv (GL_SRC_ALPHA), 1859 const_iv (GL_SRC_ALPHA),
1376 const_iv (GL_SRC_ALPHA_SATURATE), 1860 const_iv (GL_DST_ALPHA),
1377 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1861 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378 const_iv (GL_ONE_MINUS_DST_ALPHA), 1862 const_iv (GL_ONE_MINUS_DST_ALPHA),
1863 const_iv (GL_SRC_ALPHA_SATURATE),
1379 const_iv (GL_RGB), 1864 const_iv (GL_RGB),
1380 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),
1381 const_iv (GL_UNSIGNED_BYTE), 1869 const_iv (GL_UNSIGNED_BYTE),
1870 const_iv (GL_UNSIGNED_SHORT),
1871 const_iv (GL_UNSIGNED_INT),
1382 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),
1383 const_iv (GL_FLOAT), 1876 const_iv (GL_FLOAT),
1384 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1877 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1385 const_iv (GL_COMPILE), 1878 const_iv (GL_COMPILE),
1386 const_iv (GL_TEXTURE_1D), 1879 const_iv (GL_TEXTURE_1D),
1387 const_iv (GL_TEXTURE_2D), 1880 const_iv (GL_TEXTURE_2D),
1389 const_iv (GL_TEXTURE_MAG_FILTER), 1882 const_iv (GL_TEXTURE_MAG_FILTER),
1390 const_iv (GL_TEXTURE_MIN_FILTER), 1883 const_iv (GL_TEXTURE_MIN_FILTER),
1391 const_iv (GL_TEXTURE_ENV_MODE), 1884 const_iv (GL_TEXTURE_ENV_MODE),
1392 const_iv (GL_TEXTURE_WRAP_S), 1885 const_iv (GL_TEXTURE_WRAP_S),
1393 const_iv (GL_TEXTURE_WRAP_T), 1886 const_iv (GL_TEXTURE_WRAP_T),
1887 const_iv (GL_REPEAT),
1394 const_iv (GL_CLAMP), 1888 const_iv (GL_CLAMP),
1395 const_iv (GL_REPEAT), 1889 const_iv (GL_CLAMP_TO_EDGE),
1396 const_iv (GL_NEAREST), 1890 const_iv (GL_NEAREST),
1397 const_iv (GL_LINEAR), 1891 const_iv (GL_LINEAR),
1398 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1892 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1399 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1893 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1400 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1894 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1401 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1895 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1402 const_iv (GL_GENERATE_MIPMAP), 1896 const_iv (GL_GENERATE_MIPMAP),
1403 const_iv (GL_MODULATE), 1897 const_iv (GL_MODULATE),
1404 const_iv (GL_DECAL), 1898 const_iv (GL_DECAL),
1405 const_iv (GL_REPLACE), 1899 const_iv (GL_REPLACE),
1900 const_iv (GL_DEPTH_BUFFER_BIT),
1406 const_iv (GL_COLOR_BUFFER_BIT), 1901 const_iv (GL_COLOR_BUFFER_BIT),
1407 const_iv (GL_PROJECTION), 1902 const_iv (GL_PROJECTION),
1408 const_iv (GL_MODELVIEW), 1903 const_iv (GL_MODELVIEW),
1409 const_iv (GL_COLOR_LOGIC_OP), 1904 const_iv (GL_COLOR_LOGIC_OP),
1410 const_iv (GL_SEPARABLE_2D), 1905 const_iv (GL_SEPARABLE_2D),
1411 const_iv (GL_CONVOLUTION_2D), 1906 const_iv (GL_CONVOLUTION_2D),
1412 const_iv (GL_CONVOLUTION_BORDER_MODE), 1907 const_iv (GL_CONVOLUTION_BORDER_MODE),
1413 const_iv (GL_CONSTANT_BORDER), 1908 const_iv (GL_CONSTANT_BORDER),
1414 const_iv (GL_LINES), 1909 const_iv (GL_LINES),
1910 const_iv (GL_LINE_STRIP),
1911 const_iv (GL_LINE_LOOP),
1415 const_iv (GL_QUADS), 1912 const_iv (GL_QUADS),
1416 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),
1417 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1917 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1418 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),
1419# undef const_iv 1923# undef const_iv
1420 }; 1924 };
1421 1925
1422 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; )
1423 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1927 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1424} 1928}
1425 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
1426int glGetError () 1951int glGetError ()
1952
1953void glFinish ()
1427 1954
1428void glClear (int mask) 1955void glClear (int mask)
1429 1956
1430void glClearColor (float r, float g, float b, float a = 1.0) 1957void glClearColor (float r, float g, float b, float a = 1.0)
1431 PROTOTYPE: @ 1958 PROTOTYPE: @
1438 1965
1439void glHint (int target, int mode) 1966void glHint (int target, int mode)
1440 1967
1441void glBlendFunc (int sfactor, int dfactor) 1968void glBlendFunc (int sfactor, int dfactor)
1442 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
1443void glLogicOp (int opcode) 1976void glLogicOp (int opcode)
1444 1977
1445void glColorMask (int red, int green, int blue, int alpha) 1978void glColorMask (int red, int green, int blue, int alpha)
1446 1979
1447void glMatrixMode (int mode) 1980void glMatrixMode (int mode)
1450 1983
1451void glPopMatrix () 1984void glPopMatrix ()
1452 1985
1453void glLoadIdentity () 1986void glLoadIdentity ()
1454 1987
1988void glDrawBuffer (int buffer)
1989
1990void glReadBuffer (int buffer)
1991
1455# 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
1456void 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_)
1457 1997
1458void glViewport (int x, int y, int width, int height) 1998void glViewport (int x, int y, int width, int height)
1459 1999
1460void glScissor (int x, int y, int width, int height) 2000void glScissor (int x, int y, int width, int height)
1475 2015
1476void glEnd () 2016void glEnd ()
1477 2017
1478void glColor (float r, float g, float b, float a = 1.0) 2018void glColor (float r, float g, float b, float a = 1.0)
1479 PROTOTYPE: @ 2019 PROTOTYPE: @
2020 ALIAS:
2021 glColor_premultiply = 1
1480 CODE: 2022 CODE:
1481 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);
1482 2042
1483void glVertex (float x, float y, float z = 0.) 2043void glVertex (float x, float y, float z = 0.)
1484 CODE: 2044 CODE:
1485 glVertex3f (x, y, z); 2045 glVertex3f (x, y, z);
1486 2046
1498 2058
1499void glBindTexture (int target, int name) 2059void glBindTexture (int target, int name)
1500 2060
1501void glConvolutionParameter (int target, int pname, float params) 2061void glConvolutionParameter (int target, int pname, float params)
1502 CODE: 2062 CODE:
1503 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 2063 if (gl.ConvolutionParameterf)
2064 gl.ConvolutionParameterf (target, pname, params);
1504 2065
1505void 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)
1506 CODE: 2067 CODE:
1507 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 2068 if (gl.ConvolutionFilter2D)
1508 (target, internalformat, width, height, format, type, data)); 2069 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1509 2070
1510void 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)
1511 CODE: 2072 CODE:
1512 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 2073 if (gl.SeparableFilter2D)
1513 (target, internalformat, width, height, format, type, row, column)); 2074 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1514 2075
1515void 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)
1516 2077
1517void 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)
1518 2079
1519void glRasterPos (int x, int y) 2080void glDrawPixels (int width, int height, int format, int type, char *pixels)
1520 CODE:
1521 glRasterPos2i (x, y);
1522 2081
1523void 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)
1524 2083
1525int glGenTexture () 2084int glGenTexture ()
1526 CODE: 2085 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines