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.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# 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>
7#endif 14#endif
8 15
9#include "EXTERN.h" 16#include "EXTERN.h"
10#include "perl.h" 17#include "perl.h"
11#include "XSUB.h" 18#include "XSUB.h"
12 19
13#ifdef _WIN32 20#ifdef _WIN32
14# undef pipe 21# undef pipe
15#endif 22#endif
16 23
24#include <assert.h>
17#include <math.h> 25#include <math.h>
18#include <string.h> 26#include <string.h>
19#include <stdio.h> 27#include <stdio.h>
20#include <stdlib.h> 28#include <stdlib.h>
21 29
36# include <sys/types.h> 44# include <sys/types.h>
37# include <sys/socket.h> 45# include <sys/socket.h>
38# include <netinet/in.h> 46# include <netinet/in.h>
39# include <netinet/tcp.h> 47# include <netinet/tcp.h>
40# include <inttypes.h> 48# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 49#endif
49 50
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 52
52#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
53 54
54#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
60# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 62#else
62# define PARACHUTE 0 63# define PARACHUTE 0
63#endif 64#endif
64 65
66static AV *texture_av;
67
65static struct 68static struct
66{ 69{
67#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 71#include "glfunc.h"
69#undef GL_FUNC 72#undef GL_FUNC
70} gl; 73} gl;
71 74
75static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 77{
74 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 82 else
79 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
80} 84}
81 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
82#include "texcache.c" 110#include "texcache.c"
83 111
84#include "pango-font.c" 112#include "pango-font.c"
85#include "pango-fontmap.c" 113#include "pango-fontmap.c"
86#include "pango-render.c" 114#include "pango-render.c"
155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156 184
157 if (!rect.width) rect.width = 1; 185 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1; 186 if (!rect.height) rect.height = 1;
159 187
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width; 188 *w = rect.width;
163 *h = rect.height; 189 *h = rect.height;
164} 190}
165 191
192typedef uint16_t tileid;
166typedef uint16_t mapface; 193typedef uint16_t faceid;
167 194
168typedef struct { 195typedef struct {
169 GLint name; 196 int name;
170 int w, h; 197 int w, h;
171 float s, t; 198 float s, t;
172 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
173} maptex; 202} maptex;
174 203
175typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
176 int16_t darkness; 207 uint16_t darkness;
177 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 209} mapcell;
179 210
180typedef struct { 211typedef struct {
181 int32_t c0, c1; 212 int32_t c0, c1;
182 mapcell *col; 213 mapcell *col;
183} maprow; 214} maprow;
184 215
185typedef struct map { 216typedef struct map {
186 int x, y, w, h; 217 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 219 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 220 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 221
194 int32_t rows; 222 int32_t rows;
195 maprow *row; 223 maprow *row;
196} *CFPlus__Map; 224} *CFPlus__Map;
197 225
217 return ptr; 245 return ptr;
218} 246}
219 247
220#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))
221#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))
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}
222 270
223static maprow * 271static maprow *
224map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
225{ 273{
226 if (0 > y) 274 if (0 > y)
295static void 343static void
296map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 344map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
297{ 345{
298 int x, y; 346 int x, y;
299 maprow *row; 347 maprow *row;
348 mapcell *cell;
300 349
301 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
302 if (y >= 0) 351 if (y >= 0)
303 { 352 {
304 if (y >= self->rows) 353 if (y >= self->rows)
310 if (x >= row->c0) 359 if (x >= row->c0)
311 { 360 {
312 if (x >= row->c1) 361 if (x >= row->c1)
313 break; 362 break;
314 363
315 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;
316 } 370 }
317 } 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);
318} 388}
319 389
320static void 390static void
321music_finished (void) 391music_finished (void)
322{ 392{
357 n |= n >> 8; 427 n |= n >> 8;
358 n |= n >> 16; 428 n |= n >> 16;
359 429
360 return n + 1; 430 return n + 1;
361} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
362 436
363MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
364 438
365PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
366 440
370 static const struct { 444 static const struct {
371 const char *name; 445 const char *name;
372 IV iv; 446 IV iv;
373 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
374# 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
375 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
376 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
377 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
378 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
379 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
388 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
389 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
390 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
391 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
392 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
393 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
394 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
395 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
396 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
397 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
452 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
453 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
454 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
455 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
456 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
457 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
458 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
459 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
460 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
461 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
462 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
463 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
464 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
465 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
466 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
467 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
468 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
469 const_iv (KMOD_CTRL),
470 const_iv (KMOD_SHIFT),
471 const_iv (KMOD_ALT),
472 const_iv (KMOD_META)
473# undef const_iv 556# undef const_iv
474 }; 557 };
475 558
476 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; )
477 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);
478} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
479 571
480int 572int
481in_destruct () 573in_destruct ()
482 CODE: 574 CODE:
483 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
554 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
555 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
556 ); 648 );
557 if (RETVAL) 649 if (RETVAL)
558 { 650 {
651 av_clear (texture_av);
652
559 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
560# 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);
561# include "glfunc.h" 655# include "glfunc.h"
562# undef GL_FUNC 656# undef GL_FUNC
657
563 } 658 }
564 OUTPUT: 659 OUTPUT:
565 RETVAL 660 RETVAL
566 661
567void 662void
586 case SDL_KEYDOWN: 681 case SDL_KEYDOWN:
587 case SDL_KEYUP: 682 case SDL_KEYUP:
588 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 683 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
589 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 684 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
590 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 685 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
686 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
591 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 687 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
592 break; 688 break;
593 689
594 case SDL_ACTIVEEVENT: 690 case SDL_ACTIVEEVENT:
595 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 691 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
596 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 692 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
597 break; 693 break;
598 694
599 case SDL_MOUSEMOTION: 695 case SDL_MOUSEMOTION:
696 {
697 int state = ev.motion.state;
698 int x = ev.motion.x;
699 int y = ev.motion.y;
700 int xrel = ev.motion.xrel;
701 int yrel = ev.motion.yrel;
702
703 /* do simplistic event compression */
704 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
705 && state == ev.motion.state)
706 {
707 xrel += ev.motion.xrel;
708 yrel += ev.motion.yrel;
709 x = ev.motion.x;
710 y = ev.motion.y;
711 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
712 }
713
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 714 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
601
602 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 715 hv_store (hv, "state", 5, newSViv (state), 0);
603 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 716 hv_store (hv, "x", 1, newSViv (x), 0);
604 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 717 hv_store (hv, "y", 1, newSViv (y), 0);
605 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 718 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
606 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 719 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
720 }
607 break; 721 break;
608 722
609 case SDL_MOUSEBUTTONDOWN: 723 case SDL_MOUSEBUTTONDOWN:
610 case SDL_MOUSEBUTTONUP: 724 case SDL_MOUSEBUTTONUP:
611 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 725 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
640Mix_AllocateChannels (int numchans = -1) 754Mix_AllocateChannels (int numchans = -1)
641 755
642void 756void
643lowdelay (int fd, int val = 1) 757lowdelay (int fd, int val = 1)
644 CODE: 758 CODE:
759 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
760
761void
762win32_proxy_info ()
763 PPCODE:
764{
645#ifndef _WIN32 765#ifdef _WIN32
646 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 766 char buffer[2048];
767 DWORD buflen;
768
769 EXTEND (SP, 3);
770
771 buflen = sizeof (buffer);
772 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
773 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
774 {
775 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
776
777 buflen = sizeof (buffer);
778 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
779 {
780 PUSHs (newSVpv (buffer, 0));
781
782 buflen = sizeof (buffer);
783 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
784 PUSHs (newSVpv (buffer, 0));
785 }
786 }
647#endif 787#endif
788}
648 789
649void 790void
650add_font (char *file) 791add_font (char *file)
651 CODE: 792 CODE:
652 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 793 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
756 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 897 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
757#endif 898#endif
758 _exit (1); 899 _exit (1);
759 900
760void 901void
761_exit (int retval) 902_exit (int retval = 0)
762 CODE: 903 CODE:
904#ifdef WIN32
905 ExitThread (retval); // unclean, please beam me up
906#else
763 _exit (retval); 907 _exit (retval);
908#endif
909
910void
911debug ()
912 CODE:
913{
914#if DEBUG
915 VALGRIND_DO_LEAK_CHECK;
916#endif
917}
764 918
765MODULE = CFPlus PACKAGE = CFPlus::Font 919MODULE = CFPlus PACKAGE = CFPlus::Font
766 920
767CFPlus::Font 921CFPlus::Font
768new_from_file (SV *class, char *path, int id = 0) 922new_from_file (SV *class, char *path, int id = 0)
1015xy_to_index (CFPlus::Layout self, int x, int y) 1169xy_to_index (CFPlus::Layout self, int x, int y)
1016 CODE: 1170 CODE:
1017{ 1171{
1018 int index, trailing; 1172 int index, trailing;
1019 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1173 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1020 RETVAL = index; 1174 RETVAL = index + trailing;
1021} 1175}
1022 OUTPUT: 1176 OUTPUT:
1023 RETVAL 1177 RETVAL
1024 1178
1025void 1179void
1031 1185
1032 EXTEND (SP, 3); 1186 EXTEND (SP, 3);
1033 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1187 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1034 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1188 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1035 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1190}
1191
1192void
1193index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1194 PPCODE:
1195{
1196 int line, x;
1197
1198 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1199 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1200
1201 EXTEND (SP, 2);
1202 PUSHs (sv_2mortal (newSViv (line - 1)));
1203 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1204}
1205
1206void
1207line_x_to_index (CFPlus::Layout self, int line, int x)
1208 PPCODE:
1209{
1210 PangoLayoutLine *lp;
1211 int index, trailing;
1212
1213 if (line < 0)
1214 XSRETURN_EMPTY;
1215
1216 if (!(lp = pango_layout_get_line (self->pl, line)))
1217 XSRETURN_EMPTY; /* do better */
1218
1219 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1220
1221 EXTEND (SP, 2);
1222 if (GIMME_V == G_SCALAR)
1223 PUSHs (sv_2mortal (newSViv (index + trailing)));
1224 else
1225 {
1226 PUSHs (sv_2mortal (newSViv (index)));
1227 PUSHs (sv_2mortal (newSViv (trailing)));
1228 }
1036} 1229}
1037 1230
1038void 1231void
1039render (CFPlus::Layout self, float x, float y, int flags = 0) 1232render (CFPlus::Layout self, float x, float y, int flags = 0)
1040 PPCODE: 1233 PPCODE:
1134} 1327}
1135 1328
1136MODULE = CFPlus PACKAGE = CFPlus::Map 1329MODULE = CFPlus PACKAGE = CFPlus::Map
1137 1330
1138CFPlus::Map 1331CFPlus::Map
1139new (SV *class, int map_width, int map_height) 1332new (SV *class)
1140 CODE: 1333 CODE:
1141 New (0, RETVAL, 1, struct map); 1334 New (0, RETVAL, 1, struct map);
1142 RETVAL->x = 0; 1335 RETVAL->x = 0;
1143 RETVAL->y = 0; 1336 RETVAL->y = 0;
1144 RETVAL->w = map_width; 1337 RETVAL->w = 0;
1145 RETVAL->h = map_height; 1338 RETVAL->h = 0;
1146 RETVAL->ox = 0; 1339 RETVAL->ox = 0;
1147 RETVAL->oy = 0; 1340 RETVAL->oy = 0;
1148 RETVAL->faces = 8192; 1341 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1149 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1342 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1150 RETVAL->texs = 8192;
1151 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1152 RETVAL->rows = 0; 1343 RETVAL->rows = 0;
1153 RETVAL->row = 0; 1344 RETVAL->row = 0;
1154 OUTPUT: 1345 OUTPUT:
1155 RETVAL 1346 RETVAL
1156 1347
1157void 1348void
1158DESTROY (CFPlus::Map self) 1349DESTROY (CFPlus::Map self)
1159 CODE: 1350 CODE:
1160{ 1351{
1161 map_clear (self); 1352 map_clear (self);
1162 Safefree (self->face); 1353 Safefree (self->face2tile);
1163 Safefree (self->tex); 1354 Safefree (self->tex);
1164 Safefree (self); 1355 Safefree (self);
1165} 1356}
1166 1357
1167void 1358void
1359resize (CFPlus::Map self, int map_width, int map_height)
1360 CODE:
1361 self->w = map_width;
1362 self->h = map_height;
1363
1364void
1168clear (CFPlus::Map self) 1365clear (CFPlus::Map self)
1169 CODE: 1366 CODE:
1170 map_clear (self); 1367 map_clear (self);
1171 1368
1172void 1369void
1173set_face (CFPlus::Map self, int face, int texid) 1370set_tileid (CFPlus::Map self, int face, int tile)
1174 CODE: 1371 CODE:
1175{ 1372{
1176 while (self->faces <= face) 1373 need_facenum (self, face); self->face2tile [face] = tile;
1177 { 1374 need_texid (self, tile);
1178 Append (mapface, self->face, self->faces, self->faces); 1375}
1179 self->faces *= 2;
1180 }
1181 1376
1182 self->face [face] = texid; 1377void
1378set_smooth (CFPlus::Map self, int face, int smooth, int level)
1379 CODE:
1380{
1381 tileid texid;
1382 maptex *tex;
1383
1384 if (face < 0 || face >= self->faces)
1385 return;
1386
1387 if (smooth < 0 || smooth >= self->faces)
1388 return;
1389
1390 texid = self->face2tile [face];
1391
1392 if (!texid)
1393 return;
1394
1395 tex = self->tex + texid;
1396 tex->smoothtile = self->face2tile [smooth];
1397 tex->smoothlevel = level;
1183} 1398}
1184 1399
1185void 1400void
1186set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1401set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1187 CODE: 1402 CODE:
1188{ 1403{
1189 while (self->texs <= texid) 1404 need_texid (self, texid);
1190 {
1191 Append (maptex, self->tex, self->texs, self->texs);
1192 self->texs *= 2;
1193 }
1194 1405
1195 { 1406 {
1196 maptex *tex = self->tex + texid; 1407 maptex *tex = self->tex + texid;
1197 1408
1198 tex->name = name; 1409 tex->name = name;
1240void 1451void
1241scroll (CFPlus::Map self, int dx, int dy) 1452scroll (CFPlus::Map self, int dx, int dy)
1242 CODE: 1453 CODE:
1243{ 1454{
1244 if (dx > 0) 1455 if (dx > 0)
1245 map_blank (self, self->x, self->y, dx - 1, self->h); 1456 map_blank (self, self->x, self->y, dx, self->h);
1246 else if (dx < 0) 1457 else if (dx < 0)
1247 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1458 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1248 1459
1249 if (dy > 0) 1460 if (dy > 0)
1250 map_blank (self, self->x, self->y, self->w, dy - 1); 1461 map_blank (self, self->x, self->y, self->w, dy);
1251 else if (dy < 0) 1462 else if (dy < 0)
1252 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1463 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1253 1464
1254 self->ox += dx; self->x += dx; 1465 self->ox += dx; self->x += dx;
1255 self->oy += dy; self->y += dy; 1466 self->oy += dy; self->y += dy;
1256 1467
1257 while (self->y < 0) 1468 while (self->y < 0)
1262 self->y += MAP_EXTEND_Y; 1473 self->y += MAP_EXTEND_Y;
1263 } 1474 }
1264} 1475}
1265 1476
1266void 1477void
1267map1a_update (CFPlus::Map self, SV *data_) 1478map1a_update (CFPlus::Map self, SV *data_, int extmap)
1268 CODE: 1479 CODE:
1269{ 1480{
1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1481 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1271 uint8_t *data_end = (uint8_t *)SvEND (data_); 1482 uint8_t *data_end = (uint8_t *)SvEND (data_);
1272 mapcell *cell; 1483 mapcell *cell;
1273 int x, y, flags; 1484 int x, y, flags;
1274 1485
1275 while (data < data_end) 1486 while (data < data_end - 1)
1276 { 1487 {
1277 flags = (data [0] << 8) + data [1]; data += 2; 1488 flags = (data [0] << 8) + data [1]; data += 2;
1278 1489
1279 x = self->x + ((flags >> 10) & 63); 1490 x = self->x + ((flags >> 10) & 63);
1280 y = self->y + ((flags >> 4) & 63); 1491 y = self->y + ((flags >> 4) & 63);
1281 1492
1282 cell = map_get_cell (self, x, y); 1493 cell = map_get_cell (self, x, y);
1283 1494
1284 if (flags & 15) 1495 if (flags & 15)
1285 { 1496 {
1286 if (cell->darkness < 0) 1497 if (!cell->darkness)
1287 { 1498 {
1499 memset (cell, 0, sizeof (*cell));
1288 cell->darkness = 0; 1500 cell->darkness = 256;
1289 cell->face [0] = 0;
1290 cell->face [1] = 0;
1291 cell->face [2] = 0;
1292 } 1501 }
1293 1502
1294 cell->darkness = flags & 8 ? *data++ : 255;
1295
1296 //TODO: don't trust server data to be in-range(!) 1503 //TODO: don't trust server data to be in-range(!)
1504
1505 if (flags & 8)
1506 {
1507 if (extmap)
1508 {
1509 uint8_t ext, cmd;
1510
1511 do
1512 {
1513 ext = *data++;
1514 cmd = ext & 0x3f;
1515
1516 if (cmd < 4)
1517 cell->darkness = 255 - ext * 64 + 1;
1518 else if (cmd == 5) // health
1519 {
1520 cell->stat_width = 1;
1521 cell->stat_hp = *data++;
1522 }
1523 else if (cmd == 6) // monster width
1524 cell->stat_width = *data++ + 1;
1525 else if (cmd == 0x47)
1526 {
1527 if (*data == 4)
1528 ; // decode player count
1529
1530 data += *data + 1;
1531 }
1532 else if (cmd == 8) // cell flags
1533 cell->flags = *data++;
1534 else if (ext & 0x40) // unknown, multibyte => skip
1535 data += *data + 1;
1536 else
1537 data++;
1538 }
1539 while (ext & 0x80);
1540 }
1541 else
1542 cell->darkness = *data++ + 1;
1543 }
1297 1544
1298 if (flags & 4) 1545 if (flags & 4)
1299 { 1546 {
1300 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1547 faceid face = (data [0] << 8) + data [1]; data += 2;
1548 need_facenum (self, face);
1549 cell->tile [0] = self->face2tile [face];
1301 } 1550 }
1302 1551
1303 if (flags & 2) 1552 if (flags & 2)
1304 { 1553 {
1305 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1554 faceid face = (data [0] << 8) + data [1]; data += 2;
1555 need_facenum (self, face);
1556 cell->tile [1] = self->face2tile [face];
1306 } 1557 }
1307 1558
1308 if (flags & 1) 1559 if (flags & 1)
1309 { 1560 {
1310 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1561 faceid face = (data [0] << 8) + data [1]; data += 2;
1562 need_facenum (self, face);
1563 cell->tile [2] = self->face2tile [face];
1311 } 1564 }
1312 } 1565 }
1313 else 1566 else
1314 cell->darkness = -1; 1567 cell->darkness = 0;
1315 } 1568 }
1316} 1569}
1317 1570
1318SV * 1571SV *
1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1572mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1345 { 1598 {
1346 mapcell *cell = row->col + (x - row->c0); 1599 mapcell *cell = row->col + (x - row->c0);
1347 1600
1348 for (z = 0; z <= 0; z++) 1601 for (z = 0; z <= 0; z++)
1349 { 1602 {
1350 mapface face = cell->face [z];
1351
1352 if (face)
1353 {
1354 maptex tex = self->tex [face]; 1603 maptex tex = self->tex [cell->tile [z]];
1355 int a0 = 255 - tex.a; 1604 int a0 = 255 - tex.a;
1356 int a1 = tex.a; 1605 int a1 = tex.a;
1357 1606
1358 r = (r * a0 + tex.r * a1) / 255; 1607 r = (r * a0 + tex.r * a1) / 255;
1359 g = (g * a0 + tex.g * a1) / 255; 1608 g = (g * a0 + tex.g * a1) / 255;
1360 b = (b * a0 + tex.b * a1) / 255; 1609 b = (b * a0 + tex.b * a1) / 255;
1361 a = (a * a0 + tex.a * a1) / 255; 1610 a = (a * a0 + tex.a * a1) / 255;
1362 }
1363 } 1611 }
1364 } 1612 }
1365 1613
1366 *map++ = (r ) 1614 *map++ = (r )
1367 | (g << 8) 1615 | (g << 8)
1374} 1622}
1375 OUTPUT: 1623 OUTPUT:
1376 RETVAL 1624 RETVAL
1377 1625
1378void 1626void
1379draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1627draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1380 CODE: 1628 CODE:
1381{ 1629{
1382 int vx, vy; 1630 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1631 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1632 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1633 smooth_key skey;
1383 int x, y, z; 1634 int x, y, z;
1384 int last_name; 1635 int last_name;
1385 mapface face;
1386 1636
1387 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1637 // thats current max. sorry.
1388 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1638 if (sw > 255) sw = 255;
1639 if (sh > 255) sh = 255;
1389 1640
1390 /* 1641 // clear key, in case of extra padding
1391 int vx = self->vx = self->w >= sw 1642 memset (&skey, 0, sizeof (skey));
1392 ? self->x + (self->w - sw) / 2
1393 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1394
1395 int vy = self->vy = self->h >= sh
1396 ? self->y + (self->h - sh) / 2
1397 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1398 */
1399 1643
1400 glColor4ub (255, 255, 255, 255); 1644 glColor4ub (255, 255, 255, 255);
1401 1645
1402 glEnable (GL_BLEND); 1646 glEnable (GL_BLEND);
1403 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1647 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1406 1650
1407 glBegin (GL_QUADS); 1651 glBegin (GL_QUADS);
1408 1652
1409 last_name = 0; 1653 last_name = 0;
1410 1654
1655 mx += self->x;
1656 my += self->y;
1657
1658 // first pass: determine smooth_max
1659 // rather ugly, if you ask me
1660 // could also be stored inside mapcell and updated on change
1661 memset (smooth_max, 0, sizeof (smooth_max));
1662
1663 for (y = 0; y < sh; y++)
1664 if (0 <= y + my && y + my < self->rows)
1665 {
1666 maprow *row = self->row + (y + my);
1667
1668 for (x = 0; x < sw; x++)
1669 if (row->c0 <= x + mx && x + mx < row->c1)
1670 {
1671 mapcell *cell = row->col + (x + mx - row->c0);
1672
1673 smooth_max[x + 1][y + 1] =
1674 MAX (self->tex [cell->tile [0]].smoothlevel,
1675 MAX (self->tex [cell->tile [1]].smoothlevel,
1676 self->tex [cell->tile [2]].smoothlevel));
1677 }
1678 }
1679
1411 for (z = 0; z < 3; z++) 1680 for (z = 0; z <= 2; z++)
1681 {
1682 memset (smooth_level, 0, sizeof (smooth_level));
1683
1412 for (y = 0; y < sh; y++) 1684 for (y = 0; y < sh; y++)
1413 if (0 <= y + vy && y + vy < self->rows) 1685 if (0 <= y + my && y + my < self->rows)
1414 { 1686 {
1415 maprow *row = self->row + (y + vy); 1687 maprow *row = self->row + (y + my);
1416 1688
1417 for (x = 0; x < sw; x++) 1689 for (x = 0; x < sw; x++)
1418 if (row->c0 <= x + vx && x + vx < row->c1) 1690 if (row->c0 <= x + mx && x + mx < row->c1)
1419 { 1691 {
1420 mapcell *cell = row->col + (x + vx - row->c0); 1692 mapcell *cell = row->col + (x + mx - row->c0);
1421
1422 face = cell->face [z]; 1693 tileid tile = cell->tile [z];
1423 1694
1424 if (face) 1695 if (tile)
1696 {
1697 maptex tex = self->tex [tile];
1698 int px = (x + 1) * T - tex.w;
1699 int py = (y + 1) * T - tex.h;
1700
1701 // suppressing texture state switches here
1702 // is only moderately effective, but worth the extra effort
1703 if (last_name != tex.name)
1704 {
1705 if (!tex.name)
1706 tex = self->tex [2]; /* missing, replace by noface */
1707
1708 glEnd ();
1709 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1710 glBegin (GL_QUADS);
1711 }
1712
1713 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1714 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1715 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1716 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1717
1718 if (cell->flags && z == 2)
1719 {
1720 if (cell->flags & 1)
1721 {
1722 maptex tex = self->tex [1];
1723 int px = x * T + T * 2 / 32;
1724 int py = y * T - T * 6 / 32;
1725
1726 glEnd ();
1727 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1728 glBegin (GL_QUADS);
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1734 }
1735 }
1736
1737 // update smooth hash
1738 if (tex.smoothtile)
1739 {
1740 skey.tile = tex.smoothtile;
1741 skey.level = tex.smoothlevel;
1742
1743 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1744
1745 // add bits to current tile and all neighbours. skey.x|y is
1746 // shifted +1|+1 so we always stay positive.
1747
1748 // bits is ___n cccc CCCC bbbb
1749 // n do not draw borders&corners
1750 // c draw these corners, but...
1751 // C ... not these
1752 // b draw these borders
1753
1754 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1755 // ┃· ·· ·┃ ━━
1756
1757 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1758 // ·· ·· ·┏ ┓·
1759
1760 // full tile
1761 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1762
1763 // borders
1764 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1765 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1766 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1767 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1768
1769 // corners
1770 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1771 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1772 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1773 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1774 }
1775 }
1776 }
1777 }
1778
1779 // go through all smoothlevels, lowest to highest, then draw.
1780 // this is basically counting sort
1781 {
1782 int w, b;
1783
1784 for (w = 0; w < 256 / 32; ++w)
1785 {
1786 uint32_t smask = smooth_level [w];
1787 if (smask)
1788 for (b = 0; b < 32; ++b)
1789 if (smask & (((uint32_t)1) << b))
1425 { 1790 {
1426 maptex tex = self->tex [face]; 1791 int level = (w << 5) | b;
1792 HE *he;
1427 1793
1428 int px = (x + 1) * 32 - tex.w; 1794 hv_iterinit (smooth);
1429 int py = (y + 1) * 32 - tex.h; 1795 while ((he = hv_iternext (smooth)))
1430
1431 if (last_name != tex.name)
1432 { 1796 {
1797 smooth_key *skey = (smooth_key *)HeKEY (he);
1798 IV bits = SvIVX (HeVAL (he));
1799
1800 if (!(bits & 0x1000)
1801 && skey->level == level
1802 && level > smooth_max [skey->x][skey->y])
1803 {
1804 maptex tex = self->tex [skey->tile];
1805 int px = (((int)skey->x) - 1) * T;
1806 int py = (((int)skey->y) - 1) * T;
1807 int border = bits & 15;
1808 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1809 float dx = tex.s * .0625f; // 16 images/row
1810 float dy = tex.t * .5f ; // 2 images/column
1811
1812 // this time naively avoiding texture state changes
1813 // save gobs of state changes.
1814 if (last_name != tex.name)
1815 {
1816 if (!tex.name)
1817 continue; // smoothing not yet available
1818
1433 glEnd (); 1819 glEnd ();
1434 last_name = tex.name;
1435 glBindTexture (GL_TEXTURE_2D, last_name); 1820 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1436 glBegin (GL_QUADS); 1821 glBegin (GL_QUADS);
1822 }
1823
1824 if (border)
1825 {
1826 float ox = border * dx;
1827
1828 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1829 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1830 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1831 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1832 }
1833
1834 if (corner)
1835 {
1836 float ox = corner * dx;
1837
1838 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1839 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1840 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1841 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1842 }
1843 }
1437 } 1844 }
1438
1439 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1442 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443 } 1845 }
1444 }
1445 } 1846 }
1847 }
1848
1849 hv_clear (smooth);
1850 }
1446 1851
1447 glEnd (); 1852 glEnd ();
1448 1853
1449 glDisable (GL_TEXTURE_2D); 1854 glDisable (GL_TEXTURE_2D);
1450 glDisable (GL_BLEND); 1855 glDisable (GL_BLEND);
1856
1857 // top layer: overlays such as the health bar
1858 for (y = 0; y < sh; y++)
1859 if (0 <= y + my && y + my < self->rows)
1860 {
1861 maprow *row = self->row + (y + my);
1862
1863 for (x = 0; x < sw; x++)
1864 if (row->c0 <= x + mx && x + mx < row->c1)
1865 {
1866 mapcell *cell = row->col + (x + mx - row->c0);
1867
1868 int px = x * T;
1869 int py = y * T;
1870
1871 if (cell->stat_hp)
1872 {
1873 int width = cell->stat_width * T;
1874 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1875
1876 glColor3ub (0, 0, 0);
1877 glRectf (px + 1, py - thick - 2,
1878 px + width - 1, py);
1879
1880 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1881 glRectf (px + 2,
1882 py - thick - 1,
1883 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1884 }
1885 }
1886 }
1451} 1887}
1452 1888
1453void 1889void
1454draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1890draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455 CODE: 1891 CODE:
1509 glDisable (GL_BLEND); 1945 glDisable (GL_BLEND);
1510 glDisable (GL_TEXTURE_2D); 1946 glDisable (GL_TEXTURE_2D);
1511} 1947}
1512 1948
1513void 1949void
1514fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1950fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1515 PPCODE: 1951 PPCODE:
1516{ 1952{
1517 int vx, vy;
1518 int x, y; 1953 int x, y;
1519 int sw4 = (sw + 3) & ~3; 1954 int sw4 = (sw + 3) & ~3;
1520 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1955 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1521 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1956 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1522 1957
1523 memset (darkness, 255, sw4 * sh); 1958 memset (darkness, 255, sw4 * sh);
1524 SvPOK_only (darkness_sv); 1959 SvPOK_only (darkness_sv);
1525 SvCUR_set (darkness_sv, sw4 * sh); 1960 SvCUR_set (darkness_sv, sw4 * sh);
1526 1961
1527 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1962 mx += self->x;
1528 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1963 my += self->y;
1529 1964
1530 for (y = 0; y < sh; y++) 1965 for (y = 0; y < sh; y++)
1531 if (0 <= y + vy && y + vy < self->rows) 1966 if (0 <= y + my && y + my < self->rows)
1532 { 1967 {
1533 maprow *row = self->row + (y + vy); 1968 maprow *row = self->row + (y + my);
1534 1969
1535 for (x = 0; x < sw; x++) 1970 for (x = 0; x < sw; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1) 1971 if (row->c0 <= x + mx && x + mx < row->c1)
1537 { 1972 {
1538 mapcell *cell = row->col + (x + vx - row->c0); 1973 mapcell *cell = row->col + (x + mx - row->c0);
1539 1974
1540 darkness[y * sw4 + x] = cell->darkness < 0 1975 darkness[y * sw4 + x] = cell->darkness
1976 ? 255 - (cell->darkness - 1)
1541 ? 255 - FOW_DARKNESS 1977 : 255 - FOW_DARKNESS;
1542 : 255 - cell->darkness;
1543 } 1978 }
1544 } 1979 }
1545 1980
1546 EXTEND (SP, 3); 1981 EXTEND (SP, 3);
1547 PUSHs (sv_2mortal (newSViv (sw4))); 1982 PUSHs (sv_2mortal (newSViv (sw4)));
1583 if (row && row->c0 <= x && x < row->c1) 2018 if (row && row->c0 <= x && x < row->c1)
1584 { 2019 {
1585 mapcell *cell = row->col + (x - row->c0); 2020 mapcell *cell = row->col + (x - row->c0);
1586 uint8_t flags = 0; 2021 uint8_t flags = 0;
1587 2022
1588 if (cell->face [0]) flags |= 1; 2023 if (cell->tile [0]) flags |= 1;
1589 if (cell->face [1]) flags |= 2; 2024 if (cell->tile [1]) flags |= 2;
1590 if (cell->face [2]) flags |= 4; 2025 if (cell->tile [2]) flags |= 4;
1591 2026
1592 *data++ = flags; 2027 *data++ = flags;
1593 2028
1594 if (flags & 1) 2029 if (flags & 1)
1595 { 2030 {
2031 tileid tile = cell->tile [0];
1596 *data++ = cell->face [0] >> 8; 2032 *data++ = tile >> 8;
1597 *data++ = cell->face [0]; 2033 *data++ = tile;
1598 } 2034 }
1599 2035
1600 if (flags & 2) 2036 if (flags & 2)
1601 { 2037 {
2038 tileid tile = cell->tile [1];
1602 *data++ = cell->face [1] >> 8; 2039 *data++ = tile >> 8;
1603 *data++ = cell->face [1]; 2040 *data++ = tile;
1604 } 2041 }
1605 2042
1606 if (flags & 4) 2043 if (flags & 4)
1607 { 2044 {
2045 tileid tile = cell->tile [2];
1608 *data++ = cell->face [2] >> 8; 2046 *data++ = tile >> 8;
1609 *data++ = cell->face [2]; 2047 *data++ = tile;
1610 } 2048 }
1611 } 2049 }
1612 else 2050 else
1613 *data++ = 0; 2051 *data++ = 0;
1614 } 2052 }
1654 { 2092 {
1655 uint8_t flags = *data++; 2093 uint8_t flags = *data++;
1656 2094
1657 if (flags) 2095 if (flags)
1658 { 2096 {
1659 mapface face[3] = { 0, 0, 0 };
1660
1661 mapcell *cell = row_get_cell (row, x); 2097 mapcell *cell = row_get_cell (row, x);
2098 tileid tile[3] = { 0, 0, 0 };
1662 2099
1663 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2100 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1664 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2101 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1665 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2102 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1666 2103
1667 if (cell->darkness <= 0) 2104 if (cell->darkness == 0)
1668 { 2105 {
1669 cell->darkness = -1; 2106 cell->darkness = 0;
1670 2107
1671 for (z = 0; z <= 2; z++) 2108 for (z = 0; z <= 2; z++)
1672 { 2109 {
1673 cell->face[z] = face[z]; 2110 tileid t = tile [z];
1674 2111
1675 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2112 if (t >= self->texs || (t && !self->tex [t].name))
2113 {
1676 XPUSHs (sv_2mortal (newSViv (face[z]))); 2114 XPUSHs (sv_2mortal (newSViv (t)));
2115 need_texid (self, t);
2116 }
2117
2118 cell->tile [z] = t;
1677 } 2119 }
1678 } 2120 }
1679 } 2121 }
1680 } 2122 }
1681 } 2123 }
1716 CODE: 2158 CODE:
1717 RETVAL = Mix_VolumeMusic (volume); 2159 RETVAL = Mix_VolumeMusic (volume);
1718 OUTPUT: 2160 OUTPUT:
1719 RETVAL 2161 RETVAL
1720 2162
2163int
2164fade_out (int ms)
2165 CODE:
2166 RETVAL = Mix_FadeOutMusic (ms);
2167 OUTPUT:
2168 RETVAL
2169
1721CFPlus::MixMusic 2170CFPlus::MixMusic
1722new_from_file (SV *class, char *path) 2171new_from_file (SV *class, char *path)
1723 CODE: 2172 CODE:
1724 RETVAL = Mix_LoadMUS (path); 2173 RETVAL = Mix_LoadMUS (path);
1725 OUTPUT: 2174 OUTPUT:
1732 2181
1733int 2182int
1734play (CFPlus::MixMusic self, int loops = -1) 2183play (CFPlus::MixMusic self, int loops = -1)
1735 CODE: 2184 CODE:
1736 RETVAL = Mix_PlayMusic (self, loops); 2185 RETVAL = Mix_PlayMusic (self, loops);
2186 OUTPUT:
2187 RETVAL
2188
2189int
2190fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2191 CODE:
2192 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1737 OUTPUT: 2193 OUTPUT:
1738 RETVAL 2194 RETVAL
1739 2195
1740MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2196MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1741 2197
1830# undef const_iv 2286# undef const_iv
1831 }; 2287 };
1832 2288
1833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2289 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1834 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2290 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2291
2292 texture_av = newAV ();
2293 AvREAL_off (texture_av);
1835} 2294}
1836 2295
1837char * 2296char *
1838gl_vendor () 2297gl_vendor ()
1839 CODE: 2298 CODE:
1988 2447
1989void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2448void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1990 2449
1991int glGenTexture () 2450int glGenTexture ()
1992 CODE: 2451 CODE:
1993{ 2452 RETVAL = gen_texture ();
1994 GLuint name;
1995 glGenTextures (1, &name);
1996 RETVAL = name;
1997}
1998 OUTPUT: 2453 OUTPUT:
1999 RETVAL 2454 RETVAL
2000 2455
2001void glDeleteTexture (int name) 2456void glDeleteTexture (int name)
2002 CODE: 2457 CODE:
2003{
2004 GLuint name_ = name;
2005 glDeleteTextures (1, &name_); 2458 del_texture (name);
2006} 2459
2007
2008int glGenList () 2460int glGenList ()
2009 CODE: 2461 CODE:
2010 RETVAL = glGenLists (1); 2462 RETVAL = glGenLists (1);
2011 OUTPUT: 2463 OUTPUT:
2012 RETVAL 2464 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines