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.197 by root, Sun Jul 15 21:08:40 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
550 664
551char * 665char *
552SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
553 667
554void 668void
555SDL_PollEvent () 669poll_events ()
556 PPCODE: 670 PPCODE:
557{ 671{
558 SDL_Event ev; 672 SDL_Event ev;
559 673
560 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
561 { 676 {
562 HV *hv = newHV (); 677 HV *hv = newHV ();
563 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
564 679
565 switch (ev.type) 680 switch (ev.type)
567 case SDL_KEYDOWN: 682 case SDL_KEYDOWN:
568 case SDL_KEYUP: 683 case SDL_KEYUP:
569 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 684 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
570 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 685 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
571 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 686 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
687 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
572 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 688 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
573 break; 689 break;
574 690
575 case SDL_ACTIVEEVENT: 691 case SDL_ACTIVEEVENT:
576 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
577 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
578 break; 694 break;
579 695
580 case SDL_MOUSEMOTION: 696 case SDL_MOUSEMOTION:
697 {
698 int state = ev.motion.state;
699 int x = ev.motion.x;
700 int y = ev.motion.y;
701 int xrel = ev.motion.xrel;
702 int yrel = ev.motion.yrel;
703
704 /* do simplistic event compression */
705 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
706 && state == ev.motion.state)
707 {
708 xrel += ev.motion.xrel;
709 yrel += ev.motion.yrel;
710 x = ev.motion.x;
711 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 }
714
581 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
582
583 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
584 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
585 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
586 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
587 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
588 break; 722 break;
589 723
590 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
591 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
592 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 736 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
603 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 737 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
604 break; 738 break;
605 } 739 }
606 740
607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 741 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
608 } 742 }
609} 743}
610 744
611int 745int
612Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 746Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
621Mix_AllocateChannels (int numchans = -1) 755Mix_AllocateChannels (int numchans = -1)
622 756
623void 757void
624lowdelay (int fd, int val = 1) 758lowdelay (int fd, int val = 1)
625 CODE: 759 CODE:
760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
761
762void
763win32_proxy_info ()
764 PPCODE:
765{
626#ifndef _WIN32 766#ifdef _WIN32
627 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 767 char buffer[2048];
768 DWORD buflen;
769
770 EXTEND (SP, 3);
771
772 buflen = sizeof (buffer);
773 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
774 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
775 {
776 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
777
778 buflen = sizeof (buffer);
779 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
780 {
781 PUSHs (newSVpv (buffer, 0));
782
783 buflen = sizeof (buffer);
784 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
785 PUSHs (newSVpv (buffer, 0));
786 }
787 }
628#endif 788#endif
789}
629 790
630void 791void
631add_font (char *file) 792add_font (char *file)
632 CODE: 793 CODE:
633 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 794 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
634 795
635void 796void
636load_image_inline (SV *image_) 797load_image_inline (SV *image_)
637 ALIAS: 798 ALIAS:
638 load_image_file = 1 799 load_image_file = 1
680 841
681 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 842 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
682 843
683 assert (surface2->pitch == surface2->w * 4); 844 assert (surface2->pitch == surface2->w * 4);
684 845
846 SDL_LockSurface (surface2);
685 EXTEND (SP, 5); 847 EXTEND (SP, 6);
686 PUSHs (sv_2mortal (newSViv (surface2->w))); 848 PUSHs (sv_2mortal (newSViv (surface2->w)));
687 PUSHs (sv_2mortal (newSViv (surface2->h))); 849 PUSHs (sv_2mortal (newSViv (surface2->h)));
688 SDL_LockSurface (surface2);
689 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 850 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))); 851 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
692 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 852 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
693 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 853 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
854 SDL_UnlockSurface (surface2);
694 855
695 SDL_FreeSurface (surface); 856 SDL_FreeSurface (surface);
696 SDL_FreeSurface (surface2); 857 SDL_FreeSurface (surface2);
697} 858}
698 859
737 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 898 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
738#endif 899#endif
739 _exit (1); 900 _exit (1);
740 901
741void 902void
742_exit (int retval) 903_exit (int retval = 0)
743 CODE: 904 CODE:
905#ifdef WIN32
906 ExitThread (retval); // unclean, please beam me up
907#else
744 _exit (retval); 908 _exit (retval);
909#endif
745 910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
746MODULE = CFClient PACKAGE = CFClient::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
747 921
748CFClient::Font 922CFPlus::Font
749new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
750 CODE: 924 CODE:
751{ 925{
752 int count; 926 int count;
753 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 927 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
756} 930}
757 OUTPUT: 931 OUTPUT:
758 RETVAL 932 RETVAL
759 933
760void 934void
761DESTROY (CFClient::Font self) 935DESTROY (CFPlus::Font self)
762 CODE: 936 CODE:
763 pango_font_description_free (self); 937 pango_font_description_free (self);
764 938
765void 939void
766make_default (CFClient::Font self) 940make_default (CFPlus::Font self)
767 CODE: 941 CODE:
768 default_font = self; 942 default_font = self;
769 943
770MODULE = CFClient PACKAGE = CFClient::Layout 944MODULE = CFPlus PACKAGE = CFPlus::Layout
771 945
772void 946void
773clear_font_cache () 947reset_glyph_cache ()
774 CODE: 948 CODE:
775 pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
776 tc_clear (); 949 tc_clear ();
777 950
778CFClient::Layout 951CFPlus::Layout
779new (SV *class, int type = 0) 952new (SV *class)
780 CODE: 953 CODE:
781 New (0, RETVAL, 1, struct cf_layout); 954 New (0, RETVAL, 1, struct cf_layout);
782 955
783 RETVAL->pl = pango_layout_new (opengl_context); 956 RETVAL->pl = pango_layout_new (opengl_context);
784 RETVAL->r = 1.; 957 RETVAL->r = 1.;
792 layout_update_font (RETVAL); 965 layout_update_font (RETVAL);
793 OUTPUT: 966 OUTPUT:
794 RETVAL 967 RETVAL
795 968
796void 969void
797DESTROY (CFClient::Layout self) 970DESTROY (CFPlus::Layout self)
798 CODE: 971 CODE:
799 g_object_unref (self->pl); 972 g_object_unref (self->pl);
800 Safefree (self); 973 Safefree (self);
801 974
802void 975void
803set_text (CFClient::Layout self, SV *text_) 976set_text (CFPlus::Layout self, SV *text_)
804 CODE: 977 CODE:
805{ 978{
806 STRLEN textlen; 979 STRLEN textlen;
807 char *text = SvPVutf8 (text_, textlen); 980 char *text = SvPVutf8 (text_, textlen);
808 981
809 pango_layout_set_text (self->pl, text, textlen); 982 pango_layout_set_text (self->pl, text, textlen);
810} 983}
811 984
812void 985void
813set_markup (CFClient::Layout self, SV *text_) 986set_markup (CFPlus::Layout self, SV *text_)
814 CODE: 987 CODE:
815{ 988{
816 STRLEN textlen; 989 STRLEN textlen;
817 char *text = SvPVutf8 (text_, textlen); 990 char *text = SvPVutf8 (text_, textlen);
818 991
819 pango_layout_set_markup (self->pl, text, textlen); 992 pango_layout_set_markup (self->pl, text, textlen);
820} 993}
821 994
822void 995void
823set_shapes (CFClient::Layout self, ...) 996set_shapes (CFPlus::Layout self, ...)
824 CODE: 997 CODE:
825{ 998{
826 PangoAttrList *attrs = 0; 999 PangoAttrList *attrs = 0;
827 const char *text = pango_layout_get_text (self->pl); 1000 const char *text = pango_layout_get_text (self->pl);
828 const char *pos = text; 1001 const char *pos = text;
863 if (attrs) 1036 if (attrs)
864 pango_layout_set_attributes (self->pl, attrs); 1037 pango_layout_set_attributes (self->pl, attrs);
865} 1038}
866 1039
867void 1040void
868get_shapes (CFClient::Layout self) 1041get_shapes (CFPlus::Layout self)
869 PPCODE: 1042 PPCODE:
870{ 1043{
871 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1044 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
872 1045
873 do 1046 do
877 if (run && shape_attr_p (run)) 1050 if (run && shape_attr_p (run))
878 { 1051 {
879 PangoRectangle extents; 1052 PangoRectangle extents;
880 pango_layout_iter_get_run_extents (iter, 0, &extents); 1053 pango_layout_iter_get_run_extents (iter, 0, &extents);
881 1054
1055 EXTEND (SP, 2);
882 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1056 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
883 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1057 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
884 } 1058 }
885 } 1059 }
886 while (pango_layout_iter_next_run (iter)); 1060 while (pango_layout_iter_next_run (iter));
887 1061
888 pango_layout_iter_free (iter); 1062 pango_layout_iter_free (iter);
889} 1063}
890 1064
891int 1065int
892has_wrapped (CFClient::Layout self) 1066has_wrapped (CFPlus::Layout self)
893 CODE: 1067 CODE:
894{ 1068{
895 int lines = 1; 1069 int lines = 1;
896 const char *text = pango_layout_get_text (self->pl); 1070 const char *text = pango_layout_get_text (self->pl);
897 1071
902} 1076}
903 OUTPUT: 1077 OUTPUT:
904 RETVAL 1078 RETVAL
905 1079
906SV * 1080SV *
907get_text (CFClient::Layout self) 1081get_text (CFPlus::Layout self)
908 CODE: 1082 CODE:
909 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1083 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
910 sv_utf8_decode (RETVAL); 1084 sv_utf8_decode (RETVAL);
911 OUTPUT: 1085 OUTPUT:
912 RETVAL 1086 RETVAL
913 1087
914void 1088void
915set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1089set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
916 CODE: 1090 CODE:
917 self->r = r; 1091 self->r = r;
918 self->g = g; 1092 self->g = g;
919 self->b = b; 1093 self->b = b;
920 self->a = a; 1094 self->a = a;
921 1095
922void 1096void
923set_font (CFClient::Layout self, CFClient::Font font = 0) 1097set_font (CFPlus::Layout self, CFPlus::Font font = 0)
924 CODE: 1098 CODE:
925 if (self->font != font) 1099 if (self->font != font)
926 { 1100 {
927 self->font = font; 1101 self->font = font;
928 layout_update_font (self); 1102 layout_update_font (self);
929 } 1103 }
930 1104
931void 1105void
932set_height (CFClient::Layout self, int base_height) 1106set_height (CFPlus::Layout self, int base_height)
933 CODE: 1107 CODE:
934 if (self->base_height != base_height) 1108 if (self->base_height != base_height)
935 { 1109 {
936 self->base_height = base_height; 1110 self->base_height = base_height;
937 layout_update_font (self); 1111 layout_update_font (self);
938 } 1112 }
939 1113
940void 1114void
941set_width (CFClient::Layout self, int max_width = -1) 1115set_width (CFPlus::Layout self, int max_width = -1)
942 CODE: 1116 CODE:
943 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1117 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
944 1118
945void 1119void
946set_indent (CFClient::Layout self, int indent) 1120set_indent (CFPlus::Layout self, int indent)
947 CODE: 1121 CODE:
948 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1122 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
949 1123
950void 1124void
951set_spacing (CFClient::Layout self, int spacing) 1125set_spacing (CFPlus::Layout self, int spacing)
952 CODE: 1126 CODE:
953 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1127 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
954 1128
955void 1129void
956set_ellipsise (CFClient::Layout self, int ellipsise) 1130set_ellipsise (CFPlus::Layout self, int ellipsise)
957 CODE: 1131 CODE:
958 pango_layout_set_ellipsize (self->pl, 1132 pango_layout_set_ellipsize (self->pl,
959 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1133 ellipsise == 1 ? PANGO_ELLIPSIZE_START
960 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1134 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
961 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1135 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
962 : PANGO_ELLIPSIZE_NONE 1136 : PANGO_ELLIPSIZE_NONE
963 ); 1137 );
964 1138
965void 1139void
966set_single_paragraph_mode (CFClient::Layout self, int spm) 1140set_single_paragraph_mode (CFPlus::Layout self, int spm)
967 CODE: 1141 CODE:
968 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1142 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
969 1143
970void 1144void
971size (CFClient::Layout self) 1145size (CFPlus::Layout self)
972 PPCODE: 1146 PPCODE:
973{ 1147{
974 int w, h; 1148 int w, h;
975 1149
976 layout_get_pixel_size (self, &w, &h); 1150 layout_get_pixel_size (self, &w, &h);
979 PUSHs (sv_2mortal (newSViv (w))); 1153 PUSHs (sv_2mortal (newSViv (w)));
980 PUSHs (sv_2mortal (newSViv (h))); 1154 PUSHs (sv_2mortal (newSViv (h)));
981} 1155}
982 1156
983int 1157int
984descent (CFClient::Layout self) 1158descent (CFPlus::Layout self)
985 CODE: 1159 CODE:
986{ 1160{
987 PangoRectangle rect; 1161 PangoRectangle rect;
988 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1162 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
989 pango_layout_line_get_pixel_extents (line, 0, &rect); 1163 pango_layout_line_get_pixel_extents (line, 0, &rect);
991} 1165}
992 OUTPUT: 1166 OUTPUT:
993 RETVAL 1167 RETVAL
994 1168
995int 1169int
996xy_to_index (CFClient::Layout self, int x, int y) 1170xy_to_index (CFPlus::Layout self, int x, int y)
997 CODE: 1171 CODE:
998{ 1172{
999 int index, trailing; 1173 int index, trailing;
1000 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1174 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1001 RETVAL = index; 1175 RETVAL = index + trailing;
1002} 1176}
1003 OUTPUT: 1177 OUTPUT:
1004 RETVAL 1178 RETVAL
1005 1179
1006void 1180void
1007cursor_pos (CFClient::Layout self, int index) 1181cursor_pos (CFPlus::Layout self, int index)
1008 PPCODE: 1182 PPCODE:
1009{ 1183{
1010 PangoRectangle strong_pos; 1184 PangoRectangle strong_pos;
1011 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1185 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1012 1186
1015 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1016 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1190 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1017} 1191}
1018 1192
1019void 1193void
1194index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1195 PPCODE:
1196{
1197 int line, x;
1198
1199 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1200 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1201
1202 EXTEND (SP, 2);
1203 PUSHs (sv_2mortal (newSViv (line - 1)));
1204 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1205}
1206
1207void
1208line_x_to_index (CFPlus::Layout self, int line, int x)
1209 PPCODE:
1210{
1211 PangoLayoutLine *lp;
1212 int index, trailing;
1213
1214 if (line < 0)
1215 XSRETURN_EMPTY;
1216
1217 if (!(lp = pango_layout_get_line (self->pl, line)))
1218 XSRETURN_EMPTY; /* do better */
1219
1220 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1221
1222 EXTEND (SP, 2);
1223 if (GIMME_V == G_SCALAR)
1224 PUSHs (sv_2mortal (newSViv (index + trailing)));
1225 else
1226 {
1227 PUSHs (sv_2mortal (newSViv (index)));
1228 PUSHs (sv_2mortal (newSViv (trailing)));
1229 }
1230}
1231
1232void
1020render (CFClient::Layout self, float x, float y) 1233render (CFPlus::Layout self, float x, float y, int flags = 0)
1021 PPCODE: 1234 PPCODE:
1022 pango_opengl_render_layout_subpixel ( 1235 pango_opengl_render_layout_subpixel (
1023 self->pl, 1236 self->pl,
1024 x * PANGO_SCALE, y * PANGO_SCALE, 1237 x * PANGO_SCALE, y * PANGO_SCALE,
1025 self->r, self->g, self->b, self->a 1238 self->r, self->g, self->b, self->a,
1239 flags
1026 ); 1240 );
1027 1241
1028MODULE = CFClient PACKAGE = CFClient::Texture 1242MODULE = CFPlus PACKAGE = CFPlus::Texture
1029 1243
1030void 1244void
1031pad2pot (SV *data_, SV *w_, SV *h_) 1245pad2pot (SV *data_, SV *w_, SV *h_)
1032 CODE: 1246 CODE:
1033{ 1247{
1111 glDisable (GL_ALPHA_TEST); 1325 glDisable (GL_ALPHA_TEST);
1112 glDisable (GL_BLEND); 1326 glDisable (GL_BLEND);
1113 } 1327 }
1114} 1328}
1115 1329
1116MODULE = CFClient PACKAGE = CFClient::Map 1330MODULE = CFPlus PACKAGE = CFPlus::Map
1117 1331
1118CFClient::Map 1332CFPlus::Map
1119new (SV *class, int map_width, int map_height) 1333new (SV *class)
1120 CODE: 1334 CODE:
1121 New (0, RETVAL, 1, struct map); 1335 New (0, RETVAL, 1, struct map);
1122 RETVAL->x = 0; 1336 RETVAL->x = 0;
1123 RETVAL->y = 0; 1337 RETVAL->y = 0;
1124 RETVAL->w = map_width; 1338 RETVAL->w = 0;
1125 RETVAL->h = map_height; 1339 RETVAL->h = 0;
1126 RETVAL->ox = 0; 1340 RETVAL->ox = 0;
1127 RETVAL->oy = 0; 1341 RETVAL->oy = 0;
1128 RETVAL->faces = 8192; 1342 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1129 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1343 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; 1344 RETVAL->rows = 0;
1133 RETVAL->row = 0; 1345 RETVAL->row = 0;
1134 OUTPUT: 1346 OUTPUT:
1135 RETVAL 1347 RETVAL
1136 1348
1137void 1349void
1138DESTROY (CFClient::Map self) 1350DESTROY (CFPlus::Map self)
1139 CODE: 1351 CODE:
1140{ 1352{
1141 map_clear (self); 1353 map_clear (self);
1142 Safefree (self->face); 1354 Safefree (self->face2tile);
1143 Safefree (self->tex); 1355 Safefree (self->tex);
1144 Safefree (self); 1356 Safefree (self);
1145} 1357}
1146 1358
1147void 1359void
1360resize (CFPlus::Map self, int map_width, int map_height)
1361 CODE:
1362 self->w = map_width;
1363 self->h = map_height;
1364
1365void
1148clear (CFClient::Map self) 1366clear (CFPlus::Map self)
1149 CODE: 1367 CODE:
1150 map_clear (self); 1368 map_clear (self);
1151 1369
1152void 1370void
1153set_face (CFClient::Map self, int face, int texid) 1371set_tileid (CFPlus::Map self, int face, int tile)
1154 CODE: 1372 CODE:
1155{ 1373{
1156 while (self->faces <= face) 1374 need_facenum (self, face); self->face2tile [face] = tile;
1157 { 1375 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} 1376}
1164 1377
1165void 1378void
1379set_smooth (CFPlus::Map self, int face, int smooth, int level)
1380 CODE:
1381{
1382 tileid texid;
1383 maptex *tex;
1384
1385 if (face < 0 || face >= self->faces)
1386 return;
1387
1388 if (smooth < 0 || smooth >= self->faces)
1389 return;
1390
1391 texid = self->face2tile [face];
1392
1393 if (!texid)
1394 return;
1395
1396 tex = self->tex + texid;
1397 tex->smoothtile = self->face2tile [smooth];
1398 tex->smoothlevel = level;
1399}
1400
1401void
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) 1402set_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: 1403 CODE:
1168{ 1404{
1169 while (self->texs <= texid) 1405 need_texid (self, texid);
1170 {
1171 Append (maptex, self->tex, self->texs, self->texs);
1172 self->texs *= 2;
1173 }
1174 1406
1175 { 1407 {
1176 maptex *tex = self->tex + texid; 1408 maptex *tex = self->tex + texid;
1177 1409
1178 tex->name = name; 1410 tex->name = name;
1195 // from transparent color bleeding and ugly wrapping effects. 1427 // from transparent color bleeding and ugly wrapping effects.
1196 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1197} 1429}
1198 1430
1199int 1431int
1200ox (CFClient::Map self) 1432ox (CFPlus::Map self)
1201 ALIAS: 1433 ALIAS:
1202 oy = 1 1434 oy = 1
1203 x = 2 1435 x = 2
1204 y = 3 1436 y = 3
1205 w = 4 1437 w = 4
1216 } 1448 }
1217 OUTPUT: 1449 OUTPUT:
1218 RETVAL 1450 RETVAL
1219 1451
1220void 1452void
1221scroll (CFClient::Map self, int dx, int dy) 1453scroll (CFPlus::Map self, int dx, int dy)
1222 CODE: 1454 CODE:
1223{ 1455{
1224 if (dx > 0) 1456 if (dx > 0)
1225 map_blank (self, self->x, self->y, dx - 1, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1226 else if (dx < 0) 1458 else if (dx < 0)
1227 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1459 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1228 1460
1229 if (dy > 0) 1461 if (dy > 0)
1230 map_blank (self, self->x, self->y, self->w, dy - 1); 1462 map_blank (self, self->x, self->y, self->w, dy);
1231 else if (dy < 0) 1463 else if (dy < 0)
1232 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1464 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1233 1465
1234 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1235 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1236 1468
1237 while (self->y < 0) 1469 while (self->y < 0)
1242 self->y += MAP_EXTEND_Y; 1474 self->y += MAP_EXTEND_Y;
1243 } 1475 }
1244} 1476}
1245 1477
1246void 1478void
1247map1a_update (CFClient::Map self, SV *data_) 1479map1a_update (CFPlus::Map self, SV *data_, int extmap)
1248 CODE: 1480 CODE:
1249{ 1481{
1250 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1482 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1251 uint8_t *data_end = (uint8_t *)SvEND (data_); 1483 uint8_t *data_end = (uint8_t *)SvEND (data_);
1252 mapcell *cell; 1484 mapcell *cell;
1253 int x, y, flags; 1485 int x, y, flags;
1254 1486
1255 while (data < data_end) 1487 while (data < data_end - 1)
1256 { 1488 {
1257 flags = (data [0] << 8) + data [1]; data += 2; 1489 flags = (data [0] << 8) + data [1]; data += 2;
1258 1490
1259 x = self->x + ((flags >> 10) & 63); 1491 x = self->x + ((flags >> 10) & 63);
1260 y = self->y + ((flags >> 4) & 63); 1492 y = self->y + ((flags >> 4) & 63);
1261 1493
1262 cell = map_get_cell (self, x, y); 1494 cell = map_get_cell (self, x, y);
1263 1495
1264 if (flags & 15) 1496 if (flags & 15)
1265 { 1497 {
1266 if (cell->darkness < 0) 1498 if (!cell->darkness)
1267 { 1499 {
1500 memset (cell, 0, sizeof (*cell));
1268 cell->darkness = 0; 1501 cell->darkness = 256;
1269 cell->face [0] = 0;
1270 cell->face [1] = 0;
1271 cell->face [2] = 0;
1272 } 1502 }
1273 1503
1274 cell->darkness = flags & 8 ? *data++ : 255;
1275
1276 //TODO: don't trust server data to be in-range(!) 1504 //TODO: don't trust server data to be in-range(!)
1505
1506 if (flags & 8)
1507 {
1508 if (extmap)
1509 {
1510 uint8_t ext, cmd;
1511
1512 do
1513 {
1514 ext = *data++;
1515 cmd = ext & 0x3f;
1516
1517 if (cmd < 4)
1518 cell->darkness = 255 - ext * 64 + 1;
1519 else if (cmd == 5) // health
1520 {
1521 cell->stat_width = 1;
1522 cell->stat_hp = *data++;
1523 }
1524 else if (cmd == 6) // monster width
1525 cell->stat_width = *data++ + 1;
1526 else if (cmd == 0x47)
1527 {
1528 if (*data == 4)
1529 ; // decode player count
1530
1531 data += *data + 1;
1532 }
1533 else if (cmd == 8) // cell flags
1534 cell->flags = *data++;
1535 else if (ext & 0x40) // unknown, multibyte => skip
1536 data += *data + 1;
1537 else
1538 data++;
1539 }
1540 while (ext & 0x80);
1541 }
1542 else
1543 cell->darkness = *data++ + 1;
1544 }
1277 1545
1278 if (flags & 4) 1546 if (flags & 4)
1279 { 1547 {
1280 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1548 faceid face = (data [0] << 8) + data [1]; data += 2;
1549 need_facenum (self, face);
1550 cell->tile [0] = self->face2tile [face];
1281 } 1551 }
1282 1552
1283 if (flags & 2) 1553 if (flags & 2)
1284 { 1554 {
1285 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1555 faceid face = (data [0] << 8) + data [1]; data += 2;
1556 need_facenum (self, face);
1557 cell->tile [1] = self->face2tile [face];
1286 } 1558 }
1287 1559
1288 if (flags & 1) 1560 if (flags & 1)
1289 { 1561 {
1290 cell->face [2] = 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 [2] = self->face2tile [face];
1291 } 1565 }
1292 } 1566 }
1293 else 1567 else
1294 cell->darkness = -1; 1568 cell->darkness = 0;
1295 } 1569 }
1296} 1570}
1297 1571
1298SV * 1572SV *
1299mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1573mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1300 CODE: 1574 CODE:
1301{ 1575{
1302 int x1, x; 1576 int x1, x;
1303 int y1, y; 1577 int y1, y;
1304 int z; 1578 int z;
1325 { 1599 {
1326 mapcell *cell = row->col + (x - row->c0); 1600 mapcell *cell = row->col + (x - row->c0);
1327 1601
1328 for (z = 0; z <= 0; z++) 1602 for (z = 0; z <= 0; z++)
1329 { 1603 {
1330 mapface face = cell->face [z];
1331
1332 if (face)
1333 {
1334 maptex tex = self->tex [face]; 1604 maptex tex = self->tex [cell->tile [z]];
1335 int a0 = 255 - tex.a; 1605 int a0 = 255 - tex.a;
1336 int a1 = tex.a; 1606 int a1 = tex.a;
1337 1607
1338 r = (r * a0 + tex.r * a1) / 255; 1608 r = (r * a0 + tex.r * a1) / 255;
1339 g = (g * a0 + tex.g * a1) / 255; 1609 g = (g * a0 + tex.g * a1) / 255;
1340 b = (b * a0 + tex.b * a1) / 255; 1610 b = (b * a0 + tex.b * a1) / 255;
1341 a = (a * a0 + tex.a * a1) / 255; 1611 a = (a * a0 + tex.a * a1) / 255;
1342 }
1343 } 1612 }
1344 } 1613 }
1345 1614
1346 *map++ = (r ) 1615 *map++ = (r )
1347 | (g << 8) 1616 | (g << 8)
1354} 1623}
1355 OUTPUT: 1624 OUTPUT:
1356 RETVAL 1625 RETVAL
1357 1626
1358void 1627void
1359draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1628draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1360 CODE: 1629 CODE:
1361{ 1630{
1362 int vx, vy; 1631 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1632 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1633 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1634 smooth_key skey;
1363 int x, y, z; 1635 int x, y, z;
1364 int last_name; 1636 int last_name;
1365 mapface face;
1366 1637
1367 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1638 // thats current max. sorry.
1368 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1639 if (sw > 255) sw = 255;
1640 if (sh > 255) sh = 255;
1369 1641
1370 /* 1642 // clear key, in case of extra padding
1371 int vx = self->vx = self->w >= sw 1643 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 1644
1380 glColor4ub (255, 255, 255, 255); 1645 glColor4ub (255, 255, 255, 255);
1381 1646
1382 glEnable (GL_BLEND); 1647 glEnable (GL_BLEND);
1383 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1648 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1386 1651
1387 glBegin (GL_QUADS); 1652 glBegin (GL_QUADS);
1388 1653
1389 last_name = 0; 1654 last_name = 0;
1390 1655
1656 mx += self->x;
1657 my += self->y;
1658
1659 // first pass: determine smooth_max
1660 // rather ugly, if you ask me
1661 // could also be stored inside mapcell and updated on change
1662 memset (smooth_max, 0, sizeof (smooth_max));
1663
1664 for (y = 0; y < sh; y++)
1665 if (0 <= y + my && y + my < self->rows)
1666 {
1667 maprow *row = self->row + (y + my);
1668
1669 for (x = 0; x < sw; x++)
1670 if (row->c0 <= x + mx && x + mx < row->c1)
1671 {
1672 mapcell *cell = row->col + (x + mx - row->c0);
1673
1674 smooth_max[x + 1][y + 1] =
1675 MAX (self->tex [cell->tile [0]].smoothlevel,
1676 MAX (self->tex [cell->tile [1]].smoothlevel,
1677 self->tex [cell->tile [2]].smoothlevel));
1678 }
1679 }
1680
1391 for (z = 0; z < 3; z++) 1681 for (z = 0; z <= 2; z++)
1682 {
1683 memset (smooth_level, 0, sizeof (smooth_level));
1684
1392 for (y = 0; y < sh; y++) 1685 for (y = 0; y < sh; y++)
1393 if (0 <= y + vy && y + vy < self->rows) 1686 if (0 <= y + my && y + my < self->rows)
1394 { 1687 {
1395 maprow *row = self->row + (y + vy); 1688 maprow *row = self->row + (y + my);
1396 1689
1397 for (x = 0; x < sw; x++) 1690 for (x = 0; x < sw; x++)
1398 if (row->c0 <= x + vx && x + vx < row->c1) 1691 if (row->c0 <= x + mx && x + mx < row->c1)
1399 { 1692 {
1400 mapcell *cell = row->col + (x + vx - row->c0); 1693 mapcell *cell = row->col + (x + mx - row->c0);
1401
1402 face = cell->face [z]; 1694 tileid tile = cell->tile [z];
1403 1695
1404 if (face) 1696 if (tile)
1697 {
1698 maptex tex = self->tex [tile];
1699 int px = (x + 1) * T - tex.w;
1700 int py = (y + 1) * T - tex.h;
1701
1702 // suppressing texture state switches here
1703 // is only moderately effective, but worth the extra effort
1704 if (last_name != tex.name)
1705 {
1706 if (!tex.name)
1707 tex = self->tex [2]; /* missing, replace by noface */
1708
1709 glEnd ();
1710 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1711 glBegin (GL_QUADS);
1712 }
1713
1714 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1715 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1716 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1717 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1718
1719 if (cell->flags && z == 2)
1720 {
1721 if (cell->flags & 1)
1722 {
1723 maptex tex = self->tex [1];
1724 int px = x * T + T * 2 / 32;
1725 int py = y * T - T * 6 / 32;
1726
1727 glEnd ();
1728 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1729 glBegin (GL_QUADS);
1730
1731 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1732 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1733 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1734 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1735 }
1736 }
1737
1738 // update smooth hash
1739 if (tex.smoothtile)
1740 {
1741 skey.tile = tex.smoothtile;
1742 skey.level = tex.smoothlevel;
1743
1744 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1745
1746 // add bits to current tile and all neighbours. skey.x|y is
1747 // shifted +1|+1 so we always stay positive.
1748
1749 // bits is ___n cccc CCCC bbbb
1750 // n do not draw borders&corners
1751 // c draw these corners, but...
1752 // C ... not these
1753 // b draw these borders
1754
1755 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1756 // ┃· ·· ·┃ ━━
1757
1758 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1759 // ·· ·· ·┏ ┓·
1760
1761 // full tile
1762 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1763
1764 // borders
1765 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1766 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1767 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1768 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1769
1770 // corners
1771 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1772 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1773 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1774 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1775 }
1776 }
1777 }
1778 }
1779
1780 // go through all smoothlevels, lowest to highest, then draw.
1781 // this is basically counting sort
1782 {
1783 int w, b;
1784
1785 for (w = 0; w < 256 / 32; ++w)
1786 {
1787 uint32_t smask = smooth_level [w];
1788 if (smask)
1789 for (b = 0; b < 32; ++b)
1790 if (smask & (((uint32_t)1) << b))
1405 { 1791 {
1406 maptex tex = self->tex [face]; 1792 int level = (w << 5) | b;
1793 HE *he;
1407 1794
1408 int px = (x + 1) * 32 - tex.w; 1795 hv_iterinit (smooth);
1409 int py = (y + 1) * 32 - tex.h; 1796 while ((he = hv_iternext (smooth)))
1410
1411 if (last_name != tex.name)
1412 { 1797 {
1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1799 IV bits = SvIVX (HeVAL (he));
1800
1801 if (!(bits & 0x1000)
1802 && skey->level == level
1803 && level > smooth_max [skey->x][skey->y])
1804 {
1805 maptex tex = self->tex [skey->tile];
1806 int px = (((int)skey->x) - 1) * T;
1807 int py = (((int)skey->y) - 1) * T;
1808 int border = bits & 15;
1809 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1810 float dx = tex.s * .0625f; // 16 images/row
1811 float dy = tex.t * .5f ; // 2 images/column
1812
1813 // this time naively avoiding texture state changes
1814 // save gobs of state changes.
1815 if (last_name != tex.name)
1816 {
1817 if (!tex.name)
1818 continue; // smoothing not yet available
1819
1413 glEnd (); 1820 glEnd ();
1414 last_name = tex.name;
1415 glBindTexture (GL_TEXTURE_2D, last_name); 1821 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1416 glBegin (GL_QUADS); 1822 glBegin (GL_QUADS);
1823 }
1824
1825 if (border)
1826 {
1827 float ox = border * dx;
1828
1829 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1830 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1831 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1832 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1833 }
1834
1835 if (corner)
1836 {
1837 float ox = corner * dx;
1838
1839 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1840 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1841 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1842 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1843 }
1844 }
1417 } 1845 }
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 } 1846 }
1424 }
1425 } 1847 }
1848 }
1849
1850 hv_clear (smooth);
1851 }
1426 1852
1427 glEnd (); 1853 glEnd ();
1428 1854
1429 glDisable (GL_TEXTURE_2D); 1855 glDisable (GL_TEXTURE_2D);
1430 glDisable (GL_BLEND); 1856 glDisable (GL_BLEND);
1431}
1432 1857
1858 // top layer: overlays such as the health bar
1859 for (y = 0; y < sh; y++)
1860 if (0 <= y + my && y + my < self->rows)
1861 {
1862 maprow *row = self->row + (y + my);
1863
1864 for (x = 0; x < sw; x++)
1865 if (row->c0 <= x + mx && x + mx < row->c1)
1866 {
1867 mapcell *cell = row->col + (x + mx - row->c0);
1868
1869 int px = x * T;
1870 int py = y * T;
1871
1872 if (cell->stat_hp)
1873 {
1874 int width = cell->stat_width * T;
1875 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1876
1877 glColor3ub (0, 0, 0);
1878 glRectf (px + 1, py - thick - 2,
1879 px + width - 1, py);
1880
1881 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1882 glRectf (px + 2,
1883 py - thick - 1,
1884 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1885 }
1886 }
1887 }
1888}
1889
1433void 1890void
1434draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1891draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1435 CODE: 1892 CODE:
1436{ 1893{
1437 static float color[16][3] = { 1894 static float color[16][3] = {
1438 { 0.00F, 0.00F, 0.00F }, 1895 { 0.00F, 0.00F, 0.00F },
1439 { 1.00F, 1.00F, 1.00F }, 1896 { 1.00F, 1.00F, 1.00F },
1489 glDisable (GL_BLEND); 1946 glDisable (GL_BLEND);
1490 glDisable (GL_TEXTURE_2D); 1947 glDisable (GL_TEXTURE_2D);
1491} 1948}
1492 1949
1493void 1950void
1494fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1951fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1495 PPCODE: 1952 PPCODE:
1496{ 1953{
1497 int vx, vy;
1498 int x, y; 1954 int x, y;
1499 int sw4 = (sw + 3) & ~3; 1955 int sw4 = (sw + 3) & ~3;
1500 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1956 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1501 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1957 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1502 1958
1503 memset (darkness, 255, sw4 * sh); 1959 memset (darkness, 255, sw4 * sh);
1504 SvPOK_only (darkness_sv); 1960 SvPOK_only (darkness_sv);
1505 SvCUR_set (darkness_sv, sw4 * sh); 1961 SvCUR_set (darkness_sv, sw4 * sh);
1506 1962
1507 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1963 mx += self->x;
1508 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1964 my += self->y;
1509 1965
1510 for (y = 0; y < sh; y++) 1966 for (y = 0; y < sh; y++)
1511 if (0 <= y + vy && y + vy < self->rows) 1967 if (0 <= y + my && y + my < self->rows)
1512 { 1968 {
1513 maprow *row = self->row + (y + vy); 1969 maprow *row = self->row + (y + my);
1514 1970
1515 for (x = 0; x < sw; x++) 1971 for (x = 0; x < sw; x++)
1516 if (row->c0 <= x + vx && x + vx < row->c1) 1972 if (row->c0 <= x + mx && x + mx < row->c1)
1517 { 1973 {
1518 mapcell *cell = row->col + (x + vx - row->c0); 1974 mapcell *cell = row->col + (x + mx - row->c0);
1519 1975
1520 darkness[y * sw4 + x] = cell->darkness < 0 1976 darkness[y * sw4 + x] = cell->darkness
1977 ? 255 - (cell->darkness - 1)
1521 ? 255 - FOW_DARKNESS 1978 : 255 - FOW_DARKNESS;
1522 : 255 - cell->darkness;
1523 } 1979 }
1524 } 1980 }
1525 1981
1526 EXTEND (SP, 3); 1982 EXTEND (SP, 3);
1527 PUSHs (sv_2mortal (newSViv (sw4))); 1983 PUSHs (sv_2mortal (newSViv (sw4)));
1528 PUSHs (sv_2mortal (newSViv (sh))); 1984 PUSHs (sv_2mortal (newSViv (sh)));
1529 PUSHs (darkness_sv); 1985 PUSHs (darkness_sv);
1530} 1986}
1531 1987
1532SV * 1988SV *
1533get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1989get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1534 CODE: 1990 CODE:
1535{ 1991{
1536 int x, y, x1, y1; 1992 int x, y, x1, y1;
1537 SV *data_sv = newSV (w * h * 7 + 5); 1993 SV *data_sv = newSV (w * h * 7 + 5);
1538 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1994 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1563 if (row && row->c0 <= x && x < row->c1) 2019 if (row && row->c0 <= x && x < row->c1)
1564 { 2020 {
1565 mapcell *cell = row->col + (x - row->c0); 2021 mapcell *cell = row->col + (x - row->c0);
1566 uint8_t flags = 0; 2022 uint8_t flags = 0;
1567 2023
1568 if (cell->face [0]) flags |= 1; 2024 if (cell->tile [0]) flags |= 1;
1569 if (cell->face [1]) flags |= 2; 2025 if (cell->tile [1]) flags |= 2;
1570 if (cell->face [2]) flags |= 4; 2026 if (cell->tile [2]) flags |= 4;
1571 2027
1572 *data++ = flags; 2028 *data++ = flags;
1573 2029
1574 if (flags & 1) 2030 if (flags & 1)
1575 { 2031 {
2032 tileid tile = cell->tile [0];
1576 *data++ = cell->face [0] >> 8; 2033 *data++ = tile >> 8;
1577 *data++ = cell->face [0]; 2034 *data++ = tile;
1578 } 2035 }
1579 2036
1580 if (flags & 2) 2037 if (flags & 2)
1581 { 2038 {
2039 tileid tile = cell->tile [1];
1582 *data++ = cell->face [1] >> 8; 2040 *data++ = tile >> 8;
1583 *data++ = cell->face [1]; 2041 *data++ = tile;
1584 } 2042 }
1585 2043
1586 if (flags & 4) 2044 if (flags & 4)
1587 { 2045 {
2046 tileid tile = cell->tile [2];
1588 *data++ = cell->face [2] >> 8; 2047 *data++ = tile >> 8;
1589 *data++ = cell->face [2]; 2048 *data++ = tile;
1590 } 2049 }
1591 } 2050 }
1592 else 2051 else
1593 *data++ = 0; 2052 *data++ = 0;
1594 } 2053 }
1600} 2059}
1601 OUTPUT: 2060 OUTPUT:
1602 RETVAL 2061 RETVAL
1603 2062
1604void 2063void
1605set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2064set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1606 PPCODE: 2065 PPCODE:
1607{ 2066{
1608 int x, y, z; 2067 int x, y, z;
1609 int w, h; 2068 int w, h;
1610 int x1, y1; 2069 int x1, y1;
1634 { 2093 {
1635 uint8_t flags = *data++; 2094 uint8_t flags = *data++;
1636 2095
1637 if (flags) 2096 if (flags)
1638 { 2097 {
1639 mapface face[3] = { 0, 0, 0 };
1640
1641 mapcell *cell = row_get_cell (row, x); 2098 mapcell *cell = row_get_cell (row, x);
2099 tileid tile[3] = { 0, 0, 0 };
1642 2100
1643 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2101 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1644 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2102 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1645 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2103 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1646 2104
1647 if (cell->darkness <= 0) 2105 if (cell->darkness == 0)
1648 { 2106 {
1649 cell->darkness = -1; 2107 cell->darkness = 0;
1650 2108
1651 for (z = 0; z <= 2; z++) 2109 for (z = 0; z <= 2; z++)
1652 { 2110 {
1653 cell->face[z] = face[z]; 2111 tileid t = tile [z];
1654 2112
1655 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2113 if (t >= self->texs || (t && !self->tex [t].name))
2114 {
1656 XPUSHs (sv_2mortal (newSViv (face[z]))); 2115 XPUSHs (sv_2mortal (newSViv (t)));
2116 need_texid (self, t);
2117 }
2118
2119 cell->tile [z] = t;
1657 } 2120 }
1658 } 2121 }
1659 } 2122 }
1660 } 2123 }
1661 } 2124 }
1662} 2125}
1663 2126
1664MODULE = CFClient PACKAGE = CFClient::MixChunk 2127MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1665 2128
1666CFClient::MixChunk 2129CFPlus::MixChunk
1667new_from_file (SV *class, char *path) 2130new_from_file (SV *class, char *path)
1668 CODE: 2131 CODE:
1669 RETVAL = Mix_LoadWAV (path); 2132 RETVAL = Mix_LoadWAV (path);
1670 OUTPUT: 2133 OUTPUT:
1671 RETVAL 2134 RETVAL
1672 2135
1673void 2136void
1674DESTROY (CFClient::MixChunk self) 2137DESTROY (CFPlus::MixChunk self)
1675 CODE: 2138 CODE:
1676 Mix_FreeChunk (self); 2139 Mix_FreeChunk (self);
1677 2140
1678int 2141int
1679volume (CFClient::MixChunk self, int volume = -1) 2142volume (CFPlus::MixChunk self, int volume = -1)
1680 CODE: 2143 CODE:
1681 RETVAL = Mix_VolumeChunk (self, volume); 2144 RETVAL = Mix_VolumeChunk (self, volume);
1682 OUTPUT: 2145 OUTPUT:
1683 RETVAL 2146 RETVAL
1684 2147
1685int 2148int
1686play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2149play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1687 CODE: 2150 CODE:
1688 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2151 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1689 OUTPUT: 2152 OUTPUT:
1690 RETVAL 2153 RETVAL
1691 2154
1692MODULE = CFClient PACKAGE = CFClient::MixMusic 2155MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1693 2156
1694int 2157int
1695volume (int volume = -1) 2158volume (int volume = -1)
1696 CODE: 2159 CODE:
1697 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
1698 OUTPUT: 2161 OUTPUT:
1699 RETVAL 2162 RETVAL
1700 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
1701CFClient::MixMusic 2171CFPlus::MixMusic
1702new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
1703 CODE: 2173 CODE:
1704 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
1705 OUTPUT: 2175 OUTPUT:
1706 RETVAL 2176 RETVAL
1707 2177
1708void 2178void
1709DESTROY (CFClient::MixMusic self) 2179DESTROY (CFPlus::MixMusic self)
1710 CODE: 2180 CODE:
1711 Mix_FreeMusic (self); 2181 Mix_FreeMusic (self);
1712 2182
1713int 2183int
1714play (CFClient::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
1715 CODE: 2185 CODE:
1716 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
1717 OUTPUT: 2187 OUTPUT:
1718 RETVAL 2188 RETVAL
1719 2189
2190int
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2192 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2194 OUTPUT:
2195 RETVAL
2196
1720MODULE = CFClient PACKAGE = CFClient::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1721 2198
1722BOOT: 2199BOOT:
1723{ 2200{
1724 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2201 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1725 static const struct { 2202 static const struct {
1726 const char *name; 2203 const char *name;
1727 IV iv; 2204 IV iv;
1728 } *civ, const_iv[] = { 2205 } *civ, const_iv[] = {
1729# define const_iv(name) { # name, (IV)name } 2206# define const_iv(name) { # name, (IV)name }
1792 const_iv (GL_SEPARABLE_2D), 2269 const_iv (GL_SEPARABLE_2D),
1793 const_iv (GL_CONVOLUTION_2D), 2270 const_iv (GL_CONVOLUTION_2D),
1794 const_iv (GL_CONVOLUTION_BORDER_MODE), 2271 const_iv (GL_CONVOLUTION_BORDER_MODE),
1795 const_iv (GL_CONSTANT_BORDER), 2272 const_iv (GL_CONSTANT_BORDER),
1796 const_iv (GL_LINES), 2273 const_iv (GL_LINES),
2274 const_iv (GL_LINE_STRIP),
1797 const_iv (GL_LINE_LOOP), 2275 const_iv (GL_LINE_LOOP),
1798 const_iv (GL_QUADS), 2276 const_iv (GL_QUADS),
1799 const_iv (GL_QUAD_STRIP), 2277 const_iv (GL_QUAD_STRIP),
1800 const_iv (GL_TRIANGLES), 2278 const_iv (GL_TRIANGLES),
1801 const_iv (GL_TRIANGLE_STRIP), 2279 const_iv (GL_TRIANGLE_STRIP),
1809# undef const_iv 2287# undef const_iv
1810 }; 2288 };
1811 2289
1812 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2290 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1813 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2291 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2292
2293 texture_av = newAV ();
2294 AvREAL_off (texture_av);
1814} 2295}
1815 2296
1816char * 2297char *
1817gl_vendor () 2298gl_vendor ()
1818 CODE: 2299 CODE:
1911 r *= a; 2392 r *= a;
1912 g *= a; 2393 g *= a;
1913 b *= a; 2394 b *= a;
1914 } 2395 }
1915 // microsoft visual "c" rounds instead of truncating... 2396 // microsoft visual "c" rounds instead of truncating...
1916 glColor4ub (MIN ((int)(r * 256.f), 255), 2397 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 2398
1921void glInterleavedArrays (int format, int stride, char *data) 2399void glInterleavedArrays (int format, int stride, char *data)
1922 2400
1923void glDrawElements (int mode, int count, int type, char *indices) 2401void glDrawElements (int mode, int count, int type, char *indices)
1924 2402
1970 2448
1971void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1972 2450
1973int glGenTexture () 2451int glGenTexture ()
1974 CODE: 2452 CODE:
1975{ 2453 RETVAL = gen_texture ();
1976 GLuint name;
1977 glGenTextures (1, &name);
1978 RETVAL = name;
1979}
1980 OUTPUT: 2454 OUTPUT:
1981 RETVAL 2455 RETVAL
1982 2456
1983void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
1984 CODE: 2458 CODE:
1985{
1986 GLuint name_ = name;
1987 glDeleteTextures (1, &name_); 2459 del_texture (name);
1988} 2460
1989
1990int glGenList () 2461int glGenList ()
1991 CODE: 2462 CODE:
1992 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
1993 OUTPUT: 2464 OUTPUT:
1994 RETVAL 2465 RETVAL
2001 2472
2002void glEndList () 2473void glEndList ()
2003 2474
2004void glCallList (int list) 2475void glCallList (int list)
2005 2476
2006

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines