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.171 by root, Sun Apr 1 01:19:18 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines