ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines