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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines