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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines