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.152 by root, Sat Aug 19 18:18:36 2006 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines