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.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines