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.158 by root, Sun Oct 1 18:17:37 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 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# include <wininet.h>
7# 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>
8#endif 14#endif
9 15
10#include "EXTERN.h" 16#include "EXTERN.h"
11#include "perl.h" 17#include "perl.h"
12#include "XSUB.h" 18#include "XSUB.h"
13 19
14#ifdef _WIN32 20#ifdef _WIN32
15# undef pipe 21# undef pipe
16#endif 22#endif
17 23
24#include <assert.h>
18#include <math.h> 25#include <math.h>
19#include <string.h> 26#include <string.h>
20#include <stdio.h> 27#include <stdio.h>
21#include <stdlib.h> 28#include <stdlib.h>
22 29
… …
37# include <sys/types.h> 44# include <sys/types.h>
38# include <sys/socket.h> 45# include <sys/socket.h>
39# include <netinet/in.h> 46# include <netinet/in.h>
40# include <netinet/tcp.h> 47# include <netinet/tcp.h>
41# include <inttypes.h> 48# include <inttypes.h>
42#else
43 typedef unsigned char uint8_t;
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 49#endif
50 50
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 52
53#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
54 54
55#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
… …
61# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
62#else 62#else
63# define PARACHUTE 0 63# define PARACHUTE 0
64#endif 64#endif
65 65
66static AV *texture_av;
67
66static struct 68static struct
67{ 69{
68#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h" 71#include "glfunc.h"
70#undef GL_FUNC 72#undef GL_FUNC
71} gl; 73} gl;
72 74
75static void
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{ 77{
75 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else 82 else
80 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
81} 84}
82 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
83#include "texcache.c" 110#include "texcache.c"
84 111
85#include "pango-font.c" 112#include "pango-font.c"
86#include "pango-fontmap.c" 113#include "pango-fontmap.c"
87#include "pango-render.c" 114#include "pango-render.c"
… …
160 187
161 *w = rect.width; 188 *w = rect.width;
162 *h = rect.height; 189 *h = rect.height;
163} 190}
164 191
192typedef uint16_t tileid;
165typedef uint16_t mapface; 193typedef uint16_t faceid;
166 194
167typedef struct { 195typedef struct {
168 GLint name; 196 int name;
169 int w, h; 197 int w, h;
170 float s, t; 198 float s, t;
171 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
172} maptex; 202} maptex;
173 203
174typedef struct { 204typedef struct {
175 uint32_t player; 205 uint32_t player;
176 mapface face[3]; 206 tileid tile[3];
177 uint16_t darkness; 207 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
179} mapcell; 209} mapcell;
180 210
181typedef struct { 211typedef struct {
182 int32_t c0, c1; 212 int32_t c0, c1;
183 mapcell *col; 213 mapcell *col;
184} maprow; 214} maprow;
185 215
186typedef struct map { 216typedef struct map {
187 int x, y, w, h; 217 int x, y, w, h;
188 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
189 int faces; 219 int faces; tileid *face2tile; // [faceid]
190 mapface *face; 220 int texs; maptex *tex; // [tileid]
191
192 int texs;
193 maptex *tex;
194 221
195 int32_t rows; 222 int32_t rows;
196 maprow *row; 223 maprow *row;
197} *CFPlus__Map; 224} *CFPlus__Map;
198 225
… …
218 return ptr; 245 return ptr;
219} 246}
220 247
221#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))
222#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}
223 270
224static maprow * 271static maprow *
225map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
226{ 273{
227 if (0 > y) 274 if (0 > y)
… …
322 cell->player = 0; 369 cell->player = 0;
323 } 370 }
324 } 371 }
325} 372}
326 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);
388}
389
327static void 390static void
328music_finished (void) 391music_finished (void)
329{ 392{
330 SDL_UserEvent ev; 393 SDL_UserEvent ev;
331 394
… …
364 n |= n >> 8; 427 n |= n >> 8;
365 n |= n >> 16; 428 n |= n >> 16;
366 429
367 return n + 1; 430 return n + 1;
368} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
369 436
370MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
371 438
372PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
373 440
… …
377 static const struct { 444 static const struct {
378 const char *name; 445 const char *name;
379 IV iv; 446 IV iv;
380 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
381# 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
382 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
… …
395 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
399 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
400 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
… …
459 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
464 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
476 const_iv (KMOD_CTRL),
477 const_iv (KMOD_SHIFT),
478 const_iv (KMOD_ALT),
479 const_iv (KMOD_META)
480# undef const_iv 556# undef const_iv
481 }; 557 };
482 558
483 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; )
484 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);
485} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
486 571
487int 572int
488in_destruct () 573in_destruct ()
489 CODE: 574 CODE:
490 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
… …
561 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
563 ); 648 );
564 if (RETVAL) 649 if (RETVAL)
565 { 650 {
651 av_clear (texture_av);
652
566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567# 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);
568# include "glfunc.h" 655# include "glfunc.h"
569# undef GL_FUNC 656# undef GL_FUNC
657
570 } 658 }
571 OUTPUT: 659 OUTPUT:
572 RETVAL 660 RETVAL
573 661
574void 662void
575SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
576 664
577char * 665char *
578SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
579 667
668int
669SDL_GetAppState ()
670
580void 671void
581SDL_PollEvent () 672poll_events ()
582 PPCODE: 673 PPCODE:
583{ 674{
584 SDL_Event ev; 675 SDL_Event ev;
585 676
586 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587 { 679 {
588 HV *hv = newHV (); 680 HV *hv = newHV ();
589 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590 682
591 switch (ev.type) 683 switch (ev.type)
… …
593 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
594 case SDL_KEYUP: 686 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 692 break;
600 693
601 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604 break; 697 break;
605 698
606 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
614 break; 725 break;
615 726
616 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
617 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
… …
647Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
648 759
649void 760void
650lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
651 CODE: 762 CODE:
652#ifndef _WIN32
653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654#endif
655 764
656void 765void
657win32_proxy_info () 766win32_proxy_info ()
658 PPCODE: 767 PPCODE:
659{ 768{
660#ifdef _WIN32 769#ifdef _WIN32
661 INTERNET_PROXY_INFO proxyinfo;
662 char buffer[2048]; 770 char buffer[2048];
663 DWORD buflen; 771 DWORD buflen;
664 772
665 EXTEND (SP, 3); 773 EXTEND (SP, 3);
666 774
… …
795 _exit (1); 903 _exit (1);
796 904
797void 905void
798_exit (int retval = 0) 906_exit (int retval = 0)
799 CODE: 907 CODE:
908#ifdef WIN32
909 ExitThread (retval); // unclean, please beam me up
910#else
800 _exit (retval); 911 _exit (retval);
912#endif
913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
801 922
802MODULE = CFPlus PACKAGE = CFPlus::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
803 924
804CFPlus::Font 925CFPlus::Font
805new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
… …
1052xy_to_index (CFPlus::Layout self, int x, int y) 1173xy_to_index (CFPlus::Layout self, int x, int y)
1053 CODE: 1174 CODE:
1054{ 1175{
1055 int index, trailing; 1176 int index, trailing;
1056 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1177 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1057 RETVAL = index; 1178 RETVAL = index + trailing;
1058} 1179}
1059 OUTPUT: 1180 OUTPUT:
1060 RETVAL 1181 RETVAL
1061 1182
1062void 1183void
… …
1068 1189
1069 EXTEND (SP, 3); 1190 EXTEND (SP, 3);
1070 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1191 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1071 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1192 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1072 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1193 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1194}
1195
1196void
1197index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1198 PPCODE:
1199{
1200 int line, x;
1201
1202 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1203 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1204
1205 EXTEND (SP, 2);
1206 PUSHs (sv_2mortal (newSViv (line - 1)));
1207 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1208}
1209
1210void
1211line_x_to_index (CFPlus::Layout self, int line, int x)
1212 PPCODE:
1213{
1214 PangoLayoutLine *lp;
1215 int index, trailing;
1216
1217 if (line < 0)
1218 XSRETURN_EMPTY;
1219
1220 if (!(lp = pango_layout_get_line (self->pl, line)))
1221 XSRETURN_EMPTY; /* do better */
1222
1223 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1224
1225 EXTEND (SP, 2);
1226 if (GIMME_V == G_SCALAR)
1227 PUSHs (sv_2mortal (newSViv (index + trailing)));
1228 else
1229 {
1230 PUSHs (sv_2mortal (newSViv (index)));
1231 PUSHs (sv_2mortal (newSViv (trailing)));
1232 }
1073} 1233}
1074 1234
1075void 1235void
1076render (CFPlus::Layout self, float x, float y, int flags = 0) 1236render (CFPlus::Layout self, float x, float y, int flags = 0)
1077 PPCODE: 1237 PPCODE:
… …
1171} 1331}
1172 1332
1173MODULE = CFPlus PACKAGE = CFPlus::Map 1333MODULE = CFPlus PACKAGE = CFPlus::Map
1174 1334
1175CFPlus::Map 1335CFPlus::Map
1176new (SV *class, int map_width, int map_height) 1336new (SV *class)
1177 CODE: 1337 CODE:
1178 New (0, RETVAL, 1, struct map); 1338 New (0, RETVAL, 1, struct map);
1179 RETVAL->x = 0; 1339 RETVAL->x = 0;
1180 RETVAL->y = 0; 1340 RETVAL->y = 0;
1181 RETVAL->w = map_width; 1341 RETVAL->w = 0;
1182 RETVAL->h = map_height; 1342 RETVAL->h = 0;
1183 RETVAL->ox = 0; 1343 RETVAL->ox = 0;
1184 RETVAL->oy = 0; 1344 RETVAL->oy = 0;
1185 RETVAL->faces = 8192; 1345 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1186 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1346 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1187 RETVAL->texs = 8192;
1188 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1189 RETVAL->rows = 0; 1347 RETVAL->rows = 0;
1190 RETVAL->row = 0; 1348 RETVAL->row = 0;
1191 OUTPUT: 1349 OUTPUT:
1192 RETVAL 1350 RETVAL
1193 1351
1194void 1352void
1195DESTROY (CFPlus::Map self) 1353DESTROY (CFPlus::Map self)
1196 CODE: 1354 CODE:
1197{ 1355{
1198 map_clear (self); 1356 map_clear (self);
1199 Safefree (self->face); 1357 Safefree (self->face2tile);
1200 Safefree (self->tex); 1358 Safefree (self->tex);
1201 Safefree (self); 1359 Safefree (self);
1202} 1360}
1203 1361
1204void 1362void
1363resize (CFPlus::Map self, int map_width, int map_height)
1364 CODE:
1365 self->w = map_width;
1366 self->h = map_height;
1367
1368void
1205clear (CFPlus::Map self) 1369clear (CFPlus::Map self)
1206 CODE: 1370 CODE:
1207 map_clear (self); 1371 map_clear (self);
1208 1372
1209void 1373void
1210set_face (CFPlus::Map self, int face, int texid) 1374set_tileid (CFPlus::Map self, int face, int tile)
1211 CODE: 1375 CODE:
1212{ 1376{
1213 while (self->faces <= face) 1377 need_facenum (self, face); self->face2tile [face] = tile;
1214 { 1378 need_texid (self, tile);
1215 Append (mapface, self->face, self->faces, self->faces); 1379}
1216 self->faces *= 2;
1217 }
1218 1380
1219 self->face [face] = texid; 1381void
1382set_smooth (CFPlus::Map self, int face, int smooth, int level)
1383 CODE:
1384{
1385 tileid texid;
1386 maptex *tex;
1387
1388 if (face < 0 || face >= self->faces)
1389 return;
1390
1391 if (smooth < 0 || smooth >= self->faces)
1392 return;
1393
1394 texid = self->face2tile [face];
1395
1396 if (!texid)
1397 return;
1398
1399 tex = self->tex + texid;
1400 tex->smoothtile = self->face2tile [smooth];
1401 tex->smoothlevel = level;
1220} 1402}
1221 1403
1222void 1404void
1223set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1405set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1224 CODE: 1406 CODE:
1225{ 1407{
1226 while (self->texs <= texid) 1408 need_texid (self, texid);
1227 {
1228 Append (maptex, self->tex, self->texs, self->texs);
1229 self->texs *= 2;
1230 }
1231 1409
1232 { 1410 {
1233 maptex *tex = self->tex + texid; 1411 maptex *tex = self->tex + texid;
1234 1412
1235 tex->name = name; 1413 tex->name = name;
… …
1279 CODE: 1457 CODE:
1280{ 1458{
1281 if (dx > 0) 1459 if (dx > 0)
1282 map_blank (self, self->x, self->y, dx, self->h); 1460 map_blank (self, self->x, self->y, dx, self->h);
1283 else if (dx < 0) 1461 else if (dx < 0)
1284 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1462 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1285 1463
1286 if (dy > 0) 1464 if (dy > 0)
1287 map_blank (self, self->x, self->y, self->w, dy); 1465 map_blank (self, self->x, self->y, self->w, dy);
1288 else if (dy < 0) 1466 else if (dy < 0)
1289 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1467 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1290 1468
1291 self->ox += dx; self->x += dx; 1469 self->ox += dx; self->x += dx;
1292 self->oy += dy; self->y += dy; 1470 self->oy += dy; self->y += dy;
1293 1471
1294 while (self->y < 0) 1472 while (self->y < 0)
… …
1346 cell->stat_width = 1; 1524 cell->stat_width = 1;
1347 cell->stat_hp = *data++; 1525 cell->stat_hp = *data++;
1348 } 1526 }
1349 else if (cmd == 6) // monster width 1527 else if (cmd == 6) // monster width
1350 cell->stat_width = *data++ + 1; 1528 cell->stat_width = *data++ + 1;
1351 else if (cmd == 0x47) // monster width 1529 else if (cmd == 0x47)
1352 { 1530 {
1353 if (*data == 4) 1531 if (*data == 4)
1354 ; // decode player tag 1532 ; // decode player count
1355 1533
1356 data += *data + 1; 1534 data += *data + 1;
1357 } 1535 }
1358 else if (cmd == 8) // cell flags 1536 else if (cmd == 8) // cell flags
1359 cell->flags = *data++; 1537 cell->flags = *data++;
… …
1368 cell->darkness = *data++ + 1; 1546 cell->darkness = *data++ + 1;
1369 } 1547 }
1370 1548
1371 if (flags & 4) 1549 if (flags & 4)
1372 { 1550 {
1373 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1551 faceid face = (data [0] << 8) + data [1]; data += 2;
1552 need_facenum (self, face);
1553 cell->tile [0] = self->face2tile [face];
1374 } 1554 }
1375 1555
1376 if (flags & 2) 1556 if (flags & 2)
1377 { 1557 {
1378 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1558 faceid face = (data [0] << 8) + data [1]; data += 2;
1559 need_facenum (self, face);
1560 cell->tile [1] = self->face2tile [face];
1379 } 1561 }
1380 1562
1381 if (flags & 1) 1563 if (flags & 1)
1382 { 1564 {
1383 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1565 faceid face = (data [0] << 8) + data [1]; data += 2;
1566 need_facenum (self, face);
1567 cell->tile [2] = self->face2tile [face];
1384 } 1568 }
1385 } 1569 }
1386 else 1570 else
1387 cell->darkness = 0; 1571 cell->darkness = 0;
1388 } 1572 }
… …
1418 { 1602 {
1419 mapcell *cell = row->col + (x - row->c0); 1603 mapcell *cell = row->col + (x - row->c0);
1420 1604
1421 for (z = 0; z <= 0; z++) 1605 for (z = 0; z <= 0; z++)
1422 { 1606 {
1423 mapface face = cell->face [z];
1424
1425 if (face)
1426 {
1427 maptex tex = self->tex [face]; 1607 maptex tex = self->tex [cell->tile [z]];
1428 int a0 = 255 - tex.a; 1608 int a0 = 255 - tex.a;
1429 int a1 = tex.a; 1609 int a1 = tex.a;
1430 1610
1431 r = (r * a0 + tex.r * a1) / 255; 1611 r = (r * a0 + tex.r * a1) / 255;
1432 g = (g * a0 + tex.g * a1) / 255; 1612 g = (g * a0 + tex.g * a1) / 255;
1433 b = (b * a0 + tex.b * a1) / 255; 1613 b = (b * a0 + tex.b * a1) / 255;
1434 a = (a * a0 + tex.a * a1) / 255; 1614 a = (a * a0 + tex.a * a1) / 255;
1435 }
1436 } 1615 }
1437 } 1616 }
1438 1617
1439 *map++ = (r ) 1618 *map++ = (r )
1440 | (g << 8) 1619 | (g << 8)
… …
1447} 1626}
1448 OUTPUT: 1627 OUTPUT:
1449 RETVAL 1628 RETVAL
1450 1629
1451void 1630void
1452draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1631draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1453 CODE: 1632 CODE:
1454{ 1633{
1455 int vx, vy; 1634 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1635 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1636 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1637 smooth_key skey;
1456 int x, y, z; 1638 int x, y, z;
1457 int last_name; 1639 int last_name;
1458 mapface face;
1459 1640
1460 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1641 // thats current max. sorry.
1461 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1642 if (sw > 255) sw = 255;
1643 if (sh > 255) sh = 255;
1462 1644
1463 /* 1645 // clear key, in case of extra padding
1464 int vx = self->vx = self->w >= sw 1646 memset (&skey, 0, sizeof (skey));
1465 ? self->x + (self->w - sw) / 2
1466 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1467
1468 int vy = self->vy = self->h >= sh
1469 ? self->y + (self->h - sh) / 2
1470 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1471 */
1472 1647
1473 glColor4ub (255, 255, 255, 255); 1648 glColor4ub (255, 255, 255, 255);
1474 1649
1475 glEnable (GL_BLEND); 1650 glEnable (GL_BLEND);
1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1651 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1479 1654
1480 glBegin (GL_QUADS); 1655 glBegin (GL_QUADS);
1481 1656
1482 last_name = 0; 1657 last_name = 0;
1483 1658
1659 mx += self->x;
1660 my += self->y;
1661
1662 // first pass: determine smooth_max
1663 // rather ugly, if you ask me
1664 // could also be stored inside mapcell and updated on change
1665 memset (smooth_max, 0, sizeof (smooth_max));
1666
1667 for (y = 0; y < sh; y++)
1668 if (0 <= y + my && y + my < self->rows)
1669 {
1670 maprow *row = self->row + (y + my);
1671
1672 for (x = 0; x < sw; x++)
1673 if (row->c0 <= x + mx && x + mx < row->c1)
1674 {
1675 mapcell *cell = row->col + (x + mx - row->c0);
1676
1677 smooth_max[x + 1][y + 1] =
1678 MAX (self->tex [cell->tile [0]].smoothlevel,
1679 MAX (self->tex [cell->tile [1]].smoothlevel,
1680 self->tex [cell->tile [2]].smoothlevel));
1681 }
1682 }
1683
1484 for (z = 0; z < 3; z++) 1684 for (z = 0; z <= 2; z++)
1685 {
1686 memset (smooth_level, 0, sizeof (smooth_level));
1687
1485 for (y = 0; y < sh; y++) 1688 for (y = 0; y < sh; y++)
1486 if (0 <= y + vy && y + vy < self->rows) 1689 if (0 <= y + my && y + my < self->rows)
1487 { 1690 {
1488 maprow *row = self->row + (y + vy); 1691 maprow *row = self->row + (y + my);
1489 1692
1490 for (x = 0; x < sw; x++) 1693 for (x = 0; x < sw; x++)
1491 if (row->c0 <= x + vx && x + vx < row->c1) 1694 if (row->c0 <= x + mx && x + mx < row->c1)
1492 { 1695 {
1493 mapcell *cell = row->col + (x + vx - row->c0); 1696 mapcell *cell = row->col + (x + mx - row->c0);
1494
1495 face = cell->face [z]; 1697 tileid tile = cell->tile [z];
1698
1699 if (tile)
1700 {
1701 maptex tex = self->tex [tile];
1702 int px = (x + 1) * T - tex.w;
1703 int py = (y + 1) * T - tex.h;
1496 1704
1497 if (face && face < self->texs) 1705 // suppressing texture state switches here
1706 // is only moderately effective, but worth the extra effort
1707 if (last_name != tex.name)
1708 {
1709 if (!tex.name)
1710 tex = self->tex [2]; /* missing, replace by noface */
1711
1712 glEnd ();
1713 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1714 glBegin (GL_QUADS);
1715 }
1716
1717 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1718 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1719 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1720 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1721
1722 if (cell->flags && z == 2)
1723 {
1724 if (cell->flags & 1)
1725 {
1726 maptex tex = self->tex [1];
1727 int px = x * T + T * 2 / 32;
1728 int py = y * T - T * 6 / 32;
1729
1730 glEnd ();
1731 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1732 glBegin (GL_QUADS);
1733
1734 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1735 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1736 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1737 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1738 }
1739 }
1740
1741 // update smooth hash
1742 if (tex.smoothtile)
1743 {
1744 skey.tile = tex.smoothtile;
1745 skey.level = tex.smoothlevel;
1746
1747 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1748
1749 // add bits to current tile and all neighbours. skey.x|y is
1750 // shifted +1|+1 so we always stay positive.
1751
1752 // bits is ___n cccc CCCC bbbb
1753 // n do not draw borders&corners
1754 // c draw these corners, but...
1755 // C ... not these
1756 // b draw these borders
1757
1758 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1759 // ┃· ·· ·┃ ━━
1760
1761 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1762 // ·· ·· ·┏ ┓·
1763
1764 // full tile
1765 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1766
1767 // borders
1768 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1769 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1770 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1771 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1772
1773 // corners
1774 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1775 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1776 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1777 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1778 }
1779 }
1780 }
1781 }
1782
1783 // go through all smoothlevels, lowest to highest, then draw.
1784 // this is basically counting sort
1785 {
1786 int w, b;
1787
1788 for (w = 0; w < 256 / 32; ++w)
1789 {
1790 uint32_t smask = smooth_level [w];
1791 if (smask)
1792 for (b = 0; b < 32; ++b)
1793 if (smask & (((uint32_t)1) << b))
1498 { 1794 {
1499 maptex tex = self->tex [face]; 1795 int level = (w << 5) | b;
1500 int px = (x + 1) * 32 - tex.w; 1796 HE *he;
1501 int py = (y + 1) * 32 - tex.h;
1502 1797
1503 if (last_name != tex.name) 1798 hv_iterinit (smooth);
1799 while ((he = hv_iternext (smooth)))
1504 { 1800 {
1801 smooth_key *skey = (smooth_key *)HeKEY (he);
1802 IV bits = SvIVX (HeVAL (he));
1803
1804 if (!(bits & 0x1000)
1805 && skey->level == level
1806 && level > smooth_max [skey->x][skey->y])
1807 {
1808 maptex tex = self->tex [skey->tile];
1809 int px = (((int)skey->x) - 1) * T;
1810 int py = (((int)skey->y) - 1) * T;
1811 int border = bits & 15;
1812 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1813 float dx = tex.s * .0625f; // 16 images/row
1814 float dy = tex.t * .5f ; // 2 images/column
1815
1816 // this time naively avoiding texture state changes
1817 // save gobs of state changes.
1818 if (last_name != tex.name)
1819 {
1820 if (!tex.name)
1821 continue; // smoothing not yet available
1822
1505 glEnd (); 1823 glEnd ();
1506 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1824 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1507 glBegin (GL_QUADS); 1825 glBegin (GL_QUADS);
1826 }
1827
1828 if (border)
1829 {
1830 float ox = border * dx;
1831
1832 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1833 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1834 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1835 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1836 }
1837
1838 if (corner)
1839 {
1840 float ox = corner * dx;
1841
1842 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1843 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1844 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1846 }
1508 } 1847 }
1509
1510 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1511 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1512 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1513 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1514 }
1515
1516 if (cell->flags && z == 2)
1517 {
1518 if (cell->flags & 1)
1519 {
1520 maptex tex = self->tex [1];
1521 int px = (x + 1) * 32 - tex.w + 2;
1522 int py = (y + 1) * 32 - tex.h - 6;
1523
1524 glEnd ();
1525 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526 glBegin (GL_QUADS);
1527
1528 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532 } 1848 }
1533 } 1849 }
1534 }
1535 } 1850 }
1851 }
1852
1853 hv_clear (smooth);
1854 }
1536 1855
1537 glEnd (); 1856 glEnd ();
1538 1857
1539 glDisable (GL_TEXTURE_2D); 1858 glDisable (GL_TEXTURE_2D);
1540 glDisable (GL_BLEND); 1859 glDisable (GL_BLEND);
1541 1860
1542 // top layer: overlays such as the health bar 1861 // top layer: overlays such as the health bar
1543 for (y = 0; y < sh; y++) 1862 for (y = 0; y < sh; y++)
1544 if (0 <= y + vy && y + vy < self->rows) 1863 if (0 <= y + my && y + my < self->rows)
1545 { 1864 {
1546 maprow *row = self->row + (y + vy); 1865 maprow *row = self->row + (y + my);
1547 1866
1548 for (x = 0; x < sw; x++) 1867 for (x = 0; x < sw; x++)
1549 if (row->c0 <= x + vx && x + vx < row->c1) 1868 if (row->c0 <= x + mx && x + mx < row->c1)
1550 { 1869 {
1551 mapcell *cell = row->col + (x + vx - row->c0); 1870 mapcell *cell = row->col + (x + mx - row->c0);
1552 1871
1553 int px = x * 32; 1872 int px = x * T;
1554 int py = y * 32; 1873 int py = y * T;
1555 1874
1556 if (cell->stat_hp) 1875 if (cell->stat_hp)
1557 { 1876 {
1558 int width = cell->stat_width * 32; 1877 int width = cell->stat_width * T;
1559 int thick = sh / 28 + 1 + cell->stat_width; 1878 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1560 1879
1561 glColor3ub (0, 0, 0); 1880 glColor3ub (0, 0, 0);
1562 glRectf (px + 1, py - thick - 2, 1881 glRectf (px + 1, py - thick - 2,
1563 px + width - 1, py); 1882 px + width - 1, py);
1564 1883
… …
1630 glDisable (GL_BLEND); 1949 glDisable (GL_BLEND);
1631 glDisable (GL_TEXTURE_2D); 1950 glDisable (GL_TEXTURE_2D);
1632} 1951}
1633 1952
1634void 1953void
1635fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1954fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1636 PPCODE: 1955 PPCODE:
1637{ 1956{
1638 int vx, vy;
1639 int x, y; 1957 int x, y;
1640 int sw4 = (sw + 3) & ~3; 1958 int sw4 = (sw + 3) & ~3;
1641 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1959 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1642 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1960 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1643 1961
1644 memset (darkness, 255, sw4 * sh); 1962 memset (darkness, 255, sw4 * sh);
1645 SvPOK_only (darkness_sv); 1963 SvPOK_only (darkness_sv);
1646 SvCUR_set (darkness_sv, sw4 * sh); 1964 SvCUR_set (darkness_sv, sw4 * sh);
1647 1965
1648 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1966 mx += self->x;
1649 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1967 my += self->y;
1650 1968
1651 for (y = 0; y < sh; y++) 1969 for (y = 0; y < sh; y++)
1652 if (0 <= y + vy && y + vy < self->rows) 1970 if (0 <= y + my && y + my < self->rows)
1653 { 1971 {
1654 maprow *row = self->row + (y + vy); 1972 maprow *row = self->row + (y + my);
1655 1973
1656 for (x = 0; x < sw; x++) 1974 for (x = 0; x < sw; x++)
1657 if (row->c0 <= x + vx && x + vx < row->c1) 1975 if (row->c0 <= x + mx && x + mx < row->c1)
1658 { 1976 {
1659 mapcell *cell = row->col + (x + vx - row->c0); 1977 mapcell *cell = row->col + (x + mx - row->c0);
1660 1978
1661 darkness[y * sw4 + x] = cell->darkness 1979 darkness[y * sw4 + x] = cell->darkness
1662 ? 255 - (cell->darkness - 1) 1980 ? 255 - (cell->darkness - 1)
1663 : 255 - FOW_DARKNESS; 1981 : 255 - FOW_DARKNESS;
1664 } 1982 }
… …
1704 if (row && row->c0 <= x && x < row->c1) 2022 if (row && row->c0 <= x && x < row->c1)
1705 { 2023 {
1706 mapcell *cell = row->col + (x - row->c0); 2024 mapcell *cell = row->col + (x - row->c0);
1707 uint8_t flags = 0; 2025 uint8_t flags = 0;
1708 2026
1709 if (cell->face [0]) flags |= 1; 2027 if (cell->tile [0]) flags |= 1;
1710 if (cell->face [1]) flags |= 2; 2028 if (cell->tile [1]) flags |= 2;
1711 if (cell->face [2]) flags |= 4; 2029 if (cell->tile [2]) flags |= 4;
1712 2030
1713 *data++ = flags; 2031 *data++ = flags;
1714 2032
1715 if (flags & 1) 2033 if (flags & 1)
1716 { 2034 {
2035 tileid tile = cell->tile [0];
1717 *data++ = cell->face [0] >> 8; 2036 *data++ = tile >> 8;
1718 *data++ = cell->face [0]; 2037 *data++ = tile;
1719 } 2038 }
1720 2039
1721 if (flags & 2) 2040 if (flags & 2)
1722 { 2041 {
2042 tileid tile = cell->tile [1];
1723 *data++ = cell->face [1] >> 8; 2043 *data++ = tile >> 8;
1724 *data++ = cell->face [1]; 2044 *data++ = tile;
1725 } 2045 }
1726 2046
1727 if (flags & 4) 2047 if (flags & 4)
1728 { 2048 {
2049 tileid tile = cell->tile [2];
1729 *data++ = cell->face [2] >> 8; 2050 *data++ = tile >> 8;
1730 *data++ = cell->face [2]; 2051 *data++ = tile;
1731 } 2052 }
1732 } 2053 }
1733 else 2054 else
1734 *data++ = 0; 2055 *data++ = 0;
1735 } 2056 }
… …
1775 { 2096 {
1776 uint8_t flags = *data++; 2097 uint8_t flags = *data++;
1777 2098
1778 if (flags) 2099 if (flags)
1779 { 2100 {
1780 mapface face[3] = { 0, 0, 0 };
1781
1782 mapcell *cell = row_get_cell (row, x); 2101 mapcell *cell = row_get_cell (row, x);
2102 tileid tile[3] = { 0, 0, 0 };
1783 2103
1784 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2104 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1785 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2105 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1786 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2106 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1787 2107
1788 if (cell->darkness == 0) 2108 if (cell->darkness == 0)
1789 { 2109 {
1790 cell->darkness = 0; 2110 cell->darkness = 0;
1791 2111
1792 for (z = 0; z <= 2; z++) 2112 for (z = 0; z <= 2; z++)
1793 { 2113 {
1794 cell->face[z] = face[z]; 2114 tileid t = tile [z];
1795 2115
1796 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2116 if (t >= self->texs || (t && !self->tex [t].name))
2117 {
1797 XPUSHs (sv_2mortal (newSViv (face[z]))); 2118 XPUSHs (sv_2mortal (newSViv (t)));
2119 need_texid (self, t);
2120 }
2121
2122 cell->tile [z] = t;
1798 } 2123 }
1799 } 2124 }
1800 } 2125 }
1801 } 2126 }
1802 } 2127 }
… …
1837 CODE: 2162 CODE:
1838 RETVAL = Mix_VolumeMusic (volume); 2163 RETVAL = Mix_VolumeMusic (volume);
1839 OUTPUT: 2164 OUTPUT:
1840 RETVAL 2165 RETVAL
1841 2166
2167int
2168fade_out (int ms)
2169 CODE:
2170 RETVAL = Mix_FadeOutMusic (ms);
2171 OUTPUT:
2172 RETVAL
2173
1842CFPlus::MixMusic 2174CFPlus::MixMusic
1843new_from_file (SV *class, char *path) 2175new_from_file (SV *class, char *path)
1844 CODE: 2176 CODE:
1845 RETVAL = Mix_LoadMUS (path); 2177 RETVAL = Mix_LoadMUS (path);
1846 OUTPUT: 2178 OUTPUT:
… …
1853 2185
1854int 2186int
1855play (CFPlus::MixMusic self, int loops = -1) 2187play (CFPlus::MixMusic self, int loops = -1)
1856 CODE: 2188 CODE:
1857 RETVAL = Mix_PlayMusic (self, loops); 2189 RETVAL = Mix_PlayMusic (self, loops);
2190 OUTPUT:
2191 RETVAL
2192
2193int
2194fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2195 CODE:
2196 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1858 OUTPUT: 2197 OUTPUT:
1859 RETVAL 2198 RETVAL
1860 2199
1861MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2200MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1862 2201
… …
1951# undef const_iv 2290# undef const_iv
1952 }; 2291 };
1953 2292
1954 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2293 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1955 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2294 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2295
2296 texture_av = newAV ();
2297 AvREAL_off (texture_av);
1956} 2298}
1957 2299
1958char * 2300char *
1959gl_vendor () 2301gl_vendor ()
1960 CODE: 2302 CODE:
… …
2109 2451
2110void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2452void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2111 2453
2112int glGenTexture () 2454int glGenTexture ()
2113 CODE: 2455 CODE:
2114{ 2456 RETVAL = gen_texture ();
2115 GLuint name;
2116 glGenTextures (1, &name);
2117 RETVAL = name;
2118}
2119 OUTPUT: 2457 OUTPUT:
2120 RETVAL 2458 RETVAL
2121 2459
2122void glDeleteTexture (int name) 2460void glDeleteTexture (int name)
2123 CODE: 2461 CODE:
2124{
2125 GLuint name_ = name;
2126 glDeleteTextures (1, &name_); 2462 del_texture (name);
2127} 2463
2128
2129int glGenList () 2464int glGenList ()
2130 CODE: 2465 CODE:
2131 RETVAL = glGenLists (1); 2466 RETVAL = glGenLists (1);
2132 OUTPUT: 2467 OUTPUT:
2133 RETVAL 2468 RETVAL

Diff Legend

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