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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines