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.124 by root, Tue Jul 4 23:23:31 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 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
31# include <sys/types.h> 44# include <sys/types.h>
32# include <sys/socket.h> 45# include <sys/socket.h>
33# include <netinet/in.h> 46# include <netinet/in.h>
34# include <netinet/tcp.h> 47# include <netinet/tcp.h>
35# include <inttypes.h> 48# 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 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
53 57
54#define MIN_FONT_HEIGHT 10 58#define MIN_FONT_HEIGHT 10
55 59
56#if 1 60#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 62#else
59# define PARACHUTE 0 63# define PARACHUTE 0
60#endif 64#endif
61 65
66static AV *texture_av;
67
62static struct 68static struct
63{ 69{
64#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 71#include "glfunc.h"
66#undef GL_FUNC 72#undef GL_FUNC
67} gl; 73} gl;
68 74
75static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 77{
71 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 82 else
76 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
77} 84}
78 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
79#include "texcache.c" 110#include "texcache.c"
80 111
81#include "pango-font.c" 112#include "pango-font.c"
82#include "pango-fontmap.c" 113#include "pango-fontmap.c"
83#include "pango-render.c" 114#include "pango-render.c"
84 115
85typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
87 118
88typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
89 120
90static int 121static int
91shape_attr_p (PangoLayoutRun *run) 122shape_attr_p (PangoLayoutRun *run)
92{ 123{
93 GSList *attrs = run->item->analysis.extra_attrs; 124 GSList *attrs = run->item->analysis.extra_attrs;
107 138
108typedef struct cf_layout { 139typedef struct cf_layout {
109 PangoLayout *pl; 140 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
111 int base_height; 142 int base_height;
112 CFClient__Font font; 143 CFPlus__Font font;
113} *CFClient__Layout; 144} *CFPlus__Layout;
114 145
115static CFClient__Font default_font; 146static CFPlus__Font default_font;
116static PangoContext *opengl_context; 147static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 148static PangoFontMap *opengl_fontmap;
118 149
119static void 150static void
120substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
121{ 152{
122 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
123#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
124 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
125#endif 156#endif
126#ifdef _WIN32
127 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
128#else
129 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130#endif
131} 158}
132 159
133static void 160static void
134layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
135{ 162{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 163 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
138 */ 165 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
143 170
144 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
145} 172}
146 173
147static void 174static void
148layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
149{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
150 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
151 181
152 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
153 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
154 184
155 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
156} 186 if (!rect.height) rect.height = 1;
157 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
158typedef uint16_t mapface; 193typedef uint16_t faceid;
159 194
160typedef struct { 195typedef struct {
161 GLint name; 196 int name;
162 int w, h; 197 int w, h;
163 float s, t; 198 float s, t;
164 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
165} maptex; 202} maptex;
166 203
167typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
168 int16_t darkness; 207 uint16_t darkness;
169 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
170} mapcell; 209} mapcell;
171 210
172typedef struct { 211typedef struct {
173 int32_t c0, c1; 212 int32_t c0, c1;
174 mapcell *col; 213 mapcell *col;
175} maprow; 214} maprow;
176 215
177typedef struct map { 216typedef struct map {
178 int x, y, w, h; 217 int x, y, w, h;
179 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
180 int faces; 219 int faces; tileid *face2tile; // [faceid]
181 mapface *face; 220 int texs; maptex *tex; // [tileid]
182
183 int texs;
184 maptex *tex;
185 221
186 int32_t rows; 222 int32_t rows;
187 maprow *row; 223 maprow *row;
188} *CFClient__Map; 224} *CFPlus__Map;
189 225
190static char * 226static char *
191prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
192{ 228{
193 char *p; 229 char *p;
210} 246}
211 247
212#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
214 250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
270
215static maprow * 271static maprow *
216map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
217{ 273{
218 if (0 > y) 274 if (0 > y)
219 { 275 {
220 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
221 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
259 315
260 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
261} 317}
262 318
263static mapcell * 319static mapcell *
264map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
265{ 321{
266 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
267} 323}
268 324
269static void 325static void
270map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
271{ 327{
272 int r; 328 int r;
273 329
274 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
275 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
283 self->row = 0; 339 self->row = 0;
284 self->rows = 0; 340 self->rows = 0;
285} 341}
286 342
287static void 343static void
288map_blank (CFClient__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
289{ 345{
290 int x, y; 346 int x, y;
291 maprow *row; 347 maprow *row;
348 mapcell *cell;
292 349
293 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
294 if (y >= 0) 351 if (y >= 0)
295 { 352 {
296 if (y >= self->rows) 353 if (y >= self->rows)
302 if (x >= row->c0) 359 if (x >= row->c0)
303 { 360 {
304 if (x >= row->c1) 361 if (x >= row->c1)
305 break; 362 break;
306 363
307 row->col[x - row->c0].darkness = -1; 364 cell = row->col + x - row->c0;
365
366 cell->darkness = 0;
367 cell->stat_hp = 0;
368 cell->flags = 0;
369 cell->player = 0;
308 } 370 }
309 } 371 }
372}
373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
310} 388}
311 389
312static void 390static void
313music_finished (void) 391music_finished (void)
314{ 392{
350 n |= n >> 16; 428 n |= n >> 16;
351 429
352 return n + 1; 430 return n + 1;
353} 431}
354 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
355MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
356 438
357PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
358 440
359BOOT: 441BOOT:
360{ 442{
361 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
362 static const struct { 444 static const struct {
363 const char *name; 445 const char *name;
364 IV iv; 446 IV iv;
365 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
366# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
367 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
368 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
369 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
370 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
371 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
380 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
381 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
382 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
383 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
384 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
385 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
386 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
387 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
388 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
389 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
444 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
445 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
446 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
447 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
448 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
449 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
450 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
451 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
452 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
453 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
454 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
455 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
456 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
457 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
458 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
459 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
460 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
461 const_iv (KMOD_CTRL),
462 const_iv (KMOD_SHIFT),
463 const_iv (KMOD_ALT),
464 const_iv (KMOD_META)
465# undef const_iv 556# undef const_iv
466 }; 557 };
467 558
468 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
469 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
470} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
571
572int
573in_destruct ()
574 CODE:
575 RETVAL = PL_main_cv == Nullcv;
576 OUTPUT:
577 RETVAL
471 578
472NV floor (NV x) 579NV floor (NV x)
473 580
474NV ceil (NV x) 581NV ceil (NV x)
475 582
506 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
507 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
508 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
509 616
510 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 617 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
618#if SDL_VERSION_ATLEAST(1,2,10)
619 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
620 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
621#endif
511 622
512 SDL_EnableUNICODE (1); 623 SDL_EnableUNICODE (1);
513 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
514 625
515 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
535 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
536 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
537 ); 648 );
538 if (RETVAL) 649 if (RETVAL)
539 { 650 {
651 av_clear (texture_av);
652
540 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
541# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
542# include "glfunc.h" 655# include "glfunc.h"
543# undef GL_FUNC 656# undef GL_FUNC
657
544 } 658 }
545 OUTPUT: 659 OUTPUT:
546 RETVAL 660 RETVAL
547 661
548void 662void
567 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
568 case SDL_KEYUP: 682 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 688 break;
574 689
575 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
577 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 692 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
578 break; 693 break;
579 694
580 case SDL_MOUSEMOTION: 695 case SDL_MOUSEMOTION:
696 {
697 int state = ev.motion.state;
698 int x = ev.motion.x;
699 int y = ev.motion.y;
700 int xrel = ev.motion.xrel;
701 int yrel = ev.motion.yrel;
702
703 /* do simplistic event compression */
704 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
705 && state == ev.motion.state)
706 {
707 xrel += ev.motion.xrel;
708 yrel += ev.motion.yrel;
709 x = ev.motion.x;
710 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 }
713
581 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
582
583 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 715 hv_store (hv, "state", 5, newSViv (state), 0);
584 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 716 hv_store (hv, "x", 1, newSViv (x), 0);
585 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 717 hv_store (hv, "y", 1, newSViv (y), 0);
586 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 718 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
587 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 719 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 }
588 break; 721 break;
589 722
590 case SDL_MOUSEBUTTONDOWN: 723 case SDL_MOUSEBUTTONDOWN:
591 case SDL_MOUSEBUTTONUP: 724 case SDL_MOUSEBUTTONUP:
592 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 735 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 736 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 737 break;
605 } 738 }
606 739
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 740 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 741 }
609} 742}
610 743
611int 744int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 745Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
621Mix_AllocateChannels (int numchans = -1) 754Mix_AllocateChannels (int numchans = -1)
622 755
623void 756void
624lowdelay (int fd, int val = 1) 757lowdelay (int fd, int val = 1)
625 CODE: 758 CODE:
759 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
760
761void
762win32_proxy_info ()
763 PPCODE:
764{
626#ifndef _WIN32 765#ifdef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 766 char buffer[2048];
767 DWORD buflen;
768
769 EXTEND (SP, 3);
770
771 buflen = sizeof (buffer);
772 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
773 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
774 {
775 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
776
777 buflen = sizeof (buffer);
778 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
779 {
780 PUSHs (newSVpv (buffer, 0));
781
782 buflen = sizeof (buffer);
783 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
784 PUSHs (newSVpv (buffer, 0));
785 }
786 }
628#endif 787#endif
788}
629 789
630void 790void
631add_font (char *file) 791add_font (char *file)
632 CODE: 792 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 793 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 794
635void 795void
636load_image_inline (SV *image_) 796load_image_inline (SV *image_)
637 ALIAS: 797 ALIAS:
638 load_image_file = 1 798 load_image_file = 1
680 840
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 841 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 842
683 assert (surface2->pitch == surface2->w * 4); 843 assert (surface2->pitch == surface2->w * 4);
684 844
845 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 846 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 847 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 848 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 849 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
690 SDL_UnlockSurface (surface2);
691 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 850 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 851 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 852 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
853 SDL_UnlockSurface (surface2);
694 854
695 SDL_FreeSurface (surface); 855 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 856 SDL_FreeSurface (surface2);
697} 857}
698 858
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 897 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 898#endif
739 _exit (1); 899 _exit (1);
740 900
741void 901void
742_exit (int retval) 902_exit (int retval = 0)
743 CODE: 903 CODE:
904#ifdef WIN32
905 ExitThread (retval); // unclean, please beam me up
906#else
744 _exit (retval); 907 _exit (retval);
908#endif
745 909
910void
911debug ()
912 CODE:
913{
914#if DEBUG
915 VALGRIND_DO_LEAK_CHECK;
916#endif
917}
918
746MODULE = CFClient PACKAGE = CFClient::Font 919MODULE = CFPlus PACKAGE = CFPlus::Font
747 920
748CFClient::Font 921CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 922new_from_file (SV *class, char *path, int id = 0)
750 CODE: 923 CODE:
751{ 924{
752 int count; 925 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 926 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
756} 929}
757 OUTPUT: 930 OUTPUT:
758 RETVAL 931 RETVAL
759 932
760void 933void
761DESTROY (CFClient::Font self) 934DESTROY (CFPlus::Font self)
762 CODE: 935 CODE:
763 pango_font_description_free (self); 936 pango_font_description_free (self);
764 937
765void 938void
766make_default (CFClient::Font self) 939make_default (CFPlus::Font self)
767 CODE: 940 CODE:
768 default_font = self; 941 default_font = self;
769 942
770MODULE = CFClient PACKAGE = CFClient::Layout 943MODULE = CFPlus PACKAGE = CFPlus::Layout
771 944
772void 945void
773clear_font_cache () 946reset_glyph_cache ()
774 CODE: 947 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 948 tc_clear ();
777 949
778CFClient::Layout 950CFPlus::Layout
779new (SV *class, int type = 0) 951new (SV *class)
780 CODE: 952 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 953 New (0, RETVAL, 1, struct cf_layout);
782 954
783 RETVAL->pl = pango_layout_new (opengl_context); 955 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 956 RETVAL->r = 1.;
792 layout_update_font (RETVAL); 964 layout_update_font (RETVAL);
793 OUTPUT: 965 OUTPUT:
794 RETVAL 966 RETVAL
795 967
796void 968void
797DESTROY (CFClient::Layout self) 969DESTROY (CFPlus::Layout self)
798 CODE: 970 CODE:
799 g_object_unref (self->pl); 971 g_object_unref (self->pl);
800 Safefree (self); 972 Safefree (self);
801 973
802void 974void
803set_text (CFClient::Layout self, SV *text_) 975set_text (CFPlus::Layout self, SV *text_)
804 CODE: 976 CODE:
805{ 977{
806 STRLEN textlen; 978 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 979 char *text = SvPVutf8 (text_, textlen);
808 980
809 pango_layout_set_text (self->pl, text, textlen); 981 pango_layout_set_text (self->pl, text, textlen);
810} 982}
811 983
812void 984void
813set_markup (CFClient::Layout self, SV *text_) 985set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 986 CODE:
815{ 987{
816 STRLEN textlen; 988 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 989 char *text = SvPVutf8 (text_, textlen);
818 990
819 pango_layout_set_markup (self->pl, text, textlen); 991 pango_layout_set_markup (self->pl, text, textlen);
820} 992}
821 993
822void 994void
823set_shapes (CFClient::Layout self, ...) 995set_shapes (CFPlus::Layout self, ...)
824 CODE: 996 CODE:
825{ 997{
826 PangoAttrList *attrs = 0; 998 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 999 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 1000 const char *pos = text;
863 if (attrs) 1035 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 1036 pango_layout_set_attributes (self->pl, attrs);
865} 1037}
866 1038
867void 1039void
868get_shapes (CFClient::Layout self) 1040get_shapes (CFPlus::Layout self)
869 PPCODE: 1041 PPCODE:
870{ 1042{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1043 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 1044
873 do 1045 do
877 if (run && shape_attr_p (run)) 1049 if (run && shape_attr_p (run))
878 { 1050 {
879 PangoRectangle extents; 1051 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 1052 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 1053
1054 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1055 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1056 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 1057 }
885 } 1058 }
886 while (pango_layout_iter_next_run (iter)); 1059 while (pango_layout_iter_next_run (iter));
887 1060
888 pango_layout_iter_free (iter); 1061 pango_layout_iter_free (iter);
889} 1062}
890 1063
891int 1064int
892has_wrapped (CFClient::Layout self) 1065has_wrapped (CFPlus::Layout self)
893 CODE: 1066 CODE:
894{ 1067{
895 int lines = 1; 1068 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 1069 const char *text = pango_layout_get_text (self->pl);
897 1070
902} 1075}
903 OUTPUT: 1076 OUTPUT:
904 RETVAL 1077 RETVAL
905 1078
906SV * 1079SV *
907get_text (CFClient::Layout self) 1080get_text (CFPlus::Layout self)
908 CODE: 1081 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1082 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 1083 sv_utf8_decode (RETVAL);
911 OUTPUT: 1084 OUTPUT:
912 RETVAL 1085 RETVAL
913 1086
914void 1087void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1088set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 1089 CODE:
917 self->r = r; 1090 self->r = r;
918 self->g = g; 1091 self->g = g;
919 self->b = b; 1092 self->b = b;
920 self->a = a; 1093 self->a = a;
921 1094
922void 1095void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1096set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1097 CODE:
925 if (self->font != font) 1098 if (self->font != font)
926 { 1099 {
927 self->font = font; 1100 self->font = font;
928 layout_update_font (self); 1101 layout_update_font (self);
929 } 1102 }
930 1103
931void 1104void
932set_height (CFClient::Layout self, int base_height) 1105set_height (CFPlus::Layout self, int base_height)
933 CODE: 1106 CODE:
934 if (self->base_height != base_height) 1107 if (self->base_height != base_height)
935 { 1108 {
936 self->base_height = base_height; 1109 self->base_height = base_height;
937 layout_update_font (self); 1110 layout_update_font (self);
938 } 1111 }
939 1112
940void 1113void
941set_width (CFClient::Layout self, int max_width = -1) 1114set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1115 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1116 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1117
945void 1118void
946set_indent (CFClient::Layout self, int indent) 1119set_indent (CFPlus::Layout self, int indent)
947 CODE: 1120 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1121 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1122
950void 1123void
951set_spacing (CFClient::Layout self, int spacing) 1124set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1125 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1126 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1127
955void 1128void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1129set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1130 CODE:
958 pango_layout_set_ellipsize (self->pl, 1131 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1132 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1133 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1134 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1135 : PANGO_ELLIPSIZE_NONE
963 ); 1136 );
964 1137
965void 1138void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1139set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1140 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1141 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1142
970void 1143void
971size (CFClient::Layout self) 1144size (CFPlus::Layout self)
972 PPCODE: 1145 PPCODE:
973{ 1146{
974 int w, h; 1147 int w, h;
975 1148
976 layout_get_pixel_size (self, &w, &h); 1149 layout_get_pixel_size (self, &w, &h);
979 PUSHs (sv_2mortal (newSViv (w))); 1152 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1153 PUSHs (sv_2mortal (newSViv (h)));
981} 1154}
982 1155
983int 1156int
984descent (CFClient::Layout self) 1157descent (CFPlus::Layout self)
985 CODE: 1158 CODE:
986{ 1159{
987 PangoRectangle rect; 1160 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1161 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1162 pango_layout_line_get_pixel_extents (line, 0, &rect);
991} 1164}
992 OUTPUT: 1165 OUTPUT:
993 RETVAL 1166 RETVAL
994 1167
995int 1168int
996xy_to_index (CFClient::Layout self, int x, int y) 1169xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1170 CODE:
998{ 1171{
999 int index, trailing; 1172 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1173 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1174 RETVAL = index + trailing;
1002} 1175}
1003 OUTPUT: 1176 OUTPUT:
1004 RETVAL 1177 RETVAL
1005 1178
1006void 1179void
1007cursor_pos (CFClient::Layout self, int index) 1180cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1181 PPCODE:
1009{ 1182{
1010 PangoRectangle strong_pos; 1183 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1184 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1185
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1188 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1190}
1018 1191
1019void 1192void
1193index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1194 PPCODE:
1195{
1196 int line, x;
1197
1198 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1199 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1200
1201 EXTEND (SP, 2);
1202 PUSHs (sv_2mortal (newSViv (line - 1)));
1203 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1204}
1205
1206void
1207line_x_to_index (CFPlus::Layout self, int line, int x)
1208 PPCODE:
1209{
1210 PangoLayoutLine *lp;
1211 int index, trailing;
1212
1213 if (line < 0)
1214 XSRETURN_EMPTY;
1215
1216 if (!(lp = pango_layout_get_line (self->pl, line)))
1217 XSRETURN_EMPTY; /* do better */
1218
1219 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1220
1221 EXTEND (SP, 2);
1222 if (GIMME_V == G_SCALAR)
1223 PUSHs (sv_2mortal (newSViv (index + trailing)));
1224 else
1225 {
1226 PUSHs (sv_2mortal (newSViv (index)));
1227 PUSHs (sv_2mortal (newSViv (trailing)));
1228 }
1229}
1230
1231void
1020render (CFClient::Layout self, float x, float y) 1232render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1233 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1234 pango_opengl_render_layout_subpixel (
1023 self->pl, 1235 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1236 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1237 self->r, self->g, self->b, self->a,
1238 flags
1026 ); 1239 );
1027 1240
1028MODULE = CFClient PACKAGE = CFClient::Texture 1241MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1242
1030void 1243void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1244pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1245 CODE:
1033{ 1246{
1111 glDisable (GL_ALPHA_TEST); 1324 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1325 glDisable (GL_BLEND);
1113 } 1326 }
1114} 1327}
1115 1328
1116MODULE = CFClient PACKAGE = CFClient::Map 1329MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1330
1118CFClient::Map 1331CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1332new (SV *class)
1120 CODE: 1333 CODE:
1121 New (0, RETVAL, 1, struct map); 1334 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1335 RETVAL->x = 0;
1123 RETVAL->y = 0; 1336 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1337 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1338 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1339 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1340 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1341 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1342 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1130 RETVAL->texs = 8192;
1131 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1132 RETVAL->rows = 0; 1343 RETVAL->rows = 0;
1133 RETVAL->row = 0; 1344 RETVAL->row = 0;
1134 OUTPUT: 1345 OUTPUT:
1135 RETVAL 1346 RETVAL
1136 1347
1137void 1348void
1138DESTROY (CFClient::Map self) 1349DESTROY (CFPlus::Map self)
1139 CODE: 1350 CODE:
1140{ 1351{
1141 map_clear (self); 1352 map_clear (self);
1142 Safefree (self->face); 1353 Safefree (self->face2tile);
1143 Safefree (self->tex); 1354 Safefree (self->tex);
1144 Safefree (self); 1355 Safefree (self);
1145} 1356}
1146 1357
1147void 1358void
1359resize (CFPlus::Map self, int map_width, int map_height)
1360 CODE:
1361 self->w = map_width;
1362 self->h = map_height;
1363
1364void
1148clear (CFClient::Map self) 1365clear (CFPlus::Map self)
1149 CODE: 1366 CODE:
1150 map_clear (self); 1367 map_clear (self);
1151 1368
1152void 1369void
1153set_face (CFClient::Map self, int face, int texid) 1370set_tileid (CFPlus::Map self, int face, int tile)
1154 CODE: 1371 CODE:
1155{ 1372{
1156 while (self->faces <= face) 1373 need_facenum (self, face); self->face2tile [face] = tile;
1157 { 1374 need_texid (self, tile);
1158 Append (mapface, self->face, self->faces, self->faces);
1159 self->faces *= 2;
1160 }
1161
1162 self->face [face] = texid;
1163} 1375}
1164 1376
1165void 1377void
1378set_smooth (CFPlus::Map self, int face, int smooth, int level)
1379 CODE:
1380{
1381 tileid texid;
1382 maptex *tex;
1383
1384 if (face < 0 || face >= self->faces)
1385 return;
1386
1387 if (smooth < 0 || smooth >= self->faces)
1388 return;
1389
1390 texid = self->face2tile [face];
1391
1392 if (!texid)
1393 return;
1394
1395 tex = self->tex + texid;
1396 tex->smoothtile = self->face2tile [smooth];
1397 tex->smoothlevel = level;
1398}
1399
1400void
1166set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1401set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1167 CODE: 1402 CODE:
1168{ 1403{
1169 while (self->texs <= texid) 1404 need_texid (self, texid);
1170 {
1171 Append (maptex, self->tex, self->texs, self->texs);
1172 self->texs *= 2;
1173 }
1174 1405
1175 { 1406 {
1176 maptex *tex = self->tex + texid; 1407 maptex *tex = self->tex + texid;
1177 1408
1178 tex->name = name; 1409 tex->name = name;
1195 // from transparent color bleeding and ugly wrapping effects. 1426 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1427 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1428}
1198 1429
1199int 1430int
1200ox (CFClient::Map self) 1431ox (CFPlus::Map self)
1201 ALIAS: 1432 ALIAS:
1202 oy = 1 1433 oy = 1
1203 x = 2 1434 x = 2
1204 y = 3 1435 y = 3
1205 w = 4 1436 w = 4
1216 } 1447 }
1217 OUTPUT: 1448 OUTPUT:
1218 RETVAL 1449 RETVAL
1219 1450
1220void 1451void
1221scroll (CFClient::Map self, int dx, int dy) 1452scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1453 CODE:
1223{ 1454{
1224 if (dx > 0) 1455 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1456 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1457 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1458 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1228 1459
1229 if (dy > 0) 1460 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1461 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1462 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1463 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1233 1464
1234 self->ox += dx; self->x += dx; 1465 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1466 self->oy += dy; self->y += dy;
1236 1467
1237 while (self->y < 0) 1468 while (self->y < 0)
1242 self->y += MAP_EXTEND_Y; 1473 self->y += MAP_EXTEND_Y;
1243 } 1474 }
1244} 1475}
1245 1476
1246void 1477void
1247map1a_update (CFClient::Map self, SV *data_) 1478map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1479 CODE:
1249{ 1480{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1481 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1482 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1483 mapcell *cell;
1253 int x, y, flags; 1484 int x, y, flags;
1254 1485
1255 while (data < data_end) 1486 while (data < data_end - 1)
1256 { 1487 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1488 flags = (data [0] << 8) + data [1]; data += 2;
1258 1489
1259 x = self->x + ((flags >> 10) & 63); 1490 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1491 y = self->y + ((flags >> 4) & 63);
1261 1492
1262 cell = map_get_cell (self, x, y); 1493 cell = map_get_cell (self, x, y);
1263 1494
1264 if (flags & 15) 1495 if (flags & 15)
1265 { 1496 {
1266 if (cell->darkness < 0) 1497 if (!cell->darkness)
1267 { 1498 {
1499 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1500 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1501 }
1273 1502
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1503 //TODO: don't trust server data to be in-range(!)
1504
1505 if (flags & 8)
1506 {
1507 if (extmap)
1508 {
1509 uint8_t ext, cmd;
1510
1511 do
1512 {
1513 ext = *data++;
1514 cmd = ext & 0x3f;
1515
1516 if (cmd < 4)
1517 cell->darkness = 255 - ext * 64 + 1;
1518 else if (cmd == 5) // health
1519 {
1520 cell->stat_width = 1;
1521 cell->stat_hp = *data++;
1522 }
1523 else if (cmd == 6) // monster width
1524 cell->stat_width = *data++ + 1;
1525 else if (cmd == 0x47)
1526 {
1527 if (*data == 4)
1528 ; // decode player count
1529
1530 data += *data + 1;
1531 }
1532 else if (cmd == 8) // cell flags
1533 cell->flags = *data++;
1534 else if (ext & 0x40) // unknown, multibyte => skip
1535 data += *data + 1;
1536 else
1537 data++;
1538 }
1539 while (ext & 0x80);
1540 }
1541 else
1542 cell->darkness = *data++ + 1;
1543 }
1277 1544
1278 if (flags & 4) 1545 if (flags & 4)
1279 { 1546 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1547 faceid face = (data [0] << 8) + data [1]; data += 2;
1548 need_facenum (self, face);
1549 cell->tile [0] = self->face2tile [face];
1281 } 1550 }
1282 1551
1283 if (flags & 2) 1552 if (flags & 2)
1284 { 1553 {
1285 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1554 faceid face = (data [0] << 8) + data [1]; data += 2;
1555 need_facenum (self, face);
1556 cell->tile [1] = self->face2tile [face];
1286 } 1557 }
1287 1558
1288 if (flags & 1) 1559 if (flags & 1)
1289 { 1560 {
1290 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1561 faceid face = (data [0] << 8) + data [1]; data += 2;
1562 need_facenum (self, face);
1563 cell->tile [2] = self->face2tile [face];
1291 } 1564 }
1292 } 1565 }
1293 else 1566 else
1294 cell->darkness = -1; 1567 cell->darkness = 0;
1295 } 1568 }
1296} 1569}
1297 1570
1298SV * 1571SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1572mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1573 CODE:
1301{ 1574{
1302 int x1, x; 1575 int x1, x;
1303 int y1, y; 1576 int y1, y;
1304 int z; 1577 int z;
1325 { 1598 {
1326 mapcell *cell = row->col + (x - row->c0); 1599 mapcell *cell = row->col + (x - row->c0);
1327 1600
1328 for (z = 0; z <= 0; z++) 1601 for (z = 0; z <= 0; z++)
1329 { 1602 {
1330 mapface face = cell->face [z];
1331
1332 if (face)
1333 {
1334 maptex tex = self->tex [face]; 1603 maptex tex = self->tex [cell->tile [z]];
1335 int a0 = 255 - tex.a; 1604 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1605 int a1 = tex.a;
1337 1606
1338 r = (r * a0 + tex.r * a1) / 255; 1607 r = (r * a0 + tex.r * a1) / 255;
1339 g = (g * a0 + tex.g * a1) / 255; 1608 g = (g * a0 + tex.g * a1) / 255;
1340 b = (b * a0 + tex.b * a1) / 255; 1609 b = (b * a0 + tex.b * a1) / 255;
1341 a = (a * a0 + tex.a * a1) / 255; 1610 a = (a * a0 + tex.a * a1) / 255;
1342 }
1343 } 1611 }
1344 } 1612 }
1345 1613
1346 *map++ = (r ) 1614 *map++ = (r )
1347 | (g << 8) 1615 | (g << 8)
1354} 1622}
1355 OUTPUT: 1623 OUTPUT:
1356 RETVAL 1624 RETVAL
1357 1625
1358void 1626void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1627draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1628 CODE:
1361{ 1629{
1362 int vx, vy; 1630 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1631 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1632 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1633 smooth_key skey;
1363 int x, y, z; 1634 int x, y, z;
1364 int last_name; 1635 int last_name;
1365 mapface face;
1366 1636
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1637 // thats current max. sorry.
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1638 if (sw > 255) sw = 255;
1639 if (sh > 255) sh = 255;
1369 1640
1370 /* 1641 // clear key, in case of extra padding
1371 int vx = self->vx = self->w >= sw 1642 memset (&skey, 0, sizeof (skey));
1372 ? self->x + (self->w - sw) / 2
1373 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1374
1375 int vy = self->vy = self->h >= sh
1376 ? self->y + (self->h - sh) / 2
1377 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1378 */
1379 1643
1380 glColor4ub (255, 255, 255, 255); 1644 glColor4ub (255, 255, 255, 255);
1381 1645
1382 glEnable (GL_BLEND); 1646 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1647 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1386 1650
1387 glBegin (GL_QUADS); 1651 glBegin (GL_QUADS);
1388 1652
1389 last_name = 0; 1653 last_name = 0;
1390 1654
1655 mx += self->x;
1656 my += self->y;
1657
1658 // first pass: determine smooth_max
1659 // rather ugly, if you ask me
1660 // could also be stored inside mapcell and updated on change
1661 memset (smooth_max, 0, sizeof (smooth_max));
1662
1663 for (y = 0; y < sh; y++)
1664 if (0 <= y + my && y + my < self->rows)
1665 {
1666 maprow *row = self->row + (y + my);
1667
1668 for (x = 0; x < sw; x++)
1669 if (row->c0 <= x + mx && x + mx < row->c1)
1670 {
1671 mapcell *cell = row->col + (x + mx - row->c0);
1672
1673 smooth_max[x + 1][y + 1] =
1674 MAX (self->tex [cell->tile [0]].smoothlevel,
1675 MAX (self->tex [cell->tile [1]].smoothlevel,
1676 self->tex [cell->tile [2]].smoothlevel));
1677 }
1678 }
1679
1391 for (z = 0; z < 3; z++) 1680 for (z = 0; z <= 2; z++)
1681 {
1682 memset (smooth_level, 0, sizeof (smooth_level));
1683
1392 for (y = 0; y < sh; y++) 1684 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1685 if (0 <= y + my && y + my < self->rows)
1394 { 1686 {
1395 maprow *row = self->row + (y + vy); 1687 maprow *row = self->row + (y + my);
1396 1688
1397 for (x = 0; x < sw; x++) 1689 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1690 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1691 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1692 mapcell *cell = row->col + (x + mx - row->c0);
1401
1402 face = cell->face [z]; 1693 tileid tile = cell->tile [z];
1403 1694
1404 if (face) 1695 if (tile)
1696 {
1697 maptex tex = self->tex [tile];
1698 int px = (x + 1) * T - tex.w;
1699 int py = (y + 1) * T - tex.h;
1700
1701 // suppressing texture state switches here
1702 // is only moderately effective, but worth the extra effort
1703 if (last_name != tex.name)
1704 {
1705 if (!tex.name)
1706 tex = self->tex [2]; /* missing, replace by noface */
1707
1708 glEnd ();
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711 }
1712
1713 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1714 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1715 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1716 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1717
1718 if (cell->flags && z == 2)
1719 {
1720 if (cell->flags & 1)
1721 {
1722 maptex tex = self->tex [1];
1723 int px = x * T + T * 2 / 32;
1724 int py = y * T - T * 6 / 32;
1725
1726 glEnd ();
1727 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1728 glBegin (GL_QUADS);
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1734 }
1735 }
1736
1737 // update smooth hash
1738 if (tex.smoothtile)
1739 {
1740 skey.tile = tex.smoothtile;
1741 skey.level = tex.smoothlevel;
1742
1743 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1744
1745 // add bits to current tile and all neighbours. skey.x|y is
1746 // shifted +1|+1 so we always stay positive.
1747
1748 // bits is ___n cccc CCCC bbbb
1749 // n do not draw borders&corners
1750 // c draw these corners, but...
1751 // C ... not these
1752 // b draw these borders
1753
1754 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1755 // ┃· ·· ·┃ ━━
1756
1757 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1758 // ·· ·· ·┏ ┓·
1759
1760 // full tile
1761 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1762
1763 // borders
1764 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1765 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1766 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1767 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1768
1769 // corners
1770 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1771 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1772 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1773 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1774 }
1775 }
1776 }
1777 }
1778
1779 // go through all smoothlevels, lowest to highest, then draw.
1780 // this is basically counting sort
1781 {
1782 int w, b;
1783
1784 for (w = 0; w < 256 / 32; ++w)
1785 {
1786 uint32_t smask = smooth_level [w];
1787 if (smask)
1788 for (b = 0; b < 32; ++b)
1789 if (smask & (((uint32_t)1) << b))
1405 { 1790 {
1406 maptex tex = self->tex [face]; 1791 int level = (w << 5) | b;
1792 HE *he;
1407 1793
1408 int px = (x + 1) * 32 - tex.w; 1794 hv_iterinit (smooth);
1409 int py = (y + 1) * 32 - tex.h; 1795 while ((he = hv_iternext (smooth)))
1410
1411 if (last_name != tex.name)
1412 { 1796 {
1797 smooth_key *skey = (smooth_key *)HeKEY (he);
1798 IV bits = SvIVX (HeVAL (he));
1799
1800 if (!(bits & 0x1000)
1801 && skey->level == level
1802 && level > smooth_max [skey->x][skey->y])
1803 {
1804 maptex tex = self->tex [skey->tile];
1805 int px = (((int)skey->x) - 1) * T;
1806 int py = (((int)skey->y) - 1) * T;
1807 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column
1811
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name)
1815 {
1816 if (!tex.name)
1817 continue; // smoothing not yet available
1818
1413 glEnd (); 1819 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1821 glBegin (GL_QUADS);
1822 }
1823
1824 if (border)
1825 {
1826 float ox = border * dx;
1827
1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1832 }
1833
1834 if (corner)
1835 {
1836 float ox = corner * dx;
1837
1838 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1842 }
1843 }
1417 } 1844 }
1418
1419 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1420 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1421 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1422 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1423 } 1845 }
1424 }
1425 } 1846 }
1847 }
1848
1849 hv_clear (smooth);
1850 }
1426 1851
1427 glEnd (); 1852 glEnd ();
1428 1853
1429 glDisable (GL_TEXTURE_2D); 1854 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1855 glDisable (GL_BLEND);
1431}
1432 1856
1857 // top layer: overlays such as the health bar
1858 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows)
1860 {
1861 maprow *row = self->row + (y + my);
1862
1863 for (x = 0; x < sw; x++)
1864 if (row->c0 <= x + mx && x + mx < row->c1)
1865 {
1866 mapcell *cell = row->col + (x + mx - row->c0);
1867
1868 int px = x * T;
1869 int py = y * T;
1870
1871 if (cell->stat_hp)
1872 {
1873 int width = cell->stat_width * T;
1874 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1875
1876 glColor3ub (0, 0, 0);
1877 glRectf (px + 1, py - thick - 2,
1878 px + width - 1, py);
1879
1880 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1881 glRectf (px + 2,
1882 py - thick - 1,
1883 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1884 }
1885 }
1886 }
1887}
1888
1433void 1889void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1890draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1891 CODE:
1436{ 1892{
1437 static float color[16][3] = { 1893 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1894 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1895 { 1.00F, 1.00F, 1.00F },
1489 glDisable (GL_BLEND); 1945 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1946 glDisable (GL_TEXTURE_2D);
1491} 1947}
1492 1948
1493void 1949void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1950fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1495 PPCODE: 1951 PPCODE:
1496{ 1952{
1497 int vx, vy;
1498 int x, y; 1953 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1954 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1955 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1956 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502 1957
1503 memset (darkness, 255, sw4 * sh); 1958 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1959 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1960 SvCUR_set (darkness_sv, sw4 * sh);
1506 1961
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1962 mx += self->x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1963 my += self->y;
1509 1964
1510 for (y = 0; y < sh; y++) 1965 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1966 if (0 <= y + my && y + my < self->rows)
1512 { 1967 {
1513 maprow *row = self->row + (y + vy); 1968 maprow *row = self->row + (y + my);
1514 1969
1515 for (x = 0; x < sw; x++) 1970 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1971 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 1972 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1973 mapcell *cell = row->col + (x + mx - row->c0);
1519 1974
1520 darkness[y * sw4 + x] = cell->darkness < 0 1975 darkness[y * sw4 + x] = cell->darkness
1976 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1977 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1978 }
1524 } 1979 }
1525 1980
1526 EXTEND (SP, 3); 1981 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1982 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1983 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1984 PUSHs (darkness_sv);
1530} 1985}
1531 1986
1532SV * 1987SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1988get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1989 CODE:
1535{ 1990{
1536 int x, y, x1, y1; 1991 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1992 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1993 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1563 if (row && row->c0 <= x && x < row->c1) 2018 if (row && row->c0 <= x && x < row->c1)
1564 { 2019 {
1565 mapcell *cell = row->col + (x - row->c0); 2020 mapcell *cell = row->col + (x - row->c0);
1566 uint8_t flags = 0; 2021 uint8_t flags = 0;
1567 2022
1568 if (cell->face [0]) flags |= 1; 2023 if (cell->tile [0]) flags |= 1;
1569 if (cell->face [1]) flags |= 2; 2024 if (cell->tile [1]) flags |= 2;
1570 if (cell->face [2]) flags |= 4; 2025 if (cell->tile [2]) flags |= 4;
1571 2026
1572 *data++ = flags; 2027 *data++ = flags;
1573 2028
1574 if (flags & 1) 2029 if (flags & 1)
1575 { 2030 {
2031 tileid tile = cell->tile [0];
1576 *data++ = cell->face [0] >> 8; 2032 *data++ = tile >> 8;
1577 *data++ = cell->face [0]; 2033 *data++ = tile;
1578 } 2034 }
1579 2035
1580 if (flags & 2) 2036 if (flags & 2)
1581 { 2037 {
2038 tileid tile = cell->tile [1];
1582 *data++ = cell->face [1] >> 8; 2039 *data++ = tile >> 8;
1583 *data++ = cell->face [1]; 2040 *data++ = tile;
1584 } 2041 }
1585 2042
1586 if (flags & 4) 2043 if (flags & 4)
1587 { 2044 {
2045 tileid tile = cell->tile [2];
1588 *data++ = cell->face [2] >> 8; 2046 *data++ = tile >> 8;
1589 *data++ = cell->face [2]; 2047 *data++ = tile;
1590 } 2048 }
1591 } 2049 }
1592 else 2050 else
1593 *data++ = 0; 2051 *data++ = 0;
1594 } 2052 }
1600} 2058}
1601 OUTPUT: 2059 OUTPUT:
1602 RETVAL 2060 RETVAL
1603 2061
1604void 2062void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2063set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 2064 PPCODE:
1607{ 2065{
1608 int x, y, z; 2066 int x, y, z;
1609 int w, h; 2067 int w, h;
1610 int x1, y1; 2068 int x1, y1;
1634 { 2092 {
1635 uint8_t flags = *data++; 2093 uint8_t flags = *data++;
1636 2094
1637 if (flags) 2095 if (flags)
1638 { 2096 {
1639 mapface face[3] = { 0, 0, 0 };
1640
1641 mapcell *cell = row_get_cell (row, x); 2097 mapcell *cell = row_get_cell (row, x);
2098 tileid tile[3] = { 0, 0, 0 };
1642 2099
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2100 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2101 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2102 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1646 2103
1647 if (cell->darkness <= 0) 2104 if (cell->darkness == 0)
1648 { 2105 {
1649 cell->darkness = -1; 2106 cell->darkness = 0;
1650 2107
1651 for (z = 0; z <= 2; z++) 2108 for (z = 0; z <= 2; z++)
1652 { 2109 {
1653 cell->face[z] = face[z]; 2110 tileid t = tile [z];
1654 2111
1655 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2112 if (t >= self->texs || (t && !self->tex [t].name))
2113 {
1656 XPUSHs (sv_2mortal (newSViv (face[z]))); 2114 XPUSHs (sv_2mortal (newSViv (t)));
2115 need_texid (self, t);
2116 }
2117
2118 cell->tile [z] = t;
1657 } 2119 }
1658 } 2120 }
1659 } 2121 }
1660 } 2122 }
1661 } 2123 }
1662} 2124}
1663 2125
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 2126MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 2127
1666CFClient::MixChunk 2128CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 2129new_from_file (SV *class, char *path)
1668 CODE: 2130 CODE:
1669 RETVAL = Mix_LoadWAV (path); 2131 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 2132 OUTPUT:
1671 RETVAL 2133 RETVAL
1672 2134
1673void 2135void
1674DESTROY (CFClient::MixChunk self) 2136DESTROY (CFPlus::MixChunk self)
1675 CODE: 2137 CODE:
1676 Mix_FreeChunk (self); 2138 Mix_FreeChunk (self);
1677 2139
1678int 2140int
1679volume (CFClient::MixChunk self, int volume = -1) 2141volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 2142 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 2143 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 2144 OUTPUT:
1683 RETVAL 2145 RETVAL
1684 2146
1685int 2147int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2148play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 2149 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2150 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 2151 OUTPUT:
1690 RETVAL 2152 RETVAL
1691 2153
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 2154MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 2155
1694int 2156int
1695volume (int volume = -1) 2157volume (int volume = -1)
1696 CODE: 2158 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 2159 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 2160 OUTPUT:
1699 RETVAL 2161 RETVAL
1700 2162
2163int
2164fade_out (int ms)
2165 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms);
2167 OUTPUT:
2168 RETVAL
2169
1701CFClient::MixMusic 2170CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 2171new_from_file (SV *class, char *path)
1703 CODE: 2172 CODE:
1704 RETVAL = Mix_LoadMUS (path); 2173 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 2174 OUTPUT:
1706 RETVAL 2175 RETVAL
1707 2176
1708void 2177void
1709DESTROY (CFClient::MixMusic self) 2178DESTROY (CFPlus::MixMusic self)
1710 CODE: 2179 CODE:
1711 Mix_FreeMusic (self); 2180 Mix_FreeMusic (self);
1712 2181
1713int 2182int
1714play (CFClient::MixMusic self, int loops = -1) 2183play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 2184 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 2185 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 2186 OUTPUT:
1718 RETVAL 2187 RETVAL
1719 2188
2189int
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2191 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2193 OUTPUT:
2194 RETVAL
2195
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 2197
1722BOOT: 2198BOOT:
1723{ 2199{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2200 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 2201 static const struct {
1726 const char *name; 2202 const char *name;
1727 IV iv; 2203 IV iv;
1728 } *civ, const_iv[] = { 2204 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 2205# define const_iv(name) { # name, (IV)name }
1792 const_iv (GL_SEPARABLE_2D), 2268 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 2269 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 2270 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 2271 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 2272 const_iv (GL_LINES),
2273 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 2274 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 2275 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 2276 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 2277 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 2278 const_iv (GL_TRIANGLE_STRIP),
1809# undef const_iv 2286# undef const_iv
1810 }; 2287 };
1811 2288
1812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2289 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1813 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2290 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2291
2292 texture_av = newAV ();
2293 AvREAL_off (texture_av);
1814} 2294}
1815 2295
1816char * 2296char *
1817gl_vendor () 2297gl_vendor ()
1818 CODE: 2298 CODE:
1911 r *= a; 2391 r *= a;
1912 g *= a; 2392 g *= a;
1913 b *= a; 2393 b *= a;
1914 } 2394 }
1915 // microsoft visual "c" rounds instead of truncating... 2395 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2396 glColor4f (r, g, b, a);
1917 MIN ((int)(g * 256.f), 255),
1918 MIN ((int)(b * 256.f), 255),
1919 MIN ((int)(a * 256.f), 255));
1920 2397
1921void glInterleavedArrays (int format, int stride, char *data) 2398void glInterleavedArrays (int format, int stride, char *data)
1922 2399
1923void glDrawElements (int mode, int count, int type, char *indices) 2400void glDrawElements (int mode, int count, int type, char *indices)
1924 2401
1970 2447
1971void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1972 2449
1973int glGenTexture () 2450int glGenTexture ()
1974 CODE: 2451 CODE:
1975{ 2452 RETVAL = gen_texture ();
1976 GLuint name;
1977 glGenTextures (1, &name);
1978 RETVAL = name;
1979}
1980 OUTPUT: 2453 OUTPUT:
1981 RETVAL 2454 RETVAL
1982 2455
1983void glDeleteTexture (int name) 2456void glDeleteTexture (int name)
1984 CODE: 2457 CODE:
1985{
1986 GLuint name_ = name;
1987 glDeleteTextures (1, &name_); 2458 del_texture (name);
1988} 2459
1989
1990int glGenList () 2460int glGenList ()
1991 CODE: 2461 CODE:
1992 RETVAL = glGenLists (1); 2462 RETVAL = glGenLists (1);
1993 OUTPUT: 2463 OUTPUT:
1994 RETVAL 2464 RETVAL
2001 2471
2002void glEndList () 2472void glEndList ()
2003 2473
2004void glCallList (int list) 2474void glCallList (int list)
2005 2475
2006

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines