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.81 by root, Sun May 14 23:19:14 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines