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.125 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.217 by root, Wed Aug 1 12:43:31 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
30#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
31
17#include <SDL.h> 32#include <SDL.h>
33#include <SDL_thread.h>
18#include <SDL_endian.h> 34#include <SDL_endian.h>
19#include <SDL_image.h> 35#include <SDL_image.h>
20#include <SDL_mixer.h> 36#include <SDL_mixer.h>
21#include <SDL_opengl.h> 37#include <SDL_opengl.h>
22 38
31# include <sys/types.h> 47# include <sys/types.h>
32# include <sys/socket.h> 48# include <sys/socket.h>
33# include <netinet/in.h> 49# include <netinet/in.h>
34# include <netinet/tcp.h> 50# include <netinet/tcp.h>
35# include <inttypes.h> 51# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 52#endif
44 53
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 54#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 55
49#define FOW_DARKNESS 32 56#define FOW_DARKNESS 32
50 57
51#define MAP_EXTEND_X 32 58#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 59#define MAP_EXTEND_Y 512
53 60
54#define MIN_FONT_HEIGHT 10 61#define MIN_FONT_HEIGHT 10
55 62
56#if 1 63#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 64# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 65#else
59# define PARACHUTE 0 66# define PARACHUTE 0
60#endif 67#endif
61 68
69static AV *texture_av;
70
62static struct 71static struct
63{ 72{
64#define GL_FUNC(ptr,name) ptr name; 73#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 74#include "glfunc.h"
66#undef GL_FUNC 75#undef GL_FUNC
67} gl; 76} gl;
68 77
78static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 79gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 80{
71 if (gl.BlendFuncSeparate) 81 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 82 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 83 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 84 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 85 else
76 glBlendFunc (sa, da); 86 glBlendFunc (sa, da);
77} 87}
78 88
89static GLuint
90gen_texture ()
91{
92 GLuint name;
93
94 if (AvFILL (texture_av) >= 0)
95 name = (GLuint)(size_t)av_pop (texture_av);
96 else
97 glGenTextures (1, &name);
98
99 return name;
100}
101
102static void
103del_texture (GLuint name)
104{
105 /* make a half-assed attempt at returning the memory used by the texture */
106 /* textures are frequently being reused by cfplus anyway */
107 /*glBindTexture (GL_TEXTURE_2D, name);*/
108 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
109 av_push (texture_av, (SV *)(size_t)name);
110 glDeleteTextures (1, &name);
111}
112
79#include "texcache.c" 113#include "texcache.c"
80 114
81#include "pango-font.c" 115#include "pango-font.c"
82#include "pango-fontmap.c" 116#include "pango-fontmap.c"
83#include "pango-render.c" 117#include "pango-render.c"
84 118
119typedef IV CFPlus__Channel;
120typedef SDL_RWops *CFPlus__RW;
85typedef Mix_Chunk *CFClient__MixChunk; 121typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 122typedef Mix_Music *CFPlus__MixMusic;
87 123
88typedef PangoFontDescription *CFClient__Font; 124typedef PangoFontDescription *CFPlus__Font;
89 125
90static int 126static int
91shape_attr_p (PangoLayoutRun *run) 127shape_attr_p (PangoLayoutRun *run)
92{ 128{
93 GSList *attrs = run->item->analysis.extra_attrs; 129 GSList *attrs = run->item->analysis.extra_attrs;
107 143
108typedef struct cf_layout { 144typedef struct cf_layout {
109 PangoLayout *pl; 145 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 146 float r, g, b, a; // default color for rgba mode
111 int base_height; 147 int base_height;
112 CFClient__Font font; 148 CFPlus__Font font;
113} *CFClient__Layout; 149} *CFPlus__Layout;
114 150
115static CFClient__Font default_font; 151static CFPlus__Font default_font;
116static PangoContext *opengl_context; 152static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 153static PangoFontMap *opengl_fontmap;
118 154
119static void 155static void
120substitute_func (FcPattern *pattern, gpointer data) 156substitute_func (FcPattern *pattern, gpointer data)
125#endif 161#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 162 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 163}
128 164
129static void 165static void
130layout_update_font (CFClient__Layout self) 166layout_update_font (CFPlus__Layout self)
131{ 167{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 168 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 169 * reasonably well with bitstream vera
134 */ 170 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 171 PangoFontDescription *font = self->font ? self->font : default_font;
139 175
140 pango_layout_set_font_description (self->pl, font); 176 pango_layout_set_font_description (self->pl, font);
141} 177}
142 178
143static void 179static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 180layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 181{
182 PangoRectangle rect;
183
184 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 185 pango_layout_get_extents (self->pl, 0, &rect);
147 186
148 if (!*w) *w = 1; 187 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 188 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 189
151 *w = (*w + 3) & ~3; 190 if (!rect.width) rect.width = 1;
152} 191 if (!rect.height) rect.height = 1;
153 192
193 *w = rect.width;
194 *h = rect.height;
195}
196
197typedef uint16_t tileid;
154typedef uint16_t mapface; 198typedef uint16_t faceid;
155 199
156typedef struct { 200typedef struct {
157 GLint name; 201 int name;
158 int w, h; 202 int w, h;
159 float s, t; 203 float s, t;
160 uint8_t r, g, b, a; 204 uint8_t r, g, b, a;
205 tileid smoothtile;
206 uint8_t smoothlevel;
161} maptex; 207} maptex;
162 208
163typedef struct { 209typedef struct {
210 uint32_t player;
211 tileid tile[3];
164 int16_t darkness; 212 uint16_t darkness;
165 mapface face[3]; 213 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 214} mapcell;
167 215
168typedef struct { 216typedef struct {
169 int32_t c0, c1; 217 int32_t c0, c1;
170 mapcell *col; 218 mapcell *col;
171} maprow; 219} maprow;
172 220
173typedef struct map { 221typedef struct map {
174 int x, y, w, h; 222 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 223 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 224 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 225 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 226
182 int32_t rows; 227 int32_t rows;
183 maprow *row; 228 maprow *row;
184} *CFClient__Map; 229} *CFPlus__Map;
185 230
186static char * 231static char *
187prepend (char *ptr, int sze, int inc) 232prepend (char *ptr, int sze, int inc)
188{ 233{
189 char *p; 234 char *p;
206} 251}
207 252
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 253#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 254#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 255
256static void
257need_facenum (struct map *self, faceid face)
258{
259 while (self->faces <= face)
260 {
261 Append (tileid, self->face2tile, self->faces, self->faces);
262 self->faces *= 2;
263 }
264}
265
266static void
267need_texid (struct map *self, int texid)
268{
269 while (self->texs <= texid)
270 {
271 Append (maptex, self->tex, self->texs, self->texs);
272 self->texs *= 2;
273 }
274}
275
211static maprow * 276static maprow *
212map_get_row (CFClient__Map self, int y) 277map_get_row (CFPlus__Map self, int y)
213{ 278{
214 if (0 > y) 279 if (0 > y)
215 { 280 {
216 int extend = - y + MAP_EXTEND_Y; 281 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 282 Prepend (maprow, self->row, self->rows, extend);
255 320
256 return row->col + (x - row->c0); 321 return row->col + (x - row->c0);
257} 322}
258 323
259static mapcell * 324static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 325map_get_cell (CFPlus__Map self, int x, int y)
261{ 326{
262 return row_get_cell (map_get_row (self, y), x); 327 return row_get_cell (map_get_row (self, y), x);
263} 328}
264 329
265static void 330static void
266map_clear (CFClient__Map self) 331map_clear (CFPlus__Map self)
267{ 332{
268 int r; 333 int r;
269 334
270 for (r = 0; r < self->rows; r++) 335 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 336 Safefree (self->row[r].col);
279 self->row = 0; 344 self->row = 0;
280 self->rows = 0; 345 self->rows = 0;
281} 346}
282 347
283static void 348static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 349map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 350{
286 int x, y; 351 int x, y;
287 maprow *row; 352 maprow *row;
353 mapcell *cell;
288 354
289 for (y = y0; y < y0 + h; y++) 355 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 356 if (y >= 0)
291 { 357 {
292 if (y >= self->rows) 358 if (y >= self->rows)
298 if (x >= row->c0) 364 if (x >= row->c0)
299 { 365 {
300 if (x >= row->c1) 366 if (x >= row->c1)
301 break; 367 break;
302 368
303 row->col[x - row->c0].darkness = -1; 369 cell = row->col + x - row->c0;
370
371 cell->darkness = 0;
372 cell->stat_hp = 0;
373 cell->flags = 0;
374 cell->player = 0;
304 } 375 }
305 } 376 }
377}
378
379typedef struct {
380 tileid tile;
381 uint8_t x, y, level;
382} smooth_key;
383
384static void
385smooth_or_bits (HV *hv, smooth_key *key, IV bits)
386{
387 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
388
389 if (SvIOK (*sv))
390 SvIV_set (*sv, SvIVX (*sv) | bits);
391 else
392 sv_setiv (*sv, bits);
306} 393}
307 394
308static void 395static void
309music_finished (void) 396music_finished (void)
310{ 397{
346 n |= n >> 16; 433 n |= n >> 16;
347 434
348 return n + 1; 435 return n + 1;
349} 436}
350 437
438/* SDL should provide this, really. */
439#define SDLK_MODIFIER_MIN 300
440#define SDLK_MODIFIER_MAX 314
441
442/******************************************************************************/
443
444static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
445static GV *hover_gv;
446
447static int
448within_widget (SV *widget, NV x, NV y)
449{
450 HV *self;
451 SV **svp;
452 NV wx, ww, wy, wh;
453
454 if (!SvROK (widget))
455 return 0;
456
457 self = (HV *)SvRV (widget);
458
459 if (SvTYPE (self) != SVt_PVHV)
460 return 0;
461
462 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
463 if (y < wy)
464 return 0;
465
466 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
467 if (y >= wy + wh)
468 return 0;
469
470 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
471 if (x < wx)
472 return 0;
473
474 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
475 if (x >= wx + ww)
476 return 0;
477
478 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
479 if (!svp || !SvTRUE (*svp))
480 return 0;
481
482 return 1;
483}
484
351MODULE = CFClient PACKAGE = CFClient 485MODULE = CFPlus PACKAGE = CFPlus
352 486
353PROTOTYPES: ENABLE 487PROTOTYPES: ENABLE
354 488
355BOOT: 489BOOT:
356{ 490{
357 HV *stash = gv_stashpv ("CFClient", 1); 491 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 492 static const struct {
359 const char *name; 493 const char *name;
360 IV iv; 494 IV iv;
361 } *civ, const_iv[] = { 495 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 496# define const_iv(name) { # name, (IV)name }
497 const_iv (SDLK_MODIFIER_MIN),
498 const_iv (SDLK_MODIFIER_MAX),
499
363 const_iv (SDL_ACTIVEEVENT), 500 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 501 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 502 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 503 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 504 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 513 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 514 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 515 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 516 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 517 const_iv (SDL_USEREVENT),
518
519 const_iv (SDL_APPINPUTFOCUS),
520 const_iv (SDL_APPMOUSEFOCUS),
521 const_iv (SDL_APPACTIVE),
522
381 const_iv (SDLK_KP0), 523 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 524 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 525 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 526 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 527 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 582 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 583 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 584 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 585 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 586 const_iv (SDLK_UNDO),
587
445 const_iv (KMOD_NONE), 588 const_iv (KMOD_NONE),
589 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 590 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 591 const_iv (KMOD_RSHIFT),
592 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 593 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 594 const_iv (KMOD_RCTRL),
595 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 596 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 597 const_iv (KMOD_RALT),
598 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 599 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 600 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 601 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 602 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 603 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 604# undef const_iv
462 }; 605 };
463 606
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 607 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 608 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
609
610 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
611 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 612}
613
614void
615weaken (SV *rv)
616 PROTOTYPE: $
617 CODE:
618 sv_rvweaken (rv);
619
620int
621in_destruct ()
622 CODE:
623 RETVAL = PL_main_cv == Nullcv;
624 OUTPUT:
625 RETVAL
467 626
468NV floor (NV x) 627NV floor (NV x)
469 628
470NV ceil (NV x) 629NV ceil (NV x)
471 630
476 opengl_fontmap = pango_opengl_font_map_new (); 635 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 636 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 637 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
479} 638}
480 639
640char *
641SDL_GetError ()
642
481int 643int
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 644SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 645
484void 646void
485SDL_Quit () 647SDL_Quit ()
486 648
487void 649void
488SDL_ListModes () 650SDL_ListModes (int rgb, int alpha)
489 PPCODE: 651 PPCODE:
490{ 652{
491 SDL_Rect **m; 653 SDL_Rect **m;
492 654
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 655 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 656 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 657 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 658 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 659
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 660 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 661 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 662
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 663 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 664 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 665 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 666 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 667
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 668 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 669#if SDL_VERSION_ATLEAST(1,2,10)
508 SDL_EnableUNICODE (1); 670 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 671 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672#endif
510 673
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 674 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 675
513 if (m && m != (SDL_Rect **)-1) 676 if (m && m != (SDL_Rect **)-1)
514 while (*m) 677 while (*m)
515 { 678 {
679 if ((*m)->w >= 640 && (*m)->h >= 480)
680 {
516 AV *av = newAV (); 681 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 682 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 683 av_push (av, newSViv ((*m)->h));
684 av_push (av, newSViv (rgb));
685 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 686 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
687 }
520 688
521 ++m; 689 ++m;
522 } 690 }
523} 691}
524 692
525char *
526SDL_GetError ()
527
528int 693int
529SDL_SetVideoMode (int w, int h, int fullscreen) 694SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 695 CODE:
696{
697 SDL_EnableUNICODE (1);
698 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
699
700 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
701 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
702 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
703 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
704
531 RETVAL = !!SDL_SetVideoMode ( 705 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 706 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 707 );
708
534 if (RETVAL) 709 if (RETVAL)
535 { 710 {
711 av_clear (texture_av);
712
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 713 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 714#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 715#include "glfunc.h"
539# undef GL_FUNC 716#undef GL_FUNC
540 } 717 }
718}
541 OUTPUT: 719 OUTPUT:
542 RETVAL 720 RETVAL
543 721
544void 722void
545SDL_GL_SwapBuffers () 723SDL_GL_SwapBuffers ()
546 724
547char * 725char *
548SDL_GetKeyName (int sym) 726SDL_GetKeyName (int sym)
549 727
728int
729SDL_GetAppState ()
730
550void 731void
551SDL_PollEvent () 732poll_events ()
552 PPCODE: 733 PPCODE:
553{ 734{
554 SDL_Event ev; 735 SDL_Event ev;
555 736
556 while (SDL_PollEvent (&ev)) 737 SDL_PumpEvents ();
738 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 739 {
558 HV *hv = newHV (); 740 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 741 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 742
561 switch (ev.type) 743 switch (ev.type)
563 case SDL_KEYDOWN: 745 case SDL_KEYDOWN:
564 case SDL_KEYUP: 746 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 747 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 748 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 749 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
750 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 751 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 752 break;
570 753
571 case SDL_ACTIVEEVENT: 754 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 755 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 756 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 757 break;
575 758
576 case SDL_MOUSEMOTION: 759 case SDL_MOUSEMOTION:
760 {
761 int state = ev.motion.state;
762 int x = ev.motion.x;
763 int y = ev.motion.y;
764 int xrel = ev.motion.xrel;
765 int yrel = ev.motion.yrel;
766
767 /* do simplistic event compression */
768 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
769 && state == ev.motion.state)
770 {
771 xrel += ev.motion.xrel;
772 yrel += ev.motion.yrel;
773 x = ev.motion.x;
774 y = ev.motion.y;
775 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776 }
777
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 778 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 779 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 780 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 781 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 782 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 783 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784 }
584 break; 785 break;
585 786
586 case SDL_MOUSEBUTTONDOWN: 787 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 788 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 789 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 799 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 800 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 801 break;
601 } 802 }
602 803
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 804 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 805 }
605} 806}
606 807
607int 808int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 809Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
609 POSTCALL: 810 POSTCALL:
610 Mix_HookMusicFinished (music_finished); 811 Mix_HookMusicFinished (music_finished);
611 Mix_ChannelFinished (channel_finished); 812 Mix_ChannelFinished (channel_finished);
612 813
613void 814void
614Mix_CloseAudio () 815Mix_CloseAudio ()
615 816
616int 817int
617Mix_AllocateChannels (int numchans = -1) 818Mix_AllocateChannels (int numchans = -1)
618 819
820const char *
821Mix_GetError ()
822
619void 823void
620lowdelay (int fd, int val = 1) 824lowdelay (int fd, int val = 1)
621 CODE: 825 CODE:
826 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
827
828void
829win32_proxy_info ()
830 PPCODE:
831{
622#ifndef _WIN32 832#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 833 char buffer[2048];
834 DWORD buflen;
835
836 EXTEND (SP, 3);
837
838 buflen = sizeof (buffer);
839 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
840 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
841 {
842 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
843
844 buflen = sizeof (buffer);
845 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
846 {
847 PUSHs (newSVpv (buffer, 0));
848
849 buflen = sizeof (buffer);
850 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
851 PUSHs (newSVpv (buffer, 0));
852 }
853 }
624#endif 854#endif
855}
625 856
626void 857void
627add_font (char *file) 858add_font (char *file)
628 CODE: 859 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 860 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 861
631void 862void
632load_image_inline (SV *image_) 863load_image_inline (SV *image_)
633 ALIAS: 864 ALIAS:
634 load_image_file = 1 865 load_image_file = 1
637 STRLEN image_len; 868 STRLEN image_len;
638 char *image = (char *)SvPVbyte (image_, image_len); 869 char *image = (char *)SvPVbyte (image_, image_len);
639 SDL_Surface *surface, *surface2; 870 SDL_Surface *surface, *surface2;
640 SDL_PixelFormat fmt; 871 SDL_PixelFormat fmt;
641 SDL_RWops *rw = ix 872 SDL_RWops *rw = ix
642 ? SDL_RWFromFile (image, "r") 873 ? SDL_RWFromFile (image, "rb")
643 : SDL_RWFromConstMem (image, image_len); 874 : SDL_RWFromConstMem (image, image_len);
644 875
645 if (!rw) 876 if (!rw)
646 croak ("load_image: %s", SDL_GetError ()); 877 croak ("load_image: %s", SDL_GetError ());
647 878
676 907
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 908 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 909
679 assert (surface2->pitch == surface2->w * 4); 910 assert (surface2->pitch == surface2->w * 4);
680 911
912 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 913 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 914 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 915 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 916 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 917 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 918 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 919 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
920 SDL_UnlockSurface (surface2);
690 921
691 SDL_FreeSurface (surface); 922 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 923 SDL_FreeSurface (surface2);
693} 924}
694 925
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 964 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 965#endif
735 _exit (1); 966 _exit (1);
736 967
737void 968void
738_exit (int retval) 969_exit (int retval = 0)
739 CODE: 970 CODE:
971#ifdef WIN32
972 ExitThread (retval); // unclean, please beam me up
973#else
740 _exit (retval); 974 _exit (retval);
975#endif
741 976
977void
978debug ()
979 CODE:
980{
981#if DEBUG
982 VALGRIND_DO_LEAK_CHECK;
983#endif
984}
985
742MODULE = CFClient PACKAGE = CFClient::Font 986MODULE = CFPlus PACKAGE = CFPlus::Font
743 987
744CFClient::Font 988PROTOTYPES: DISABLE
989
990CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 991new_from_file (SV *class, char *path, int id = 0)
746 CODE: 992 CODE:
747{ 993{
748 int count; 994 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 995 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
752} 998}
753 OUTPUT: 999 OUTPUT:
754 RETVAL 1000 RETVAL
755 1001
756void 1002void
757DESTROY (CFClient::Font self) 1003DESTROY (CFPlus::Font self)
758 CODE: 1004 CODE:
759 pango_font_description_free (self); 1005 pango_font_description_free (self);
760 1006
761void 1007void
762make_default (CFClient::Font self) 1008make_default (CFPlus::Font self)
1009 PROTOTYPE: $
763 CODE: 1010 CODE:
764 default_font = self; 1011 default_font = self;
765 1012
766MODULE = CFClient PACKAGE = CFClient::Layout 1013MODULE = CFPlus PACKAGE = CFPlus::Layout
767 1014
1015PROTOTYPES: DISABLE
1016
768void 1017void
769clear_font_cache () 1018reset_glyph_cache ()
1019 PROTOTYPE:
770 CODE: 1020 CODE:
771 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
772 tc_clear (); 1021 tc_clear ();
773 1022
774CFClient::Layout 1023CFPlus::Layout
775new (SV *class, int type = 0) 1024new (SV *class)
776 CODE: 1025 CODE:
777 New (0, RETVAL, 1, struct cf_layout); 1026 New (0, RETVAL, 1, struct cf_layout);
778 1027
779 RETVAL->pl = pango_layout_new (opengl_context); 1028 RETVAL->pl = pango_layout_new (opengl_context);
780 RETVAL->r = 1.; 1029 RETVAL->r = 1.;
788 layout_update_font (RETVAL); 1037 layout_update_font (RETVAL);
789 OUTPUT: 1038 OUTPUT:
790 RETVAL 1039 RETVAL
791 1040
792void 1041void
793DESTROY (CFClient::Layout self) 1042DESTROY (CFPlus::Layout self)
794 CODE: 1043 CODE:
795 g_object_unref (self->pl); 1044 g_object_unref (self->pl);
796 Safefree (self); 1045 Safefree (self);
797 1046
798void 1047void
799set_text (CFClient::Layout self, SV *text_) 1048set_text (CFPlus::Layout self, SV *text_)
800 CODE: 1049 CODE:
801{ 1050{
802 STRLEN textlen; 1051 STRLEN textlen;
803 char *text = SvPVutf8 (text_, textlen); 1052 char *text = SvPVutf8 (text_, textlen);
804 1053
805 pango_layout_set_text (self->pl, text, textlen); 1054 pango_layout_set_text (self->pl, text, textlen);
806} 1055}
807 1056
808void 1057void
809set_markup (CFClient::Layout self, SV *text_) 1058set_markup (CFPlus::Layout self, SV *text_)
810 CODE: 1059 CODE:
811{ 1060{
812 STRLEN textlen; 1061 STRLEN textlen;
813 char *text = SvPVutf8 (text_, textlen); 1062 char *text = SvPVutf8 (text_, textlen);
814 1063
815 pango_layout_set_markup (self->pl, text, textlen); 1064 pango_layout_set_markup (self->pl, text, textlen);
816} 1065}
817 1066
818void 1067void
819set_shapes (CFClient::Layout self, ...) 1068set_shapes (CFPlus::Layout self, ...)
820 CODE: 1069 CODE:
821{ 1070{
822 PangoAttrList *attrs = 0; 1071 PangoAttrList *attrs = 0;
823 const char *text = pango_layout_get_text (self->pl); 1072 const char *text = pango_layout_get_text (self->pl);
824 const char *pos = text; 1073 const char *pos = text;
859 if (attrs) 1108 if (attrs)
860 pango_layout_set_attributes (self->pl, attrs); 1109 pango_layout_set_attributes (self->pl, attrs);
861} 1110}
862 1111
863void 1112void
864get_shapes (CFClient::Layout self) 1113get_shapes (CFPlus::Layout self)
865 PPCODE: 1114 PPCODE:
866{ 1115{
867 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1116 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
868 1117
869 do 1118 do
873 if (run && shape_attr_p (run)) 1122 if (run && shape_attr_p (run))
874 { 1123 {
875 PangoRectangle extents; 1124 PangoRectangle extents;
876 pango_layout_iter_get_run_extents (iter, 0, &extents); 1125 pango_layout_iter_get_run_extents (iter, 0, &extents);
877 1126
1127 EXTEND (SP, 2);
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1128 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
879 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1129 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
880 } 1130 }
881 } 1131 }
882 while (pango_layout_iter_next_run (iter)); 1132 while (pango_layout_iter_next_run (iter));
883 1133
884 pango_layout_iter_free (iter); 1134 pango_layout_iter_free (iter);
885} 1135}
886 1136
887int 1137int
888has_wrapped (CFClient::Layout self) 1138has_wrapped (CFPlus::Layout self)
889 CODE: 1139 CODE:
890{ 1140{
891 int lines = 1; 1141 int lines = 1;
892 const char *text = pango_layout_get_text (self->pl); 1142 const char *text = pango_layout_get_text (self->pl);
893 1143
898} 1148}
899 OUTPUT: 1149 OUTPUT:
900 RETVAL 1150 RETVAL
901 1151
902SV * 1152SV *
903get_text (CFClient::Layout self) 1153get_text (CFPlus::Layout self)
904 CODE: 1154 CODE:
905 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1155 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
906 sv_utf8_decode (RETVAL); 1156 sv_utf8_decode (RETVAL);
907 OUTPUT: 1157 OUTPUT:
908 RETVAL 1158 RETVAL
909 1159
910void 1160void
911set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1161set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
912 CODE: 1162 CODE:
913 self->r = r; 1163 self->r = r;
914 self->g = g; 1164 self->g = g;
915 self->b = b; 1165 self->b = b;
916 self->a = a; 1166 self->a = a;
917 1167
918void 1168void
919set_font (CFClient::Layout self, CFClient::Font font = 0) 1169set_font (CFPlus::Layout self, CFPlus::Font font = 0)
920 CODE: 1170 CODE:
921 if (self->font != font) 1171 if (self->font != font)
922 { 1172 {
923 self->font = font; 1173 self->font = font;
924 layout_update_font (self); 1174 layout_update_font (self);
925 } 1175 }
926 1176
927void 1177void
928set_height (CFClient::Layout self, int base_height) 1178set_height (CFPlus::Layout self, int base_height)
929 CODE: 1179 CODE:
930 if (self->base_height != base_height) 1180 if (self->base_height != base_height)
931 { 1181 {
932 self->base_height = base_height; 1182 self->base_height = base_height;
933 layout_update_font (self); 1183 layout_update_font (self);
934 } 1184 }
935 1185
936void 1186void
937set_width (CFClient::Layout self, int max_width = -1) 1187set_width (CFPlus::Layout self, int max_width = -1)
938 CODE: 1188 CODE:
939 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1189 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
940 1190
941void 1191void
942set_indent (CFClient::Layout self, int indent) 1192set_indent (CFPlus::Layout self, int indent)
943 CODE: 1193 CODE:
944 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1194 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
945 1195
946void 1196void
947set_spacing (CFClient::Layout self, int spacing) 1197set_spacing (CFPlus::Layout self, int spacing)
948 CODE: 1198 CODE:
949 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1199 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
950 1200
951void 1201void
952set_ellipsise (CFClient::Layout self, int ellipsise) 1202set_ellipsise (CFPlus::Layout self, int ellipsise)
953 CODE: 1203 CODE:
954 pango_layout_set_ellipsize (self->pl, 1204 pango_layout_set_ellipsize (self->pl,
955 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1205 ellipsise == 1 ? PANGO_ELLIPSIZE_START
956 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1206 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
957 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1207 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
958 : PANGO_ELLIPSIZE_NONE 1208 : PANGO_ELLIPSIZE_NONE
959 ); 1209 );
960 1210
961void 1211void
962set_single_paragraph_mode (CFClient::Layout self, int spm) 1212set_single_paragraph_mode (CFPlus::Layout self, int spm)
963 CODE: 1213 CODE:
964 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1214 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
965 1215
966void 1216void
967size (CFClient::Layout self) 1217size (CFPlus::Layout self)
968 PPCODE: 1218 PPCODE:
969{ 1219{
970 int w, h; 1220 int w, h;
971 1221
972 layout_get_pixel_size (self, &w, &h); 1222 layout_get_pixel_size (self, &w, &h);
975 PUSHs (sv_2mortal (newSViv (w))); 1225 PUSHs (sv_2mortal (newSViv (w)));
976 PUSHs (sv_2mortal (newSViv (h))); 1226 PUSHs (sv_2mortal (newSViv (h)));
977} 1227}
978 1228
979int 1229int
980descent (CFClient::Layout self) 1230descent (CFPlus::Layout self)
981 CODE: 1231 CODE:
982{ 1232{
983 PangoRectangle rect; 1233 PangoRectangle rect;
984 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1234 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
985 pango_layout_line_get_pixel_extents (line, 0, &rect); 1235 pango_layout_line_get_pixel_extents (line, 0, &rect);
987} 1237}
988 OUTPUT: 1238 OUTPUT:
989 RETVAL 1239 RETVAL
990 1240
991int 1241int
992xy_to_index (CFClient::Layout self, int x, int y) 1242xy_to_index (CFPlus::Layout self, int x, int y)
993 CODE: 1243 CODE:
994{ 1244{
995 int index, trailing; 1245 int index, trailing;
996 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1246 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
997 RETVAL = index; 1247 RETVAL = index + trailing;
998} 1248}
999 OUTPUT: 1249 OUTPUT:
1000 RETVAL 1250 RETVAL
1001 1251
1002void 1252void
1003cursor_pos (CFClient::Layout self, int index) 1253cursor_pos (CFPlus::Layout self, int index)
1004 PPCODE: 1254 PPCODE:
1005{ 1255{
1006 PangoRectangle strong_pos; 1256 PangoRectangle strong_pos;
1007 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1257 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1008 1258
1011 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1261 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1012 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1262 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1013} 1263}
1014 1264
1015void 1265void
1266index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1267 PPCODE:
1268{
1269 int line, x;
1270
1271 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1272 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273
1274 EXTEND (SP, 2);
1275 PUSHs (sv_2mortal (newSViv (line - 1)));
1276 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277}
1278
1279void
1280line_x_to_index (CFPlus::Layout self, int line, int x)
1281 PPCODE:
1282{
1283 PangoLayoutLine *lp;
1284 int index, trailing;
1285
1286 if (line < 0)
1287 XSRETURN_EMPTY;
1288
1289 if (!(lp = pango_layout_get_line (self->pl, line)))
1290 XSRETURN_EMPTY; /* do better */
1291
1292 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293
1294 EXTEND (SP, 2);
1295 if (GIMME_V == G_SCALAR)
1296 PUSHs (sv_2mortal (newSViv (index + trailing)));
1297 else
1298 {
1299 PUSHs (sv_2mortal (newSViv (index)));
1300 PUSHs (sv_2mortal (newSViv (trailing)));
1301 }
1302}
1303
1304void
1016render (CFClient::Layout self, float x, float y) 1305render (CFPlus::Layout self, float x, float y, int flags = 0)
1017 PPCODE: 1306 PPCODE:
1018 pango_opengl_render_layout_subpixel ( 1307 pango_opengl_render_layout_subpixel (
1019 self->pl, 1308 self->pl,
1020 x * PANGO_SCALE, y * PANGO_SCALE, 1309 x * PANGO_SCALE, y * PANGO_SCALE,
1021 self->r, self->g, self->b, self->a 1310 self->r, self->g, self->b, self->a,
1311 flags
1022 ); 1312 );
1023 1313
1024MODULE = CFClient PACKAGE = CFClient::Texture 1314MODULE = CFPlus PACKAGE = CFPlus::Texture
1025 1315
1026void 1316PROTOTYPES: ENABLE
1027pad2pot (SV *data_, SV *w_, SV *h_)
1028 CODE:
1029{
1030 int ow = SvIV (w_);
1031 int oh = SvIV (h_);
1032 1317
1033 if (ow && oh) 1318int minpot (int n)
1319
1320void
1321pad (SV *data_, int ow, int oh, int nw, int nh)
1322 CODE:
1323{
1324 if ((nw != ow || nh != oh) && SvOK (data_))
1034 { 1325 {
1035 int nw = minpot (ow);
1036 int nh = minpot (oh);
1037
1038 if (nw != ow || nh != oh)
1039 {
1040 if (SvOK (data_))
1041 {
1042 STRLEN datalen; 1326 STRLEN datalen;
1043 char *data = SvPVbyte (data_, datalen); 1327 char *data = SvPVbyte (data_, datalen);
1044 int bpp = datalen / (ow * oh); 1328 int bpp = datalen / (ow * oh);
1045 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1329 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1046 1330
1047 SvPOK_only (result_); 1331 SvPOK_only (result_);
1048 SvCUR_set (result_, nw * nh * bpp); 1332 SvCUR_set (result_, nw * nh * bpp);
1049 1333
1050 memset (SvPVX (result_), 0, nw * nh * bpp); 1334 memset (SvPVX (result_), 0, nw * nh * bpp);
1051 while (oh--) 1335 while (oh--)
1052 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1336 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1053 1337
1054 sv_setsv (data_, result_); 1338 sv_setsv (data_, result_);
1055 }
1056
1057 sv_setiv (w_, nw);
1058 sv_setiv (h_, nh);
1059 }
1060 } 1339 }
1061} 1340}
1062 1341
1063void 1342void
1064draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1343draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1107 glDisable (GL_ALPHA_TEST); 1386 glDisable (GL_ALPHA_TEST);
1108 glDisable (GL_BLEND); 1387 glDisable (GL_BLEND);
1109 } 1388 }
1110} 1389}
1111 1390
1391IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1392 CODE:
1393{
1394 GLint width;
1395 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1396 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1397 RETVAL = width > 0;
1398}
1399 OUTPUT:
1400 RETVAL
1401
1112MODULE = CFClient PACKAGE = CFClient::Map 1402MODULE = CFPlus PACKAGE = CFPlus::Map
1113 1403
1114CFClient::Map 1404PROTOTYPES: DISABLE
1115new (SV *class, int map_width, int map_height) 1405
1406CFPlus::Map
1407new (SV *class)
1116 CODE: 1408 CODE:
1117 New (0, RETVAL, 1, struct map); 1409 New (0, RETVAL, 1, struct map);
1118 RETVAL->x = 0; 1410 RETVAL->x = 0;
1119 RETVAL->y = 0; 1411 RETVAL->y = 0;
1120 RETVAL->w = map_width; 1412 RETVAL->w = 0;
1121 RETVAL->h = map_height; 1413 RETVAL->h = 0;
1122 RETVAL->ox = 0; 1414 RETVAL->ox = 0;
1123 RETVAL->oy = 0; 1415 RETVAL->oy = 0;
1124 RETVAL->faces = 8192; 1416 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1125 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1417 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1126 RETVAL->texs = 8192;
1127 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1128 RETVAL->rows = 0; 1418 RETVAL->rows = 0;
1129 RETVAL->row = 0; 1419 RETVAL->row = 0;
1130 OUTPUT: 1420 OUTPUT:
1131 RETVAL 1421 RETVAL
1132 1422
1133void 1423void
1134DESTROY (CFClient::Map self) 1424DESTROY (CFPlus::Map self)
1135 CODE: 1425 CODE:
1136{ 1426{
1137 map_clear (self); 1427 map_clear (self);
1138 Safefree (self->face); 1428 Safefree (self->face2tile);
1139 Safefree (self->tex); 1429 Safefree (self->tex);
1140 Safefree (self); 1430 Safefree (self);
1141} 1431}
1142 1432
1143void 1433void
1434resize (CFPlus::Map self, int map_width, int map_height)
1435 CODE:
1436 self->w = map_width;
1437 self->h = map_height;
1438
1439void
1144clear (CFClient::Map self) 1440clear (CFPlus::Map self)
1145 CODE: 1441 CODE:
1146 map_clear (self); 1442 map_clear (self);
1147 1443
1148void 1444void
1149set_face (CFClient::Map self, int face, int texid) 1445set_tileid (CFPlus::Map self, int face, int tile)
1150 CODE: 1446 CODE:
1151{ 1447{
1152 while (self->faces <= face) 1448 need_facenum (self, face); self->face2tile [face] = tile;
1153 { 1449 need_texid (self, tile);
1154 Append (mapface, self->face, self->faces, self->faces);
1155 self->faces *= 2;
1156 }
1157
1158 self->face [face] = texid;
1159} 1450}
1160 1451
1161void 1452void
1453set_smooth (CFPlus::Map self, int face, int smooth, int level)
1454 CODE:
1455{
1456 tileid texid;
1457 maptex *tex;
1458
1459 if (face < 0 || face >= self->faces)
1460 return;
1461
1462 if (smooth < 0 || smooth >= self->faces)
1463 return;
1464
1465 texid = self->face2tile [face];
1466
1467 if (!texid)
1468 return;
1469
1470 tex = self->tex + texid;
1471 tex->smoothtile = self->face2tile [smooth];
1472 tex->smoothlevel = level;
1473}
1474
1475void
1162set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1476set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1163 CODE: 1477 CODE:
1164{ 1478{
1165 while (self->texs <= texid) 1479 need_texid (self, texid);
1166 {
1167 Append (maptex, self->tex, self->texs, self->texs);
1168 self->texs *= 2;
1169 }
1170 1480
1171 { 1481 {
1172 maptex *tex = self->tex + texid; 1482 maptex *tex = self->tex + texid;
1173 1483
1174 tex->name = name; 1484 tex->name = name;
1191 // from transparent color bleeding and ugly wrapping effects. 1501 // from transparent color bleeding and ugly wrapping effects.
1192 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1502 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1193} 1503}
1194 1504
1195int 1505int
1196ox (CFClient::Map self) 1506ox (CFPlus::Map self)
1197 ALIAS: 1507 ALIAS:
1198 oy = 1 1508 oy = 1
1199 x = 2 1509 x = 2
1200 y = 3 1510 y = 3
1201 w = 4 1511 w = 4
1212 } 1522 }
1213 OUTPUT: 1523 OUTPUT:
1214 RETVAL 1524 RETVAL
1215 1525
1216void 1526void
1217scroll (CFClient::Map self, int dx, int dy) 1527scroll (CFPlus::Map self, int dx, int dy)
1218 CODE: 1528 CODE:
1219{ 1529{
1220 if (dx > 0) 1530 if (dx > 0)
1221 map_blank (self, self->x, self->y, dx - 1, self->h); 1531 map_blank (self, self->x, self->y, dx, self->h);
1222 else if (dx < 0) 1532 else if (dx < 0)
1223 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1533 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1224 1534
1225 if (dy > 0) 1535 if (dy > 0)
1226 map_blank (self, self->x, self->y, self->w, dy - 1); 1536 map_blank (self, self->x, self->y, self->w, dy);
1227 else if (dy < 0) 1537 else if (dy < 0)
1228 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1538 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1229 1539
1230 self->ox += dx; self->x += dx; 1540 self->ox += dx; self->x += dx;
1231 self->oy += dy; self->y += dy; 1541 self->oy += dy; self->y += dy;
1232 1542
1233 while (self->y < 0) 1543 while (self->y < 0)
1238 self->y += MAP_EXTEND_Y; 1548 self->y += MAP_EXTEND_Y;
1239 } 1549 }
1240} 1550}
1241 1551
1242void 1552void
1243map1a_update (CFClient::Map self, SV *data_) 1553map1a_update (CFPlus::Map self, SV *data_, int extmap)
1244 CODE: 1554 CODE:
1245{ 1555{
1246 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1556 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1247 uint8_t *data_end = (uint8_t *)SvEND (data_); 1557 uint8_t *data_end = (uint8_t *)SvEND (data_);
1248 mapcell *cell; 1558 mapcell *cell;
1249 int x, y, flags; 1559 int x, y, flags;
1250 1560
1251 while (data < data_end) 1561 while (data < data_end - 1)
1252 { 1562 {
1253 flags = (data [0] << 8) + data [1]; data += 2; 1563 flags = (data [0] << 8) + data [1]; data += 2;
1254 1564
1255 x = self->x + ((flags >> 10) & 63); 1565 x = self->x + ((flags >> 10) & 63);
1256 y = self->y + ((flags >> 4) & 63); 1566 y = self->y + ((flags >> 4) & 63);
1257 1567
1258 cell = map_get_cell (self, x, y); 1568 cell = map_get_cell (self, x, y);
1259 1569
1260 if (flags & 15) 1570 if (flags & 15)
1261 { 1571 {
1262 if (cell->darkness < 0) 1572 if (!cell->darkness)
1263 { 1573 {
1574 memset (cell, 0, sizeof (*cell));
1264 cell->darkness = 0; 1575 cell->darkness = 256;
1265 cell->face [0] = 0;
1266 cell->face [1] = 0;
1267 cell->face [2] = 0;
1268 } 1576 }
1269 1577
1270 cell->darkness = flags & 8 ? *data++ : 255;
1271
1272 //TODO: don't trust server data to be in-range(!) 1578 //TODO: don't trust server data to be in-range(!)
1579
1580 if (flags & 8)
1581 {
1582 if (extmap)
1583 {
1584 uint8_t ext, cmd;
1585
1586 do
1587 {
1588 ext = *data++;
1589 cmd = ext & 0x3f;
1590
1591 if (cmd < 4)
1592 cell->darkness = 255 - ext * 64 + 1;
1593 else if (cmd == 5) // health
1594 {
1595 cell->stat_width = 1;
1596 cell->stat_hp = *data++;
1597 }
1598 else if (cmd == 6) // monster width
1599 cell->stat_width = *data++ + 1;
1600 else if (cmd == 0x47)
1601 {
1602 if (*data == 4)
1603 ; // decode player count
1604
1605 data += *data + 1;
1606 }
1607 else if (cmd == 8) // cell flags
1608 cell->flags = *data++;
1609 else if (ext & 0x40) // unknown, multibyte => skip
1610 data += *data + 1;
1611 else
1612 data++;
1613 }
1614 while (ext & 0x80);
1615 }
1616 else
1617 cell->darkness = *data++ + 1;
1618 }
1273 1619
1274 if (flags & 4) 1620 if (flags & 4)
1275 { 1621 {
1276 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1622 faceid face = (data [0] << 8) + data [1]; data += 2;
1623 need_facenum (self, face);
1624 cell->tile [0] = self->face2tile [face];
1277 } 1625 }
1278 1626
1279 if (flags & 2) 1627 if (flags & 2)
1280 { 1628 {
1281 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1629 faceid face = (data [0] << 8) + data [1]; data += 2;
1630 need_facenum (self, face);
1631 cell->tile [1] = self->face2tile [face];
1282 } 1632 }
1283 1633
1284 if (flags & 1) 1634 if (flags & 1)
1285 { 1635 {
1286 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1636 faceid face = (data [0] << 8) + data [1]; data += 2;
1637 need_facenum (self, face);
1638 cell->tile [2] = self->face2tile [face];
1287 } 1639 }
1288 } 1640 }
1289 else 1641 else
1290 cell->darkness = -1; 1642 cell->darkness = 0;
1291 } 1643 }
1292} 1644}
1293 1645
1294SV * 1646SV *
1295mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1647mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1296 CODE: 1648 CODE:
1297{ 1649{
1298 int x1, x; 1650 int x1, x;
1299 int y1, y; 1651 int y1, y;
1300 int z; 1652 int z;
1321 { 1673 {
1322 mapcell *cell = row->col + (x - row->c0); 1674 mapcell *cell = row->col + (x - row->c0);
1323 1675
1324 for (z = 0; z <= 0; z++) 1676 for (z = 0; z <= 0; z++)
1325 { 1677 {
1326 mapface face = cell->face [z];
1327
1328 if (face)
1329 {
1330 maptex tex = self->tex [face]; 1678 maptex tex = self->tex [cell->tile [z]];
1331 int a0 = 255 - tex.a; 1679 int a0 = 255 - tex.a;
1332 int a1 = tex.a; 1680 int a1 = tex.a;
1333 1681
1334 r = (r * a0 + tex.r * a1) / 255; 1682 r = (r * a0 + tex.r * a1) / 255;
1335 g = (g * a0 + tex.g * a1) / 255; 1683 g = (g * a0 + tex.g * a1) / 255;
1336 b = (b * a0 + tex.b * a1) / 255; 1684 b = (b * a0 + tex.b * a1) / 255;
1337 a = (a * a0 + tex.a * a1) / 255; 1685 a = (a * a0 + tex.a * a1) / 255;
1338 }
1339 } 1686 }
1340 } 1687 }
1341 1688
1342 *map++ = (r ) 1689 *map++ = (r )
1343 | (g << 8) 1690 | (g << 8)
1350} 1697}
1351 OUTPUT: 1698 OUTPUT:
1352 RETVAL 1699 RETVAL
1353 1700
1354void 1701void
1355draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1702draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1356 CODE: 1703 CODE:
1357{ 1704{
1358 int vx, vy; 1705 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1706 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1708 smooth_key skey;
1359 int x, y, z; 1709 int x, y, z;
1360 int last_name; 1710 int last_name;
1361 mapface face;
1362 1711
1363 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1712 // thats current max. sorry.
1364 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1713 if (sw > 255) sw = 255;
1714 if (sh > 255) sh = 255;
1365 1715
1366 /* 1716 // clear key, in case of extra padding
1367 int vx = self->vx = self->w >= sw 1717 memset (&skey, 0, sizeof (skey));
1368 ? self->x + (self->w - sw) / 2
1369 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1370
1371 int vy = self->vy = self->h >= sh
1372 ? self->y + (self->h - sh) / 2
1373 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1374 */
1375 1718
1376 glColor4ub (255, 255, 255, 255); 1719 glColor4ub (255, 255, 255, 255);
1377 1720
1378 glEnable (GL_BLEND); 1721 glEnable (GL_BLEND);
1379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1722 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1382 1725
1383 glBegin (GL_QUADS); 1726 glBegin (GL_QUADS);
1384 1727
1385 last_name = 0; 1728 last_name = 0;
1386 1729
1730 mx += self->x;
1731 my += self->y;
1732
1733 // first pass: determine smooth_max
1734 // rather ugly, if you ask me
1735 // could also be stored inside mapcell and updated on change
1736 memset (smooth_max, 0, sizeof (smooth_max));
1737
1738 for (y = 0; y < sh; y++)
1739 if (0 <= y + my && y + my < self->rows)
1740 {
1741 maprow *row = self->row + (y + my);
1742
1743 for (x = 0; x < sw; x++)
1744 if (row->c0 <= x + mx && x + mx < row->c1)
1745 {
1746 mapcell *cell = row->col + (x + mx - row->c0);
1747
1748 smooth_max[x + 1][y + 1] =
1749 MAX (self->tex [cell->tile [0]].smoothlevel,
1750 MAX (self->tex [cell->tile [1]].smoothlevel,
1751 self->tex [cell->tile [2]].smoothlevel));
1752 }
1753 }
1754
1387 for (z = 0; z < 3; z++) 1755 for (z = 0; z <= 2; z++)
1756 {
1757 memset (smooth_level, 0, sizeof (smooth_level));
1758
1388 for (y = 0; y < sh; y++) 1759 for (y = 0; y < sh; y++)
1389 if (0 <= y + vy && y + vy < self->rows) 1760 if (0 <= y + my && y + my < self->rows)
1390 { 1761 {
1391 maprow *row = self->row + (y + vy); 1762 maprow *row = self->row + (y + my);
1392 1763
1393 for (x = 0; x < sw; x++) 1764 for (x = 0; x < sw; x++)
1394 if (row->c0 <= x + vx && x + vx < row->c1) 1765 if (row->c0 <= x + mx && x + mx < row->c1)
1395 { 1766 {
1396 mapcell *cell = row->col + (x + vx - row->c0); 1767 mapcell *cell = row->col + (x + mx - row->c0);
1397
1398 face = cell->face [z]; 1768 tileid tile = cell->tile [z];
1399 1769
1400 if (face) 1770 if (tile)
1771 {
1772 maptex tex = self->tex [tile];
1773 int px = (x + 1) * T - tex.w;
1774 int py = (y + 1) * T - tex.h;
1775
1776 // suppressing texture state switches here
1777 // is only moderately effective, but worth the extra effort
1778 if (last_name != tex.name)
1779 {
1780 if (!tex.name)
1781 tex = self->tex [2]; /* missing, replace by noface */
1782
1783 glEnd ();
1784 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1785 glBegin (GL_QUADS);
1786 }
1787
1788 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1789 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793 if (cell->flags && z == 2)
1794 {
1795 if (cell->flags & 1)
1796 {
1797 maptex tex = self->tex [1];
1798 int px = x * T + T * 2 / 32;
1799 int py = y * T - T * 6 / 32;
1800
1801 glEnd ();
1802 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1803 glBegin (GL_QUADS);
1804
1805 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809 }
1810 }
1811
1812 // update smooth hash
1813 if (tex.smoothtile)
1814 {
1815 skey.tile = tex.smoothtile;
1816 skey.level = tex.smoothlevel;
1817
1818 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1819
1820 // add bits to current tile and all neighbours. skey.x|y is
1821 // shifted +1|+1 so we always stay positive.
1822
1823 // bits is ___n cccc CCCC bbbb
1824 // n do not draw borders&corners
1825 // c draw these corners, but...
1826 // C ... not these
1827 // b draw these borders
1828
1829 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1830 // ┃· ·· ·┃ ━━
1831
1832 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1833 // ·· ·· ·┏ ┓·
1834
1835 // full tile
1836 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1837
1838 // borders
1839 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1840 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1841 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1842 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1843
1844 // corners
1845 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1846 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1847 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1848 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1849 }
1850 }
1851 }
1852 }
1853
1854 // go through all smoothlevels, lowest to highest, then draw.
1855 // this is basically counting sort
1856 {
1857 int w, b;
1858
1859 for (w = 0; w < 256 / 32; ++w)
1860 {
1861 uint32_t smask = smooth_level [w];
1862 if (smask)
1863 for (b = 0; b < 32; ++b)
1864 if (smask & (((uint32_t)1) << b))
1401 { 1865 {
1402 maptex tex = self->tex [face]; 1866 int level = (w << 5) | b;
1867 HE *he;
1403 1868
1404 int px = (x + 1) * 32 - tex.w; 1869 hv_iterinit (smooth);
1405 int py = (y + 1) * 32 - tex.h; 1870 while ((he = hv_iternext (smooth)))
1406
1407 if (last_name != tex.name)
1408 { 1871 {
1872 smooth_key *skey = (smooth_key *)HeKEY (he);
1873 IV bits = SvIVX (HeVAL (he));
1874
1875 if (!(bits & 0x1000)
1876 && skey->level == level
1877 && level > smooth_max [skey->x][skey->y])
1878 {
1879 maptex tex = self->tex [skey->tile];
1880 int px = (((int)skey->x) - 1) * T;
1881 int py = (((int)skey->y) - 1) * T;
1882 int border = bits & 15;
1883 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884 float dx = tex.s * .0625f; // 16 images/row
1885 float dy = tex.t * .5f ; // 2 images/column
1886
1887 // this time naively avoiding texture state changes
1888 // save gobs of state changes.
1889 if (last_name != tex.name)
1890 {
1891 if (!tex.name)
1892 continue; // smoothing not yet available
1893
1409 glEnd (); 1894 glEnd ();
1410 last_name = tex.name;
1411 glBindTexture (GL_TEXTURE_2D, last_name); 1895 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1412 glBegin (GL_QUADS); 1896 glBegin (GL_QUADS);
1897 }
1898
1899 if (border)
1900 {
1901 float ox = border * dx;
1902
1903 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1904 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1905 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1906 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1907 }
1908
1909 if (corner)
1910 {
1911 float ox = corner * dx;
1912
1913 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1914 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1915 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1916 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1917 }
1918 }
1413 } 1919 }
1414
1415 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1416 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1417 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1418 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1419 } 1920 }
1420 }
1421 } 1921 }
1922 }
1923
1924 hv_clear (smooth);
1925 }
1422 1926
1423 glEnd (); 1927 glEnd ();
1424 1928
1425 glDisable (GL_TEXTURE_2D); 1929 glDisable (GL_TEXTURE_2D);
1426 glDisable (GL_BLEND); 1930 glDisable (GL_BLEND);
1427}
1428 1931
1932 // top layer: overlays such as the health bar
1933 for (y = 0; y < sh; y++)
1934 if (0 <= y + my && y + my < self->rows)
1935 {
1936 maprow *row = self->row + (y + my);
1937
1938 for (x = 0; x < sw; x++)
1939 if (row->c0 <= x + mx && x + mx < row->c1)
1940 {
1941 mapcell *cell = row->col + (x + mx - row->c0);
1942
1943 int px = x * T;
1944 int py = y * T;
1945
1946 if (cell->stat_hp)
1947 {
1948 int width = cell->stat_width * T;
1949 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1950
1951 glColor3ub (0, 0, 0);
1952 glRectf (px + 1, py - thick - 2,
1953 px + width - 1, py);
1954
1955 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1956 glRectf (px + 2,
1957 py - thick - 1,
1958 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1959 }
1960 }
1961 }
1962}
1963
1429void 1964void
1430draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1965draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1431 CODE: 1966 CODE:
1432{ 1967{
1433 static float color[16][3] = { 1968 static float color[16][3] = {
1434 { 0.00F, 0.00F, 0.00F }, 1969 { 0.00F, 0.00F, 0.00F },
1435 { 1.00F, 1.00F, 1.00F }, 1970 { 1.00F, 1.00F, 1.00F },
1485 glDisable (GL_BLEND); 2020 glDisable (GL_BLEND);
1486 glDisable (GL_TEXTURE_2D); 2021 glDisable (GL_TEXTURE_2D);
1487} 2022}
1488 2023
1489void 2024void
1490fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2025fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1491 PPCODE: 2026 PPCODE:
1492{ 2027{
1493 int vx, vy;
1494 int x, y; 2028 int x, y;
2029 int sw1 = sw + 2;
2030 int sh1 = sh + 2;
2031 int sh3 = sh * 3;
1495 int sw4 = (sw + 3) & ~3; 2032 int sw34 = (sw * 3 + 3) & ~3;
2033 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1496 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2034 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1497 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2035 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1498 2036
1499 memset (darkness, 255, sw4 * sh);
1500 SvPOK_only (darkness_sv); 2037 SvPOK_only (darkness3_sv);
1501 SvCUR_set (darkness_sv, sw4 * sh); 2038 SvCUR_set (darkness3_sv, sw34 * sh3);
1502 2039
1503 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2040 mx += self->x - 1;
1504 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2041 my += self->y - 1;
1505 2042
2043 memset (darkness1, 255, sw1 * sh1);
2044
1506 for (y = 0; y < sh; y++) 2045 for (y = 0; y < sh1; y++)
1507 if (0 <= y + vy && y + vy < self->rows) 2046 if (0 <= y + my && y + my < self->rows)
1508 { 2047 {
1509 maprow *row = self->row + (y + vy); 2048 maprow *row = self->row + (y + my);
1510 2049
1511 for (x = 0; x < sw; x++) 2050 for (x = 0; x < sw1; x++)
1512 if (row->c0 <= x + vx && x + vx < row->c1) 2051 if (row->c0 <= x + mx && x + mx < row->c1)
1513 { 2052 {
1514 mapcell *cell = row->col + (x + vx - row->c0); 2053 mapcell *cell = row->col + (x + mx - row->c0);
1515 2054
1516 darkness[y * sw4 + x] = cell->darkness < 0 2055 darkness1 [y * sw1 + x] = cell->darkness
2056 ? 255 - (cell->darkness - 1)
1517 ? 255 - FOW_DARKNESS 2057 : 255 - FOW_DARKNESS;
1518 : 255 - cell->darkness;
1519 } 2058 }
1520 } 2059 }
1521 2060
2061 for (y = 0; y < sh; ++y)
2062 for (x = 0; x < sw; ++x)
2063 {
2064 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2065 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2066 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2067 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2068 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2069 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2070 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2071 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2072 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2073
2074 uint8_t r11 = (d11 + d21 + d12) / 3;
2075 uint8_t r21 = d21;
2076 uint8_t r31 = (d21 + d31 + d32) / 3;
2077
2078 uint8_t r12 = d12;
2079 uint8_t r22 = d22;
2080 uint8_t r32 = d32;
2081
2082 uint8_t r13 = (d13 + d23 + d12) / 3;
2083 uint8_t r23 = d23;
2084 uint8_t r33 = (d23 + d33 + d32) / 3;
2085
2086 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2087 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2088 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2089 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2090 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2091 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2092 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2093 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2094 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2095 }
2096
2097 free (darkness1);
2098
1522 EXTEND (SP, 3); 2099 EXTEND (SP, 3);
1523 PUSHs (sv_2mortal (newSViv (sw4))); 2100 PUSHs (sv_2mortal (newSViv (sw34)));
1524 PUSHs (sv_2mortal (newSViv (sh))); 2101 PUSHs (sv_2mortal (newSViv (sh3)));
1525 PUSHs (darkness_sv); 2102 PUSHs (darkness3_sv);
1526} 2103}
1527 2104
1528SV * 2105SV *
1529get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2106get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1530 CODE: 2107 CODE:
1531{ 2108{
1532 int x, y, x1, y1; 2109 int x, y, x1, y1;
1533 SV *data_sv = newSV (w * h * 7 + 5); 2110 SV *data_sv = newSV (w * h * 7 + 5);
1534 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2111 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1559 if (row && row->c0 <= x && x < row->c1) 2136 if (row && row->c0 <= x && x < row->c1)
1560 { 2137 {
1561 mapcell *cell = row->col + (x - row->c0); 2138 mapcell *cell = row->col + (x - row->c0);
1562 uint8_t flags = 0; 2139 uint8_t flags = 0;
1563 2140
1564 if (cell->face [0]) flags |= 1; 2141 if (cell->tile [0]) flags |= 1;
1565 if (cell->face [1]) flags |= 2; 2142 if (cell->tile [1]) flags |= 2;
1566 if (cell->face [2]) flags |= 4; 2143 if (cell->tile [2]) flags |= 4;
1567 2144
1568 *data++ = flags; 2145 *data++ = flags;
1569 2146
1570 if (flags & 1) 2147 if (flags & 1)
1571 { 2148 {
2149 tileid tile = cell->tile [0];
1572 *data++ = cell->face [0] >> 8; 2150 *data++ = tile >> 8;
1573 *data++ = cell->face [0]; 2151 *data++ = tile;
1574 } 2152 }
1575 2153
1576 if (flags & 2) 2154 if (flags & 2)
1577 { 2155 {
2156 tileid tile = cell->tile [1];
1578 *data++ = cell->face [1] >> 8; 2157 *data++ = tile >> 8;
1579 *data++ = cell->face [1]; 2158 *data++ = tile;
1580 } 2159 }
1581 2160
1582 if (flags & 4) 2161 if (flags & 4)
1583 { 2162 {
2163 tileid tile = cell->tile [2];
1584 *data++ = cell->face [2] >> 8; 2164 *data++ = tile >> 8;
1585 *data++ = cell->face [2]; 2165 *data++ = tile;
1586 } 2166 }
1587 } 2167 }
1588 else 2168 else
1589 *data++ = 0; 2169 *data++ = 0;
1590 } 2170 }
1596} 2176}
1597 OUTPUT: 2177 OUTPUT:
1598 RETVAL 2178 RETVAL
1599 2179
1600void 2180void
1601set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2181set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1602 PPCODE: 2182 PPCODE:
1603{ 2183{
1604 int x, y, z; 2184 int x, y, z;
1605 int w, h; 2185 int w, h;
1606 int x1, y1; 2186 int x1, y1;
1630 { 2210 {
1631 uint8_t flags = *data++; 2211 uint8_t flags = *data++;
1632 2212
1633 if (flags) 2213 if (flags)
1634 { 2214 {
1635 mapface face[3] = { 0, 0, 0 };
1636
1637 mapcell *cell = row_get_cell (row, x); 2215 mapcell *cell = row_get_cell (row, x);
2216 tileid tile[3] = { 0, 0, 0 };
1638 2217
1639 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2218 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1640 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2219 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1641 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2220 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1642 2221
1643 if (cell->darkness <= 0) 2222 if (cell->darkness == 0)
1644 { 2223 {
1645 cell->darkness = -1; 2224 cell->darkness = 0;
1646 2225
1647 for (z = 0; z <= 2; z++) 2226 for (z = 0; z <= 2; z++)
1648 { 2227 {
1649 cell->face[z] = face[z]; 2228 tileid t = tile [z];
1650 2229
1651 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2230 if (t >= self->texs || (t && !self->tex [t].name))
2231 {
1652 XPUSHs (sv_2mortal (newSViv (face[z]))); 2232 XPUSHs (sv_2mortal (newSViv (t)));
2233 need_texid (self, t);
2234 }
2235
2236 cell->tile [z] = t;
1653 } 2237 }
1654 } 2238 }
1655 } 2239 }
1656 } 2240 }
1657 } 2241 }
1658} 2242}
1659 2243
1660MODULE = CFClient PACKAGE = CFClient::MixChunk 2244MODULE = CFPlus PACKAGE = CFPlus::RW
1661 2245
1662CFClient::MixChunk 2246CFPlus::RW
1663new_from_file (SV *class, char *path) 2247new (SV *class, SV *data_sv)
1664 CODE: 2248 CODE:
1665 RETVAL = Mix_LoadWAV (path); 2249{
2250 STRLEN datalen;
2251 char *data = SvPVbyte (data_sv, datalen);
2252
2253 RETVAL = SDL_RWFromConstMem (data, datalen);
2254}
1666 OUTPUT: 2255 OUTPUT:
1667 RETVAL 2256 RETVAL
1668 2257
2258CFPlus::RW
2259new_from_file (SV *class, const char *path, const char *mode = "rb")
2260 CODE:
2261 RETVAL = SDL_RWFromFile (path, mode);
2262 OUTPUT:
2263 RETVAL
2264
1669void 2265void
2266close (CFPlus::RW self)
2267 CODE:
2268 SDL_RWclose (self);
2269
2270MODULE = CFPlus PACKAGE = CFPlus::Channel
2271
2272PROTOTYPES: DISABLE
2273
2274CFPlus::Channel
2275find ()
2276 CODE:
2277{
2278 RETVAL = Mix_GroupAvailable (-1);
2279
2280 if (RETVAL < 0)
2281 {
2282 RETVAL = Mix_GroupOldest (-1);
2283
2284 if (RETVAL < 0)
2285 XSRETURN_UNDEF;
2286
2287 Mix_HaltChannel (RETVAL);
2288 }
2289
2290 Mix_UnregisterAllEffects (RETVAL);
2291 Mix_Volume (RETVAL, 128);
2292}
2293 OUTPUT:
2294 RETVAL
2295
2296void
2297halt (CFPlus::Channel self)
2298 CODE:
2299 Mix_HaltChannel (self);
2300
2301void
2302expire (CFPlus::Channel self, int ticks = -1)
2303 CODE:
2304 Mix_ExpireChannel (self, ticks);
2305
2306void
2307fade_out (CFPlus::Channel self, int ticks = -1)
2308 CODE:
2309 Mix_FadeOutChannel (self, ticks);
2310
2311int
2312volume (CFPlus::Channel self, int volume)
2313 CODE:
2314 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2315 OUTPUT:
2316 RETVAL
2317
2318void
2319unregister_all_effects (CFPlus::Channel self)
2320 CODE:
2321 Mix_UnregisterAllEffects (self);
2322
2323void
2324set_panning (CFPlus::Channel self, int left, int right)
2325 CODE:
2326 left = CLAMP (left , 0, 255);
2327 right = CLAMP (right, 0, 255);
2328 Mix_SetPanning (self, left, right);
2329
2330void
2331set_distance (CFPlus::Channel self, int distance)
2332 CODE:
2333 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2334
2335void
2336set_position (CFPlus::Channel self, int angle, int distance)
2337 CODE:
2338 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2339
2340void
2341set_reverse_stereo (CFPlus::Channel self, int flip)
2342 CODE:
2343 Mix_SetReverseStereo (self, flip);
2344
2345MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2346
2347PROTOTYPES: DISABLE
2348
2349CFPlus::MixChunk
2350new (SV *class, CFPlus::RW rwops)
2351 CODE:
2352 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2353 OUTPUT:
2354 RETVAL
2355
2356void
1670DESTROY (CFClient::MixChunk self) 2357DESTROY (CFPlus::MixChunk self)
1671 CODE: 2358 CODE:
1672 Mix_FreeChunk (self); 2359 Mix_FreeChunk (self);
1673 2360
1674int 2361int
1675volume (CFClient::MixChunk self, int volume = -1) 2362volume (CFPlus::MixChunk self, int volume = -1)
1676 CODE: 2363 CODE:
2364 if (items > 1)
2365 volume = CLAMP (volume, 0, 128);
1677 RETVAL = Mix_VolumeChunk (self, volume); 2366 RETVAL = Mix_VolumeChunk (self, volume);
1678 OUTPUT: 2367 OUTPUT:
1679 RETVAL 2368 RETVAL
1680 2369
1681int 2370CFPlus::Channel
1682play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2371play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
1683 CODE: 2372 CODE:
2373{
1684 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2374 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2375
2376 if (RETVAL < 0)
2377 XSRETURN_UNDEF;
2378
2379 if (channel < 0)
2380 {
2381 Mix_UnregisterAllEffects (RETVAL);
2382 Mix_Volume (RETVAL, 128);
2383 }
2384}
1685 OUTPUT: 2385 OUTPUT:
1686 RETVAL 2386 RETVAL
1687 2387
1688MODULE = CFClient PACKAGE = CFClient::MixMusic 2388MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1689 2389
1690int 2390int
1691volume (int volume = -1) 2391volume (int volume = -1)
2392 PROTOTYPE: ;$
1692 CODE: 2393 CODE:
2394 if (items > 0)
2395 volume = CLAMP (volume, 0, 128);
1693 RETVAL = Mix_VolumeMusic (volume); 2396 RETVAL = Mix_VolumeMusic (volume);
1694 OUTPUT: 2397 OUTPUT:
1695 RETVAL 2398 RETVAL
1696 2399
2400void
2401fade_out (int ms)
2402 CODE:
2403 Mix_FadeOutMusic (ms);
2404
2405void
2406halt ()
2407 CODE:
2408 Mix_HaltMusic ();
2409
1697CFClient::MixMusic 2410CFPlus::MixMusic
1698new_from_file (SV *class, char *path) 2411new (SV *class, CFPlus::RW rwops)
1699 CODE: 2412 CODE:
1700 RETVAL = Mix_LoadMUS (path); 2413 RETVAL = Mix_LoadMUS_RW (rwops);
1701 OUTPUT: 2414 OUTPUT:
1702 RETVAL 2415 RETVAL
1703 2416
1704void 2417void
1705DESTROY (CFClient::MixMusic self) 2418DESTROY (CFPlus::MixMusic self)
1706 CODE: 2419 CODE:
1707 Mix_FreeMusic (self); 2420 Mix_FreeMusic (self);
1708 2421
1709int 2422int
1710play (CFClient::MixMusic self, int loops = -1) 2423play (CFPlus::MixMusic self, int loops = -1)
1711 CODE: 2424 CODE:
1712 RETVAL = Mix_PlayMusic (self, loops); 2425 RETVAL = Mix_PlayMusic (self, loops);
1713 OUTPUT: 2426 OUTPUT:
1714 RETVAL 2427 RETVAL
1715 2428
2429void
2430fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2431 CODE:
2432 Mix_FadeInMusicPos (self, loops, ms, position);
2433
1716MODULE = CFClient PACKAGE = CFClient::OpenGL 2434MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2435
2436PROTOTYPES: ENABLE
1717 2437
1718BOOT: 2438BOOT:
1719{ 2439{
1720 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2440 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1721 static const struct { 2441 static const struct {
1722 const char *name; 2442 const char *name;
1723 IV iv; 2443 IV iv;
1724 } *civ, const_iv[] = { 2444 } *civ, const_iv[] = {
1725# define const_iv(name) { # name, (IV)name } 2445# define const_iv(name) { # name, (IV)name }
2446 const_iv (GL_VENDOR),
2447 const_iv (GL_VERSION),
2448 const_iv (GL_EXTENSIONS),
1726 const_iv (GL_COLOR_MATERIAL), 2449 const_iv (GL_COLOR_MATERIAL),
1727 const_iv (GL_SMOOTH), 2450 const_iv (GL_SMOOTH),
1728 const_iv (GL_FLAT), 2451 const_iv (GL_FLAT),
1729 const_iv (GL_DITHER), 2452 const_iv (GL_DITHER),
1730 const_iv (GL_BLEND), 2453 const_iv (GL_BLEND),
1734 const_iv (GL_ALPHA_TEST), 2457 const_iv (GL_ALPHA_TEST),
1735 const_iv (GL_NORMALIZE), 2458 const_iv (GL_NORMALIZE),
1736 const_iv (GL_RESCALE_NORMAL), 2459 const_iv (GL_RESCALE_NORMAL),
1737 const_iv (GL_FRONT), 2460 const_iv (GL_FRONT),
1738 const_iv (GL_BACK), 2461 const_iv (GL_BACK),
2462 const_iv (GL_AUX0),
1739 const_iv (GL_AND), 2463 const_iv (GL_AND),
1740 const_iv (GL_ONE), 2464 const_iv (GL_ONE),
1741 const_iv (GL_ZERO), 2465 const_iv (GL_ZERO),
1742 const_iv (GL_SRC_ALPHA), 2466 const_iv (GL_SRC_ALPHA),
1743 const_iv (GL_DST_ALPHA), 2467 const_iv (GL_DST_ALPHA),
1757 const_iv (GL_LUMINANCE), 2481 const_iv (GL_LUMINANCE),
1758 const_iv (GL_LUMINANCE_ALPHA), 2482 const_iv (GL_LUMINANCE_ALPHA),
1759 const_iv (GL_FLOAT), 2483 const_iv (GL_FLOAT),
1760 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2484 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1761 const_iv (GL_COMPILE), 2485 const_iv (GL_COMPILE),
2486 const_iv (GL_PROXY_TEXTURE_1D),
2487 const_iv (GL_PROXY_TEXTURE_2D),
1762 const_iv (GL_TEXTURE_1D), 2488 const_iv (GL_TEXTURE_1D),
1763 const_iv (GL_TEXTURE_2D), 2489 const_iv (GL_TEXTURE_2D),
1764 const_iv (GL_TEXTURE_ENV), 2490 const_iv (GL_TEXTURE_ENV),
1765 const_iv (GL_TEXTURE_MAG_FILTER), 2491 const_iv (GL_TEXTURE_MAG_FILTER),
1766 const_iv (GL_TEXTURE_MIN_FILTER), 2492 const_iv (GL_TEXTURE_MIN_FILTER),
1787 const_iv (GL_COLOR_LOGIC_OP), 2513 const_iv (GL_COLOR_LOGIC_OP),
1788 const_iv (GL_SEPARABLE_2D), 2514 const_iv (GL_SEPARABLE_2D),
1789 const_iv (GL_CONVOLUTION_2D), 2515 const_iv (GL_CONVOLUTION_2D),
1790 const_iv (GL_CONVOLUTION_BORDER_MODE), 2516 const_iv (GL_CONVOLUTION_BORDER_MODE),
1791 const_iv (GL_CONSTANT_BORDER), 2517 const_iv (GL_CONSTANT_BORDER),
2518 const_iv (GL_POINTS),
1792 const_iv (GL_LINES), 2519 const_iv (GL_LINES),
2520 const_iv (GL_LINE_STRIP),
1793 const_iv (GL_LINE_LOOP), 2521 const_iv (GL_LINE_LOOP),
1794 const_iv (GL_QUADS), 2522 const_iv (GL_QUADS),
1795 const_iv (GL_QUAD_STRIP), 2523 const_iv (GL_QUAD_STRIP),
1796 const_iv (GL_TRIANGLES), 2524 const_iv (GL_TRIANGLES),
1797 const_iv (GL_TRIANGLE_STRIP), 2525 const_iv (GL_TRIANGLE_STRIP),
1798 const_iv (GL_TRIANGLE_FAN), 2526 const_iv (GL_TRIANGLE_FAN),
2527 const_iv (GL_POLYGON),
1799 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2528 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2529 const_iv (GL_POINT_SMOOTH_HINT),
2530 const_iv (GL_LINE_SMOOTH_HINT),
2531 const_iv (GL_POLYGON_SMOOTH_HINT),
2532 const_iv (GL_GENERATE_MIPMAP_HINT),
1800 const_iv (GL_FASTEST), 2533 const_iv (GL_FASTEST),
2534 const_iv (GL_DONT_CARE),
2535 const_iv (GL_NICEST),
1801 const_iv (GL_V2F), 2536 const_iv (GL_V2F),
1802 const_iv (GL_V3F), 2537 const_iv (GL_V3F),
1803 const_iv (GL_T2F_V3F), 2538 const_iv (GL_T2F_V3F),
1804 const_iv (GL_T2F_N3F_V3F), 2539 const_iv (GL_T2F_N3F_V3F),
1805# undef const_iv 2540# undef const_iv
1806 }; 2541 };
1807 2542
1808 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2543 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1809 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2544 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2545
2546 texture_av = newAV ();
2547 AvREAL_off (texture_av);
1810} 2548}
1811 2549
1812char * 2550char *
1813gl_vendor () 2551gl_vendor ()
1814 CODE: 2552 CODE:
1828 CODE: 2566 CODE:
1829 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2567 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1830 OUTPUT: 2568 OUTPUT:
1831 RETVAL 2569 RETVAL
1832 2570
2571const char *glGetString (GLenum pname)
2572
2573GLint glGetInteger (GLenum pname)
2574 CODE:
2575 glGetIntegerv (pname, &RETVAL);
2576 OUTPUT:
2577 RETVAL
2578
2579GLdouble glGetDouble (GLenum pname)
2580 CODE:
2581 glGetDoublev (pname, &RETVAL);
2582 OUTPUT:
2583 RETVAL
2584
1833int glGetError () 2585int glGetError ()
1834 2586
1835void glFinish () 2587void glFinish ()
1836 2588
1837void glClear (int mask) 2589void glClear (int mask)
1874# near_ and far_ are due to microsofts buggy "c" compiler 2626# near_ and far_ are due to microsofts buggy "c" compiler
1875void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2627void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1876 2628
1877# near_ and far_ are due to microsofts buggy "c" compiler 2629# near_ and far_ are due to microsofts buggy "c" compiler
1878void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2630void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2631
2632PROTOTYPES: DISABLE
1879 2633
1880void glViewport (int x, int y, int width, int height) 2634void glViewport (int x, int y, int width, int height)
1881 2635
1882void glScissor (int x, int y, int width, int height) 2636void glScissor (int x, int y, int width, int height)
1883 2637
1891 2645
1892void glRotate (float angle, float x, float y, float z) 2646void glRotate (float angle, float x, float y, float z)
1893 CODE: 2647 CODE:
1894 glRotatef (angle, x, y, z); 2648 glRotatef (angle, x, y, z);
1895 2649
1896void glBegin (int mode)
1897
1898void glEnd ()
1899
1900void glColor (float r, float g, float b, float a = 1.0) 2650void glColor (float r, float g, float b, float a = 1.0)
1901 PROTOTYPE: @
1902 ALIAS: 2651 ALIAS:
1903 glColor_premultiply = 1 2652 glColor_premultiply = 1
1904 CODE: 2653 CODE:
1905 if (ix) 2654 if (ix)
1906 { 2655 {
1907 r *= a; 2656 r *= a;
1908 g *= a; 2657 g *= a;
1909 b *= a; 2658 b *= a;
1910 } 2659 }
1911 // microsoft visual "c" rounds instead of truncating... 2660 // microsoft visual "c" rounds instead of truncating...
1912 glColor4ub (MIN ((int)(r * 256.f), 255), 2661 glColor4f (r, g, b, a);
1913 MIN ((int)(g * 256.f), 255),
1914 MIN ((int)(b * 256.f), 255),
1915 MIN ((int)(a * 256.f), 255));
1916
1917void glInterleavedArrays (int format, int stride, char *data)
1918
1919void glDrawElements (int mode, int count, int type, char *indices)
1920
1921# 1.2 void glDrawRangeElements (int mode, int start, int end
1922 2662
1923void glRasterPos (float x, float y, float z = 0.) 2663void glRasterPos (float x, float y, float z = 0.)
1924 CODE: 2664 CODE:
1925 glRasterPos3f (0, 0, z); 2665 glRasterPos3f (0, 0, z);
1926 glBitmap (0, 0, 0, 0, x, y, 0); 2666 glBitmap (0, 0, 0, 0, x, y, 0);
1931 2671
1932void glTexCoord (float s, float t) 2672void glTexCoord (float s, float t)
1933 CODE: 2673 CODE:
1934 glTexCoord2f (s, t); 2674 glTexCoord2f (s, t);
1935 2675
2676void glRect (float x1, float y1, float x2, float y2)
2677 CODE:
2678 glRectf (x1, y1, x2, y2);
2679
2680PROTOTYPES: ENABLE
2681
2682void glBegin (int mode)
2683
2684void glEnd ()
2685
2686void glPointSize (GLfloat size)
2687
2688void glLineWidth (GLfloat width)
2689
2690void glInterleavedArrays (int format, int stride, char *data)
2691
2692void glDrawElements (int mode, int count, int type, char *indices)
2693
2694# 1.2 void glDrawRangeElements (int mode, int start, int end
2695
1936void glTexEnv (int target, int pname, float param) 2696void glTexEnv (int target, int pname, float param)
1937 CODE: 2697 CODE:
1938 glTexEnvf (target, pname, param); 2698 glTexEnvf (target, pname, param);
1939 2699
1940void glTexParameter (int target, int pname, float param) 2700void glTexParameter (int target, int pname, float param)
1962 2722
1963void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2723void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1964 2724
1965void glDrawPixels (int width, int height, int format, int type, char *pixels) 2725void glDrawPixels (int width, int height, int format, int type, char *pixels)
1966 2726
2727void glPixelZoom (float x, float y)
2728
1967void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2729void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1968 2730
1969int glGenTexture () 2731int glGenTexture ()
1970 CODE: 2732 CODE:
1971{ 2733 RETVAL = gen_texture ();
1972 GLuint name;
1973 glGenTextures (1, &name);
1974 RETVAL = name;
1975}
1976 OUTPUT: 2734 OUTPUT:
1977 RETVAL 2735 RETVAL
1978 2736
1979void glDeleteTexture (int name) 2737void glDeleteTexture (int name)
1980 CODE: 2738 CODE:
1981{
1982 GLuint name_ = name;
1983 glDeleteTextures (1, &name_); 2739 del_texture (name);
1984} 2740
1985
1986int glGenList () 2741int glGenList ()
1987 CODE: 2742 CODE:
1988 RETVAL = glGenLists (1); 2743 RETVAL = glGenLists (1);
1989 OUTPUT: 2744 OUTPUT:
1990 RETVAL 2745 RETVAL
1997 2752
1998void glEndList () 2753void glEndList ()
1999 2754
2000void glCallList (int list) 2755void glCallList (int list)
2001 2756
2757MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2002 2758
2759PROTOTYPES: DISABLE
2760
2761void
2762find_widget (SV *self, NV x, NV y)
2763 PPCODE:
2764{
2765 if (within_widget (self, x, y))
2766 XPUSHs (self);
2767}
2768
2769BOOT:
2770{
2771 hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
2772
2773 draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
2774 draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
2775 draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
2776 draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
2777}
2778
2779void
2780draw (SV *self)
2781 CODE:
2782{
2783 HV *hv;
2784 SV **svp;
2785 NV x, y, w, h;
2786 SV *draw_x_sv = GvSV (draw_x_gv);
2787 SV *draw_y_sv = GvSV (draw_y_gv);
2788 SV *draw_w_sv = GvSV (draw_w_gv);
2789 SV *draw_h_sv = GvSV (draw_h_gv);
2790 SV *hover;
2791 double draw_x, draw_y, draw_w, draw_h;
2792
2793 if (!SvROK (self))
2794 croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2795
2796 hv = (HV *)SvRV (self);
2797
2798 if (SvTYPE (hv) != SVt_PVHV)
2799 croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
2800
2801 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2802 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2803
2804 if (!h || !w)
2805 XSRETURN_EMPTY;
2806
2807 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2808 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2809
2810 draw_x = SvNV (draw_x_sv) + x;
2811 draw_y = SvNV (draw_y_sv) + y;
2812
2813 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2814 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2815 XSRETURN_EMPTY;
2816
2817 sv_setnv (draw_x_sv, draw_x);
2818 sv_setnv (draw_y_sv, draw_y);
2819
2820 glPushMatrix ();
2821 glTranslated (x, y, 0);
2822
2823 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2824 {
2825 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2826
2827 if (svp && SvTRUE (*svp))
2828 {
2829 glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
2830 glEnable (GL_BLEND);
2831 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2832 glBegin (GL_QUADS);
2833 glVertex2f (0, 0);
2834 glVertex2f (w, 0);
2835 glVertex2f (w, h);
2836 glVertex2f (0, h);
2837 glEnd ();
2838 glDisable (GL_BLEND);
2839 }
2840 }
2841#if 0
2842 if ($ENV{CFPLUS_DEBUG} & 1) {
2843 glPushMatrix;
2844 glColor 1, 1, 0, 1;
2845 glTranslate 0.375, 0.375;
2846 glBegin GL_LINE_LOOP;
2847 glVertex 0 , 0;
2848 glVertex $self->{w} - 1, 0;
2849 glVertex $self->{w} - 1, $self->{h} - 1;
2850 glVertex 0 , $self->{h} - 1;
2851 glEnd;
2852 glPopMatrix;
2853 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2854 }
2855#endif
2856 PUSHMARK (SP);
2857 XPUSHs (self);
2858 PUTBACK;
2859 call_method ("_draw", G_VOID | G_DISCARD);
2860 SPAGAIN;
2861
2862 glPopMatrix ();
2863
2864 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
2865 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
2866}
2867

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines