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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines