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.129 by root, Wed Jul 12 17:20:04 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 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
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# 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 50#endif
44 51
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
57# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 63#else
59# define PARACHUTE 0 64# define PARACHUTE 0
60#endif 65#endif
61 66
67static AV *texture_av;
68
62static struct 69static struct
63{ 70{
64#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 72#include "glfunc.h"
66#undef GL_FUNC 73#undef GL_FUNC
67} gl; 74} gl;
68 75
76static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 78{
71 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 83 else
76 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
77} 85}
78 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
79#include "texcache.c" 111#include "texcache.c"
80 112
81#include "pango-font.c" 113#include "pango-font.c"
82#include "pango-fontmap.c" 114#include "pango-fontmap.c"
83#include "pango-render.c" 115#include "pango-render.c"
84 116
85typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
87 119
88typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
89 121
90static int 122static int
91shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
92{ 124{
93 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
107 139
108typedef struct cf_layout { 140typedef struct cf_layout {
109 PangoLayout *pl; 141 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
111 int base_height; 143 int base_height;
112 CFClient__Font font; 144 CFPlus__Font font;
113} *CFClient__Layout; 145} *CFPlus__Layout;
114 146
115static CFClient__Font default_font; 147static CFPlus__Font default_font;
116static PangoContext *opengl_context; 148static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 149static PangoFontMap *opengl_fontmap;
118 150
119static void 151static void
120substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
125#endif 157#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 159}
128 160
129static void 161static void
130layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
131{ 163{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
134 */ 166 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
139 171
140 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
141} 173}
142 174
143static void 175static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
147 182
148 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 185
151 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
152} 187 if (!rect.height) rect.height = 1;
153 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
154typedef uint16_t mapface; 194typedef uint16_t faceid;
155 195
156typedef struct { 196typedef struct {
157 GLint name; 197 int name;
158 int w, h; 198 int w, h;
159 float s, t; 199 float s, t;
160 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
161} maptex; 203} maptex;
162 204
163typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
164 int16_t darkness; 208 uint16_t darkness;
165 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 210} mapcell;
167 211
168typedef struct { 212typedef struct {
169 int32_t c0, c1; 213 int32_t c0, c1;
170 mapcell *col; 214 mapcell *col;
171} maprow; 215} maprow;
172 216
173typedef struct map { 217typedef struct map {
174 int x, y, w, h; 218 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 220 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 221 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 222
182 int32_t rows; 223 int32_t rows;
183 maprow *row; 224 maprow *row;
184} *CFClient__Map; 225} *CFPlus__Map;
185 226
186static char * 227static char *
187prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
188{ 229{
189 char *p; 230 char *p;
206} 247}
207 248
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#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)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
211static maprow * 272static maprow *
212map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
213{ 274{
214 if (0 > y) 275 if (0 > y)
215 { 276 {
216 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
255 316
256 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
257} 318}
258 319
259static mapcell * 320static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
261{ 322{
262 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
263} 324}
264 325
265static void 326static void
266map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
267{ 328{
268 int r; 329 int r;
269 330
270 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
279 self->row = 0; 340 self->row = 0;
280 self->rows = 0; 341 self->rows = 0;
281} 342}
282 343
283static void 344static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 346{
286 int x, y; 347 int x, y;
287 maprow *row; 348 maprow *row;
349 mapcell *cell;
288 350
289 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 352 if (y >= 0)
291 { 353 {
292 if (y >= self->rows) 354 if (y >= self->rows)
298 if (x >= row->c0) 360 if (x >= row->c0)
299 { 361 {
300 if (x >= row->c1) 362 if (x >= row->c1)
301 break; 363 break;
302 364
303 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
304 } 371 }
305 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
306} 389}
307 390
308static void 391static void
309music_finished (void) 392music_finished (void)
310{ 393{
346 n |= n >> 16; 429 n |= n >> 16;
347 430
348 return n + 1; 431 return n + 1;
349} 432}
350 433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
351MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
352 439
353PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
354 441
355BOOT: 442BOOT:
356{ 443{
357 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 445 static const struct {
359 const char *name; 446 const char *name;
360 IV iv; 447 IV iv;
361 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
363 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
381 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
445 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 556 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 557# undef const_iv
462 }; 558 };
463 559
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
467 572
468int 573int
469in_destruct () 574in_destruct ()
470 CODE: 575 CODE:
471 RETVAL = PL_main_cv == Nullcv; 576 RETVAL = PL_main_cv == Nullcv;
483 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
484 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
485 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
486} 591}
487 592
593char *
594SDL_GetError ()
595
488int 596int
489SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
490 598
491void 599void
492SDL_Quit () 600SDL_Quit ()
493 601
494void 602void
495SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
496 PPCODE: 604 PPCODE:
497{ 605{
498 SDL_Rect **m; 606 SDL_Rect **m;
499 607
500 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
501 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
502 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
503 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
504 612
505 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
506 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
507 615
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
509 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
510 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
511 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
512 620
513 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
514 622#if SDL_VERSION_ATLEAST(1,2,10)
515 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
516 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
517 626
518 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
519 628
520 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
521 while (*m) 630 while (*m)
522 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
523 AV *av = newAV (); 634 AV *av = newAV ();
524 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
525 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
526 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
527 641
528 ++m; 642 ++m;
529 } 643 }
530} 644}
531 645
532char *
533SDL_GetError ()
534
535int 646int
536SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
537 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
538 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
539 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
540 ); 660 );
661
541 if (RETVAL) 662 if (RETVAL)
542 { 663 {
664 av_clear (texture_av);
665
543 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
544# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
545# include "glfunc.h" 668#include "glfunc.h"
546# undef GL_FUNC 669#undef GL_FUNC
547 } 670 }
671}
548 OUTPUT: 672 OUTPUT:
549 RETVAL 673 RETVAL
550 674
551void 675void
552SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
553 677
554char * 678char *
555SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
556 680
681int
682SDL_GetAppState ()
683
557void 684void
558SDL_PollEvent () 685poll_events ()
559 PPCODE: 686 PPCODE:
560{ 687{
561 SDL_Event ev; 688 SDL_Event ev;
562 689
563 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
564 { 692 {
565 HV *hv = newHV (); 693 HV *hv = newHV ();
566 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
567 695
568 switch (ev.type) 696 switch (ev.type)
570 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
571 case SDL_KEYUP: 699 case SDL_KEYUP:
572 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
573 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
574 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
575 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
576 break; 705 break;
577 706
578 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
579 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
580 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
581 break; 710 break;
582 711
583 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
584 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
585
586 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
587 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
588 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
589 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
590 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
591 break; 738 break;
592 739
593 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
594 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
595 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
605 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
606 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
607 break; 754 break;
608 } 755 }
609 756
610 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
611 } 758 }
612} 759}
613 760
614int 761int
615Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
624Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
625 772
626void 773void
627lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
628 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
629#ifndef _WIN32 782#ifdef _WIN32
630 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
631#endif 804#endif
805}
632 806
633void 807void
634add_font (char *file) 808add_font (char *file)
635 CODE: 809 CODE:
636 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
740 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
741#endif 915#endif
742 _exit (1); 916 _exit (1);
743 917
744void 918void
745_exit (int retval) 919_exit (int retval = 0)
746 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
747 _exit (retval); 924 _exit (retval);
925#endif
748 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
749MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
750 937
751CFClient::Font 938CFPlus::Font
752new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
753 CODE: 940 CODE:
754{ 941{
755 int count; 942 int count;
756 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
759} 946}
760 OUTPUT: 947 OUTPUT:
761 RETVAL 948 RETVAL
762 949
763void 950void
764DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
765 CODE: 952 CODE:
766 pango_font_description_free (self); 953 pango_font_description_free (self);
767 954
768void 955void
769make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
770 CODE: 957 CODE:
771 default_font = self; 958 default_font = self;
772 959
773MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
774 961
775void 962void
776reset_glyph_cache () 963reset_glyph_cache ()
777 CODE: 964 CODE:
778 tc_clear (); 965 tc_clear ();
779 966
780CFClient::Layout 967CFPlus::Layout
781new (SV *class) 968new (SV *class)
782 CODE: 969 CODE:
783 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
784 971
785 RETVAL->pl = pango_layout_new (opengl_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
794 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
795 OUTPUT: 982 OUTPUT:
796 RETVAL 983 RETVAL
797 984
798void 985void
799DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
800 CODE: 987 CODE:
801 g_object_unref (self->pl); 988 g_object_unref (self->pl);
802 Safefree (self); 989 Safefree (self);
803 990
804void 991void
805set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
806 CODE: 993 CODE:
807{ 994{
808 STRLEN textlen; 995 STRLEN textlen;
809 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
810 997
811 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
812} 999}
813 1000
814void 1001void
815set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
816 CODE: 1003 CODE:
817{ 1004{
818 STRLEN textlen; 1005 STRLEN textlen;
819 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
820 1007
821 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
822} 1009}
823 1010
824void 1011void
825set_shapes (CFClient::Layout self, ...) 1012set_shapes (CFPlus::Layout self, ...)
826 CODE: 1013 CODE:
827{ 1014{
828 PangoAttrList *attrs = 0; 1015 PangoAttrList *attrs = 0;
829 const char *text = pango_layout_get_text (self->pl); 1016 const char *text = pango_layout_get_text (self->pl);
830 const char *pos = text; 1017 const char *pos = text;
865 if (attrs) 1052 if (attrs)
866 pango_layout_set_attributes (self->pl, attrs); 1053 pango_layout_set_attributes (self->pl, attrs);
867} 1054}
868 1055
869void 1056void
870get_shapes (CFClient::Layout self) 1057get_shapes (CFPlus::Layout self)
871 PPCODE: 1058 PPCODE:
872{ 1059{
873 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
874 1061
875 do 1062 do
890 1077
891 pango_layout_iter_free (iter); 1078 pango_layout_iter_free (iter);
892} 1079}
893 1080
894int 1081int
895has_wrapped (CFClient::Layout self) 1082has_wrapped (CFPlus::Layout self)
896 CODE: 1083 CODE:
897{ 1084{
898 int lines = 1; 1085 int lines = 1;
899 const char *text = pango_layout_get_text (self->pl); 1086 const char *text = pango_layout_get_text (self->pl);
900 1087
905} 1092}
906 OUTPUT: 1093 OUTPUT:
907 RETVAL 1094 RETVAL
908 1095
909SV * 1096SV *
910get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
911 CODE: 1098 CODE:
912 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
913 sv_utf8_decode (RETVAL); 1100 sv_utf8_decode (RETVAL);
914 OUTPUT: 1101 OUTPUT:
915 RETVAL 1102 RETVAL
916 1103
917void 1104void
918set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
919 CODE: 1106 CODE:
920 self->r = r; 1107 self->r = r;
921 self->g = g; 1108 self->g = g;
922 self->b = b; 1109 self->b = b;
923 self->a = a; 1110 self->a = a;
924 1111
925void 1112void
926set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
927 CODE: 1114 CODE:
928 if (self->font != font) 1115 if (self->font != font)
929 { 1116 {
930 self->font = font; 1117 self->font = font;
931 layout_update_font (self); 1118 layout_update_font (self);
932 } 1119 }
933 1120
934void 1121void
935set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
936 CODE: 1123 CODE:
937 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
938 { 1125 {
939 self->base_height = base_height; 1126 self->base_height = base_height;
940 layout_update_font (self); 1127 layout_update_font (self);
941 } 1128 }
942 1129
943void 1130void
944set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
945 CODE: 1132 CODE:
946 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
947 1134
948void 1135void
949set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
950 CODE: 1137 CODE:
951 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
952 1139
953void 1140void
954set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
955 CODE: 1142 CODE:
956 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
957 1144
958void 1145void
959set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
960 CODE: 1147 CODE:
961 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
962 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
963 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
964 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
965 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
966 ); 1153 );
967 1154
968void 1155void
969set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
970 CODE: 1157 CODE:
971 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
972 1159
973void 1160void
974size (CFClient::Layout self) 1161size (CFPlus::Layout self)
975 PPCODE: 1162 PPCODE:
976{ 1163{
977 int w, h; 1164 int w, h;
978 1165
979 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
982 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
983 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
984} 1171}
985 1172
986int 1173int
987descent (CFClient::Layout self) 1174descent (CFPlus::Layout self)
988 CODE: 1175 CODE:
989{ 1176{
990 PangoRectangle rect; 1177 PangoRectangle rect;
991 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
992 pango_layout_line_get_pixel_extents (line, 0, &rect); 1179 pango_layout_line_get_pixel_extents (line, 0, &rect);
994} 1181}
995 OUTPUT: 1182 OUTPUT:
996 RETVAL 1183 RETVAL
997 1184
998int 1185int
999xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
1000 CODE: 1187 CODE:
1001{ 1188{
1002 int index, trailing; 1189 int index, trailing;
1003 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1004 RETVAL = index; 1191 RETVAL = index + trailing;
1005} 1192}
1006 OUTPUT: 1193 OUTPUT:
1007 RETVAL 1194 RETVAL
1008 1195
1009void 1196void
1010cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
1011 PPCODE: 1198 PPCODE:
1012{ 1199{
1013 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
1014 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1015 1202
1018 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1019 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1020} 1207}
1021 1208
1022void 1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1246}
1247
1248void
1023render (CFClient::Layout self, float x, float y) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1024 PPCODE: 1250 PPCODE:
1025 pango_opengl_render_layout_subpixel ( 1251 pango_opengl_render_layout_subpixel (
1026 self->pl, 1252 self->pl,
1027 x * PANGO_SCALE, y * PANGO_SCALE, 1253 x * PANGO_SCALE, y * PANGO_SCALE,
1028 self->r, self->g, self->b, self->a 1254 self->r, self->g, self->b, self->a,
1255 flags
1029 ); 1256 );
1030 1257
1031MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1032 1259
1033void 1260int minpot (int n)
1034pad2pot (SV *data_, SV *w_, SV *h_)
1035 CODE:
1036{
1037 int ow = SvIV (w_);
1038 int oh = SvIV (h_);
1039 1261
1040 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1041 { 1267 {
1042 int nw = minpot (ow);
1043 int nh = minpot (oh);
1044
1045 if (nw != ow || nh != oh)
1046 {
1047 if (SvOK (data_))
1048 {
1049 STRLEN datalen; 1268 STRLEN datalen;
1050 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1051 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1052 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1053 1272
1054 SvPOK_only (result_); 1273 SvPOK_only (result_);
1055 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1056 1275
1057 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1058 while (oh--) 1277 while (oh--)
1059 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1060 1279
1061 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1062 }
1063
1064 sv_setiv (w_, nw);
1065 sv_setiv (h_, nh);
1066 }
1067 } 1281 }
1068} 1282}
1069 1283
1070void 1284void
1071draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1114 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1115 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1116 } 1330 }
1117} 1331}
1118 1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1343
1119MODULE = CFClient PACKAGE = CFClient::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1120 1345
1121CFClient::Map 1346CFPlus::Map
1122new (SV *class, int map_width, int map_height) 1347new (SV *class)
1123 CODE: 1348 CODE:
1124 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1125 RETVAL->x = 0; 1350 RETVAL->x = 0;
1126 RETVAL->y = 0; 1351 RETVAL->y = 0;
1127 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1128 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1129 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1130 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1131 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1132 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1133 RETVAL->texs = 8192;
1134 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1135 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1136 RETVAL->row = 0; 1359 RETVAL->row = 0;
1137 OUTPUT: 1360 OUTPUT:
1138 RETVAL 1361 RETVAL
1139 1362
1140void 1363void
1141DESTROY (CFClient::Map self) 1364DESTROY (CFPlus::Map self)
1142 CODE: 1365 CODE:
1143{ 1366{
1144 map_clear (self); 1367 map_clear (self);
1145 Safefree (self->face); 1368 Safefree (self->face2tile);
1146 Safefree (self->tex); 1369 Safefree (self->tex);
1147 Safefree (self); 1370 Safefree (self);
1148} 1371}
1149 1372
1150void 1373void
1374resize (CFPlus::Map self, int map_width, int map_height)
1375 CODE:
1376 self->w = map_width;
1377 self->h = map_height;
1378
1379void
1151clear (CFClient::Map self) 1380clear (CFPlus::Map self)
1152 CODE: 1381 CODE:
1153 map_clear (self); 1382 map_clear (self);
1154 1383
1155void 1384void
1156set_face (CFClient::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1157 CODE: 1386 CODE:
1158{ 1387{
1159 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1160 { 1389 need_texid (self, tile);
1161 Append (mapface, self->face, self->faces, self->faces);
1162 self->faces *= 2;
1163 }
1164
1165 self->face [face] = texid;
1166} 1390}
1167 1391
1168void 1392void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level)
1394 CODE:
1395{
1396 tileid texid;
1397 maptex *tex;
1398
1399 if (face < 0 || face >= self->faces)
1400 return;
1401
1402 if (smooth < 0 || smooth >= self->faces)
1403 return;
1404
1405 texid = self->face2tile [face];
1406
1407 if (!texid)
1408 return;
1409
1410 tex = self->tex + texid;
1411 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level;
1413}
1414
1415void
1169set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1170 CODE: 1417 CODE:
1171{ 1418{
1172 while (self->texs <= texid) 1419 need_texid (self, texid);
1173 {
1174 Append (maptex, self->tex, self->texs, self->texs);
1175 self->texs *= 2;
1176 }
1177 1420
1178 { 1421 {
1179 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1180 1423
1181 tex->name = name; 1424 tex->name = name;
1198 // from transparent color bleeding and ugly wrapping effects. 1441 // from transparent color bleeding and ugly wrapping effects.
1199 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1200} 1443}
1201 1444
1202int 1445int
1203ox (CFClient::Map self) 1446ox (CFPlus::Map self)
1204 ALIAS: 1447 ALIAS:
1205 oy = 1 1448 oy = 1
1206 x = 2 1449 x = 2
1207 y = 3 1450 y = 3
1208 w = 4 1451 w = 4
1219 } 1462 }
1220 OUTPUT: 1463 OUTPUT:
1221 RETVAL 1464 RETVAL
1222 1465
1223void 1466void
1224scroll (CFClient::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1225 CODE: 1468 CODE:
1226{ 1469{
1227 if (dx > 0) 1470 if (dx > 0)
1228 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1229 else if (dx < 0) 1472 else if (dx < 0)
1230 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1231 1474
1232 if (dy > 0) 1475 if (dy > 0)
1233 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1234 else if (dy < 0) 1477 else if (dy < 0)
1235 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1236 1479
1237 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1238 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1239 1482
1240 while (self->y < 0) 1483 while (self->y < 0)
1245 self->y += MAP_EXTEND_Y; 1488 self->y += MAP_EXTEND_Y;
1246 } 1489 }
1247} 1490}
1248 1491
1249void 1492void
1250map1a_update (CFClient::Map self, SV *data_) 1493map1a_update (CFPlus::Map self, SV *data_, int extmap)
1251 CODE: 1494 CODE:
1252{ 1495{
1253 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1254 uint8_t *data_end = (uint8_t *)SvEND (data_); 1497 uint8_t *data_end = (uint8_t *)SvEND (data_);
1255 mapcell *cell; 1498 mapcell *cell;
1256 int x, y, flags; 1499 int x, y, flags;
1257 1500
1258 while (data < data_end) 1501 while (data < data_end - 1)
1259 { 1502 {
1260 flags = (data [0] << 8) + data [1]; data += 2; 1503 flags = (data [0] << 8) + data [1]; data += 2;
1261 1504
1262 x = self->x + ((flags >> 10) & 63); 1505 x = self->x + ((flags >> 10) & 63);
1263 y = self->y + ((flags >> 4) & 63); 1506 y = self->y + ((flags >> 4) & 63);
1264 1507
1265 cell = map_get_cell (self, x, y); 1508 cell = map_get_cell (self, x, y);
1266 1509
1267 if (flags & 15) 1510 if (flags & 15)
1268 { 1511 {
1269 if (cell->darkness < 0) 1512 if (!cell->darkness)
1270 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1271 cell->darkness = 0; 1515 cell->darkness = 256;
1272 cell->face [0] = 0;
1273 cell->face [1] = 0;
1274 cell->face [2] = 0;
1275 } 1516 }
1276 1517
1277 cell->darkness = flags & 8 ? *data++ : 255;
1278
1279 //TODO: don't trust server data to be in-range(!) 1518 //TODO: don't trust server data to be in-range(!)
1519
1520 if (flags & 8)
1521 {
1522 if (extmap)
1523 {
1524 uint8_t ext, cmd;
1525
1526 do
1527 {
1528 ext = *data++;
1529 cmd = ext & 0x3f;
1530
1531 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1;
1533 else if (cmd == 5) // health
1534 {
1535 cell->stat_width = 1;
1536 cell->stat_hp = *data++;
1537 }
1538 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47)
1541 {
1542 if (*data == 4)
1543 ; // decode player count
1544
1545 data += *data + 1;
1546 }
1547 else if (cmd == 8) // cell flags
1548 cell->flags = *data++;
1549 else if (ext & 0x40) // unknown, multibyte => skip
1550 data += *data + 1;
1551 else
1552 data++;
1553 }
1554 while (ext & 0x80);
1555 }
1556 else
1557 cell->darkness = *data++ + 1;
1558 }
1280 1559
1281 if (flags & 4) 1560 if (flags & 4)
1282 { 1561 {
1283 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face];
1284 } 1565 }
1285 1566
1286 if (flags & 2) 1567 if (flags & 2)
1287 { 1568 {
1288 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1289 } 1572 }
1290 1573
1291 if (flags & 1) 1574 if (flags & 1)
1292 { 1575 {
1293 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [2] = self->face2tile [face];
1294 } 1579 }
1295 } 1580 }
1296 else 1581 else
1297 cell->darkness = -1; 1582 cell->darkness = 0;
1298 } 1583 }
1299} 1584}
1300 1585
1301SV * 1586SV *
1302mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1303 CODE: 1588 CODE:
1304{ 1589{
1305 int x1, x; 1590 int x1, x;
1306 int y1, y; 1591 int y1, y;
1307 int z; 1592 int z;
1328 { 1613 {
1329 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1330 1615
1331 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1332 { 1617 {
1333 mapface face = cell->face [z];
1334
1335 if (face)
1336 {
1337 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1338 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1339 int a1 = tex.a; 1620 int a1 = tex.a;
1340 1621
1341 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1342 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1343 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1344 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1345 }
1346 } 1626 }
1347 } 1627 }
1348 1628
1349 *map++ = (r ) 1629 *map++ = (r )
1350 | (g << 8) 1630 | (g << 8)
1357} 1637}
1358 OUTPUT: 1638 OUTPUT:
1359 RETVAL 1639 RETVAL
1360 1640
1361void 1641void
1362draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1363 CODE: 1643 CODE:
1364{ 1644{
1365 int vx, vy; 1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1648 smooth_key skey;
1366 int x, y, z; 1649 int x, y, z;
1367 int last_name; 1650 int last_name;
1368 mapface face;
1369 1651
1370 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1371 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1372 1655
1373 /* 1656 // clear key, in case of extra padding
1374 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1375 ? self->x + (self->w - sw) / 2
1376 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1377
1378 int vy = self->vy = self->h >= sh
1379 ? self->y + (self->h - sh) / 2
1380 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1381 */
1382 1658
1383 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1384 1660
1385 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1386 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1389 1665
1390 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1391 1667
1392 last_name = 0; 1668 last_name = 0;
1393 1669
1670 mx += self->x;
1671 my += self->y;
1672
1673 // first pass: determine smooth_max
1674 // rather ugly, if you ask me
1675 // could also be stored inside mapcell and updated on change
1676 memset (smooth_max, 0, sizeof (smooth_max));
1677
1678 for (y = 0; y < sh; y++)
1679 if (0 <= y + my && y + my < self->rows)
1680 {
1681 maprow *row = self->row + (y + my);
1682
1683 for (x = 0; x < sw; x++)
1684 if (row->c0 <= x + mx && x + mx < row->c1)
1685 {
1686 mapcell *cell = row->col + (x + mx - row->c0);
1687
1688 smooth_max[x + 1][y + 1] =
1689 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel));
1692 }
1693 }
1694
1394 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1395 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1396 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1397 { 1701 {
1398 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1399 1703
1400 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1401 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1402 { 1706 {
1403 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1404
1405 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1406 1709
1407 if (face) 1710 if (tile)
1711 {
1712 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h;
1715
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name)
1719 {
1720 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */
1722
1723 glEnd ();
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1725 glBegin (GL_QUADS);
1726 }
1727
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732
1733 if (cell->flags && z == 2)
1734 {
1735 if (cell->flags & 1)
1736 {
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 }
1751
1752 // update smooth hash
1753 if (tex.smoothtile)
1754 {
1755 skey.tile = tex.smoothtile;
1756 skey.level = tex.smoothlevel;
1757
1758 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1759
1760 // add bits to current tile and all neighbours. skey.x|y is
1761 // shifted +1|+1 so we always stay positive.
1762
1763 // bits is ___n cccc CCCC bbbb
1764 // n do not draw borders&corners
1765 // c draw these corners, but...
1766 // C ... not these
1767 // b draw these borders
1768
1769 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1770 // ┃· ·· ·┃ ━━
1771
1772 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1773 // ·· ·· ·┏ ┓·
1774
1775 // full tile
1776 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1777
1778 // borders
1779 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1780 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1781 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1782 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1783
1784 // corners
1785 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 }
1790 }
1791 }
1792 }
1793
1794 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort
1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1801 uint32_t smask = smooth_level [w];
1802 if (smask)
1803 for (b = 0; b < 32; ++b)
1804 if (smask & (((uint32_t)1) << b))
1408 { 1805 {
1409 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1807 HE *he;
1410 1808
1411 int px = (x + 1) * 32 - tex.w; 1809 hv_iterinit (smooth);
1412 int py = (y + 1) * 32 - tex.h; 1810 while ((he = hv_iternext (smooth)))
1413
1414 if (last_name != tex.name)
1415 { 1811 {
1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1813 IV bits = SvIVX (HeVAL (he));
1814
1815 if (!(bits & 0x1000)
1816 && skey->level == level
1817 && level > smooth_max [skey->x][skey->y])
1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1831 if (!tex.name)
1832 continue; // smoothing not yet available
1833
1416 glEnd (); 1834 glEnd ();
1417 last_name = tex.name;
1418 glBindTexture (GL_TEXTURE_2D, last_name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1419 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1837 }
1838
1839 if (border)
1840 {
1841 float ox = border * dx;
1842
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1847 }
1848
1849 if (corner)
1850 {
1851 float ox = corner * dx;
1852
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1858 }
1420 } 1859 }
1421
1422 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1423 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1424 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1425 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1426 } 1860 }
1427 }
1428 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1429 1866
1430 glEnd (); 1867 glEnd ();
1431 1868
1432 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1433 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1434}
1435 1871
1872 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows)
1875 {
1876 maprow *row = self->row + (y + my);
1877
1878 for (x = 0; x < sw; x++)
1879 if (row->c0 <= x + mx && x + mx < row->c1)
1880 {
1881 mapcell *cell = row->col + (x + mx - row->c0);
1882
1883 int px = x * T;
1884 int py = y * T;
1885
1886 if (cell->stat_hp)
1887 {
1888 int width = cell->stat_width * T;
1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1890
1891 glColor3ub (0, 0, 0);
1892 glRectf (px + 1, py - thick - 2,
1893 px + width - 1, py);
1894
1895 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1896 glRectf (px + 2,
1897 py - thick - 1,
1898 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1899 }
1900 }
1901 }
1902}
1903
1436void 1904void
1437draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1438 CODE: 1906 CODE:
1439{ 1907{
1440 static float color[16][3] = { 1908 static float color[16][3] = {
1441 { 0.00F, 0.00F, 0.00F }, 1909 { 0.00F, 0.00F, 0.00F },
1442 { 1.00F, 1.00F, 1.00F }, 1910 { 1.00F, 1.00F, 1.00F },
1492 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1493 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1494} 1962}
1495 1963
1496void 1964void
1497fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1498 PPCODE: 1966 PPCODE:
1499{ 1967{
1500 int vx, vy;
1501 int x, y; 1968 int x, y;
1502 int sw4 = (sw + 3) & ~3; 1969 int sw4 = (sw + 3) & ~3;
1503 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1970 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1504 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1971 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1505 1972
1506 memset (darkness, 255, sw4 * sh); 1973 memset (darkness, 255, sw4 * sh);
1507 SvPOK_only (darkness_sv); 1974 SvPOK_only (darkness_sv);
1508 SvCUR_set (darkness_sv, sw4 * sh); 1975 SvCUR_set (darkness_sv, sw4 * sh);
1509 1976
1510 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1977 mx += self->x;
1511 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1978 my += self->y;
1512 1979
1513 for (y = 0; y < sh; y++) 1980 for (y = 0; y < sh; y++)
1514 if (0 <= y + vy && y + vy < self->rows) 1981 if (0 <= y + my && y + my < self->rows)
1515 { 1982 {
1516 maprow *row = self->row + (y + vy); 1983 maprow *row = self->row + (y + my);
1517 1984
1518 for (x = 0; x < sw; x++) 1985 for (x = 0; x < sw; x++)
1519 if (row->c0 <= x + vx && x + vx < row->c1) 1986 if (row->c0 <= x + mx && x + mx < row->c1)
1520 { 1987 {
1521 mapcell *cell = row->col + (x + vx - row->c0); 1988 mapcell *cell = row->col + (x + mx - row->c0);
1522 1989
1523 darkness[y * sw4 + x] = cell->darkness < 0 1990 darkness[y * sw4 + x] = cell->darkness
1991 ? 255 - (cell->darkness - 1)
1524 ? 255 - FOW_DARKNESS 1992 : 255 - FOW_DARKNESS;
1525 : 255 - cell->darkness;
1526 } 1993 }
1527 } 1994 }
1995
1996 if (smoothing)
1997 {
1998 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
1999 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
2000
2001 SvPOK_only (darkness2_sv);
2002 SvCUR_set (darkness2_sv, sw4 * sh);
2003
2004 for (y = 0; y < sh; ++y)
2005 for (x = 0; x < sw4; ++x)
2006 {
2007 float *f = (float *)matrix;
2008 int dx, dy;
2009 float sum = 0.f;
2010
2011 for (dy = -1; dy <= 1; ++dy)
2012 for (dx = -1; dx <= 1; ++dx)
2013 {
2014 unsigned int x2 = x + dx;
2015 unsigned int y2 = y + dy;
2016
2017 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
2018 }
2019
2020 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
2021 }
2022
2023 darkness_sv = darkness2_sv;
2024 }
1528 2025
1529 EXTEND (SP, 3); 2026 EXTEND (SP, 3);
1530 PUSHs (sv_2mortal (newSViv (sw4))); 2027 PUSHs (sv_2mortal (newSViv (sw4)));
1531 PUSHs (sv_2mortal (newSViv (sh))); 2028 PUSHs (sv_2mortal (newSViv (sh)));
1532 PUSHs (darkness_sv); 2029 PUSHs (darkness_sv);
1533} 2030}
1534 2031
1535SV * 2032SV *
1536get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2033get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1537 CODE: 2034 CODE:
1538{ 2035{
1539 int x, y, x1, y1; 2036 int x, y, x1, y1;
1540 SV *data_sv = newSV (w * h * 7 + 5); 2037 SV *data_sv = newSV (w * h * 7 + 5);
1541 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2038 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1566 if (row && row->c0 <= x && x < row->c1) 2063 if (row && row->c0 <= x && x < row->c1)
1567 { 2064 {
1568 mapcell *cell = row->col + (x - row->c0); 2065 mapcell *cell = row->col + (x - row->c0);
1569 uint8_t flags = 0; 2066 uint8_t flags = 0;
1570 2067
1571 if (cell->face [0]) flags |= 1; 2068 if (cell->tile [0]) flags |= 1;
1572 if (cell->face [1]) flags |= 2; 2069 if (cell->tile [1]) flags |= 2;
1573 if (cell->face [2]) flags |= 4; 2070 if (cell->tile [2]) flags |= 4;
1574 2071
1575 *data++ = flags; 2072 *data++ = flags;
1576 2073
1577 if (flags & 1) 2074 if (flags & 1)
1578 { 2075 {
2076 tileid tile = cell->tile [0];
1579 *data++ = cell->face [0] >> 8; 2077 *data++ = tile >> 8;
1580 *data++ = cell->face [0]; 2078 *data++ = tile;
1581 } 2079 }
1582 2080
1583 if (flags & 2) 2081 if (flags & 2)
1584 { 2082 {
2083 tileid tile = cell->tile [1];
1585 *data++ = cell->face [1] >> 8; 2084 *data++ = tile >> 8;
1586 *data++ = cell->face [1]; 2085 *data++ = tile;
1587 } 2086 }
1588 2087
1589 if (flags & 4) 2088 if (flags & 4)
1590 { 2089 {
2090 tileid tile = cell->tile [2];
1591 *data++ = cell->face [2] >> 8; 2091 *data++ = tile >> 8;
1592 *data++ = cell->face [2]; 2092 *data++ = tile;
1593 } 2093 }
1594 } 2094 }
1595 else 2095 else
1596 *data++ = 0; 2096 *data++ = 0;
1597 } 2097 }
1603} 2103}
1604 OUTPUT: 2104 OUTPUT:
1605 RETVAL 2105 RETVAL
1606 2106
1607void 2107void
1608set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2108set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1609 PPCODE: 2109 PPCODE:
1610{ 2110{
1611 int x, y, z; 2111 int x, y, z;
1612 int w, h; 2112 int w, h;
1613 int x1, y1; 2113 int x1, y1;
1637 { 2137 {
1638 uint8_t flags = *data++; 2138 uint8_t flags = *data++;
1639 2139
1640 if (flags) 2140 if (flags)
1641 { 2141 {
1642 mapface face[3] = { 0, 0, 0 };
1643
1644 mapcell *cell = row_get_cell (row, x); 2142 mapcell *cell = row_get_cell (row, x);
2143 tileid tile[3] = { 0, 0, 0 };
1645 2144
1646 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2145 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1647 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2146 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1648 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2147 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1649 2148
1650 if (cell->darkness <= 0) 2149 if (cell->darkness == 0)
1651 { 2150 {
1652 cell->darkness = -1; 2151 cell->darkness = 0;
1653 2152
1654 for (z = 0; z <= 2; z++) 2153 for (z = 0; z <= 2; z++)
1655 { 2154 {
1656 cell->face[z] = face[z]; 2155 tileid t = tile [z];
1657 2156
1658 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2157 if (t >= self->texs || (t && !self->tex [t].name))
2158 {
1659 XPUSHs (sv_2mortal (newSViv (face[z]))); 2159 XPUSHs (sv_2mortal (newSViv (t)));
2160 need_texid (self, t);
2161 }
2162
2163 cell->tile [z] = t;
1660 } 2164 }
1661 } 2165 }
1662 } 2166 }
1663 } 2167 }
1664 } 2168 }
1665} 2169}
1666 2170
1667MODULE = CFClient PACKAGE = CFClient::MixChunk 2171MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1668 2172
1669CFClient::MixChunk 2173CFPlus::MixChunk
1670new_from_file (SV *class, char *path) 2174new_from_file (SV *class, char *path)
1671 CODE: 2175 CODE:
1672 RETVAL = Mix_LoadWAV (path); 2176 RETVAL = Mix_LoadWAV (path);
1673 OUTPUT: 2177 OUTPUT:
1674 RETVAL 2178 RETVAL
1675 2179
1676void 2180void
1677DESTROY (CFClient::MixChunk self) 2181DESTROY (CFPlus::MixChunk self)
1678 CODE: 2182 CODE:
1679 Mix_FreeChunk (self); 2183 Mix_FreeChunk (self);
1680 2184
1681int 2185int
1682volume (CFClient::MixChunk self, int volume = -1) 2186volume (CFPlus::MixChunk self, int volume = -1)
1683 CODE: 2187 CODE:
1684 RETVAL = Mix_VolumeChunk (self, volume); 2188 RETVAL = Mix_VolumeChunk (self, volume);
1685 OUTPUT: 2189 OUTPUT:
1686 RETVAL 2190 RETVAL
1687 2191
1688int 2192int
1689play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2193play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1690 CODE: 2194 CODE:
1691 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2195 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1692 OUTPUT: 2196 OUTPUT:
1693 RETVAL 2197 RETVAL
1694 2198
1695MODULE = CFClient PACKAGE = CFClient::MixMusic 2199MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1696 2200
1697int 2201int
1698volume (int volume = -1) 2202volume (int volume = -1)
1699 CODE: 2203 CODE:
1700 RETVAL = Mix_VolumeMusic (volume); 2204 RETVAL = Mix_VolumeMusic (volume);
1701 OUTPUT: 2205 OUTPUT:
1702 RETVAL 2206 RETVAL
1703 2207
2208int
2209fade_out (int ms)
2210 CODE:
2211 RETVAL = Mix_FadeOutMusic (ms);
2212 OUTPUT:
2213 RETVAL
2214
1704CFClient::MixMusic 2215CFPlus::MixMusic
1705new_from_file (SV *class, char *path) 2216new_from_file (SV *class, char *path)
1706 CODE: 2217 CODE:
1707 RETVAL = Mix_LoadMUS (path); 2218 RETVAL = Mix_LoadMUS (path);
1708 OUTPUT: 2219 OUTPUT:
1709 RETVAL 2220 RETVAL
1710 2221
1711void 2222void
1712DESTROY (CFClient::MixMusic self) 2223DESTROY (CFPlus::MixMusic self)
1713 CODE: 2224 CODE:
1714 Mix_FreeMusic (self); 2225 Mix_FreeMusic (self);
1715 2226
1716int 2227int
1717play (CFClient::MixMusic self, int loops = -1) 2228play (CFPlus::MixMusic self, int loops = -1)
1718 CODE: 2229 CODE:
1719 RETVAL = Mix_PlayMusic (self, loops); 2230 RETVAL = Mix_PlayMusic (self, loops);
1720 OUTPUT: 2231 OUTPUT:
1721 RETVAL 2232 RETVAL
1722 2233
2234int
2235fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2236 CODE:
2237 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2238 OUTPUT:
2239 RETVAL
2240
1723MODULE = CFClient PACKAGE = CFClient::OpenGL 2241MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1724 2242
1725BOOT: 2243BOOT:
1726{ 2244{
1727 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2245 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1728 static const struct { 2246 static const struct {
1729 const char *name; 2247 const char *name;
1730 IV iv; 2248 IV iv;
1731 } *civ, const_iv[] = { 2249 } *civ, const_iv[] = {
1732# define const_iv(name) { # name, (IV)name } 2250# define const_iv(name) { # name, (IV)name }
2251 const_iv (GL_VENDOR),
2252 const_iv (GL_VERSION),
2253 const_iv (GL_EXTENSIONS),
1733 const_iv (GL_COLOR_MATERIAL), 2254 const_iv (GL_COLOR_MATERIAL),
1734 const_iv (GL_SMOOTH), 2255 const_iv (GL_SMOOTH),
1735 const_iv (GL_FLAT), 2256 const_iv (GL_FLAT),
1736 const_iv (GL_DITHER), 2257 const_iv (GL_DITHER),
1737 const_iv (GL_BLEND), 2258 const_iv (GL_BLEND),
1764 const_iv (GL_LUMINANCE), 2285 const_iv (GL_LUMINANCE),
1765 const_iv (GL_LUMINANCE_ALPHA), 2286 const_iv (GL_LUMINANCE_ALPHA),
1766 const_iv (GL_FLOAT), 2287 const_iv (GL_FLOAT),
1767 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2288 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1768 const_iv (GL_COMPILE), 2289 const_iv (GL_COMPILE),
2290 const_iv (GL_PROXY_TEXTURE_1D),
2291 const_iv (GL_PROXY_TEXTURE_2D),
1769 const_iv (GL_TEXTURE_1D), 2292 const_iv (GL_TEXTURE_1D),
1770 const_iv (GL_TEXTURE_2D), 2293 const_iv (GL_TEXTURE_2D),
1771 const_iv (GL_TEXTURE_ENV), 2294 const_iv (GL_TEXTURE_ENV),
1772 const_iv (GL_TEXTURE_MAG_FILTER), 2295 const_iv (GL_TEXTURE_MAG_FILTER),
1773 const_iv (GL_TEXTURE_MIN_FILTER), 2296 const_iv (GL_TEXTURE_MIN_FILTER),
1795 const_iv (GL_SEPARABLE_2D), 2318 const_iv (GL_SEPARABLE_2D),
1796 const_iv (GL_CONVOLUTION_2D), 2319 const_iv (GL_CONVOLUTION_2D),
1797 const_iv (GL_CONVOLUTION_BORDER_MODE), 2320 const_iv (GL_CONVOLUTION_BORDER_MODE),
1798 const_iv (GL_CONSTANT_BORDER), 2321 const_iv (GL_CONSTANT_BORDER),
1799 const_iv (GL_LINES), 2322 const_iv (GL_LINES),
2323 const_iv (GL_LINE_STRIP),
1800 const_iv (GL_LINE_LOOP), 2324 const_iv (GL_LINE_LOOP),
1801 const_iv (GL_QUADS), 2325 const_iv (GL_QUADS),
1802 const_iv (GL_QUAD_STRIP), 2326 const_iv (GL_QUAD_STRIP),
1803 const_iv (GL_TRIANGLES), 2327 const_iv (GL_TRIANGLES),
1804 const_iv (GL_TRIANGLE_STRIP), 2328 const_iv (GL_TRIANGLE_STRIP),
1812# undef const_iv 2336# undef const_iv
1813 }; 2337 };
1814 2338
1815 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2339 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1816 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2340 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2341
2342 texture_av = newAV ();
2343 AvREAL_off (texture_av);
1817} 2344}
1818 2345
1819char * 2346char *
1820gl_vendor () 2347gl_vendor ()
1821 CODE: 2348 CODE:
1832 2359
1833char * 2360char *
1834gl_extensions () 2361gl_extensions ()
1835 CODE: 2362 CODE:
1836 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2363 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2364 OUTPUT:
2365 RETVAL
2366
2367const char *glGetString (GLenum pname)
2368
2369GLint glGetInteger (GLenum pname)
2370 CODE:
2371 glGetIntegerv (pname, &RETVAL);
2372 OUTPUT:
2373 RETVAL
2374
2375GLdouble glGetDouble (GLenum pname)
2376 CODE:
2377 glGetDoublev (pname, &RETVAL);
1837 OUTPUT: 2378 OUTPUT:
1838 RETVAL 2379 RETVAL
1839 2380
1840int glGetError () 2381int glGetError ()
1841 2382
1914 r *= a; 2455 r *= a;
1915 g *= a; 2456 g *= a;
1916 b *= a; 2457 b *= a;
1917 } 2458 }
1918 // microsoft visual "c" rounds instead of truncating... 2459 // microsoft visual "c" rounds instead of truncating...
1919 glColor4ub (MIN ((int)(r * 256.f), 255), 2460 glColor4f (r, g, b, a);
1920 MIN ((int)(g * 256.f), 255),
1921 MIN ((int)(b * 256.f), 255),
1922 MIN ((int)(a * 256.f), 255));
1923 2461
1924void glInterleavedArrays (int format, int stride, char *data) 2462void glInterleavedArrays (int format, int stride, char *data)
1925 2463
1926void glDrawElements (int mode, int count, int type, char *indices) 2464void glDrawElements (int mode, int count, int type, char *indices)
1927 2465
1969 2507
1970void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2508void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1971 2509
1972void glDrawPixels (int width, int height, int format, int type, char *pixels) 2510void glDrawPixels (int width, int height, int format, int type, char *pixels)
1973 2511
2512void glPixelZoom (float x, float y)
2513
1974void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2514void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1975 2515
1976int glGenTexture () 2516int glGenTexture ()
1977 CODE: 2517 CODE:
1978{ 2518 RETVAL = gen_texture ();
1979 GLuint name;
1980 glGenTextures (1, &name);
1981 RETVAL = name;
1982}
1983 OUTPUT: 2519 OUTPUT:
1984 RETVAL 2520 RETVAL
1985 2521
1986void glDeleteTexture (int name) 2522void glDeleteTexture (int name)
1987 CODE: 2523 CODE:
1988{
1989 GLuint name_ = name;
1990 glDeleteTextures (1, &name_); 2524 del_texture (name);
1991} 2525
1992
1993int glGenList () 2526int glGenList ()
1994 CODE: 2527 CODE:
1995 RETVAL = glGenLists (1); 2528 RETVAL = glGenLists (1);
1996 OUTPUT: 2529 OUTPUT:
1997 RETVAL 2530 RETVAL
2004 2537
2005void glEndList () 2538void glEndList ()
2006 2539
2007void glCallList (int list) 2540void glCallList (int list)
2008 2541
2009

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines