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.143 by root, Fri Aug 18 02:23:39 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 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)
7#endif 9#endif
8 10
9#include "EXTERN.h" 11#include "EXTERN.h"
10#include "perl.h" 12#include "perl.h"
11#include "XSUB.h" 13#include "XSUB.h"
12 14
13#ifdef _WIN32 15#ifdef _WIN32
14# undef pipe 16# undef pipe
15#endif 17#endif
16 18
19#include <assert.h>
17#include <math.h> 20#include <math.h>
18#include <string.h> 21#include <string.h>
19#include <stdio.h> 22#include <stdio.h>
20#include <stdlib.h> 23#include <stdlib.h>
21 24
… …
36# include <sys/types.h> 39# include <sys/types.h>
37# include <sys/socket.h> 40# include <sys/socket.h>
38# include <netinet/in.h> 41# include <netinet/in.h>
39# include <netinet/tcp.h> 42# include <netinet/tcp.h>
40# include <inttypes.h> 43# 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 44#endif
49 45
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 47
52#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
53 49
54#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
60# define PARACHUTE SDL_INIT_NOPARACHUTE 56# define PARACHUTE SDL_INIT_NOPARACHUTE
61#else 57#else
62# define PARACHUTE 0 58# define PARACHUTE 0
63#endif 59#endif
64 60
61static AV *texture_av;
62
65static struct 63static struct
66{ 64{
67#define GL_FUNC(ptr,name) ptr name; 65#define GL_FUNC(ptr,name) ptr name;
68#include "glfunc.h" 66#include "glfunc.h"
69#undef GL_FUNC 67#undef GL_FUNC
70} gl; 68} gl;
71 69
70static void
72static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 71gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73{ 72{
74 if (gl.BlendFuncSeparate) 73 if (gl.BlendFuncSeparate)
75 gl.BlendFuncSeparate (sa, da, saa, daa); 74 gl.BlendFuncSeparate (sa, da, saa, daa);
76 else if (gl.BlendFuncSeparateEXT) 75 else if (gl.BlendFuncSeparateEXT)
77 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 76 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78 else 77 else
79 glBlendFunc (sa, da); 78 glBlendFunc (sa, da);
80} 79}
81 80
81static GLuint
82gen_texture ()
83{
84 GLuint name;
85
86 if (AvFILL (texture_av) >= 0)
87 name = (GLuint)(size_t)av_pop (texture_av);
88 else
89 glGenTextures (1, &name);
90
91 return name;
92}
93
94static void
95del_texture (GLuint name)
96{
97 /* make a half-assed attempt at returning the memory used by the texture */
98 /* textures are frequently being reused by cfplus anyway */
99 /*glBindTexture (GL_TEXTURE_2D, name);*/
100 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
101 av_push (texture_av, (SV *)(size_t)name);
102 glDeleteTextures (1, &name);
103}
104
82#include "texcache.c" 105#include "texcache.c"
83 106
84#include "pango-font.c" 107#include "pango-font.c"
85#include "pango-fontmap.c" 108#include "pango-fontmap.c"
86#include "pango-render.c" 109#include "pango-render.c"
… …
159 182
160 *w = rect.width; 183 *w = rect.width;
161 *h = rect.height; 184 *h = rect.height;
162} 185}
163 186
187typedef uint16_t tileid;
164typedef uint16_t mapface; 188typedef uint16_t faceid;
165 189
166typedef struct { 190typedef struct {
167 GLint name; 191 int name;
168 int w, h; 192 int w, h;
169 float s, t; 193 float s, t;
170 uint8_t r, g, b, a; 194 uint8_t r, g, b, a;
195 tileid smoothtile;
196 uint8_t smoothlevel;
171} maptex; 197} maptex;
172 198
173typedef struct { 199typedef struct {
200 uint32_t player;
201 tileid tile[3];
174 uint16_t darkness; 202 uint16_t darkness;
175 mapface face[3]; 203 uint8_t stat_width, stat_hp, flags, smoothmax;
176 uint8_t stat_hp;
177} mapcell; 204} mapcell;
178 205
179typedef struct { 206typedef struct {
180 int32_t c0, c1; 207 int32_t c0, c1;
181 mapcell *col; 208 mapcell *col;
182} maprow; 209} maprow;
183 210
184typedef struct map { 211typedef struct map {
185 int x, y, w, h; 212 int x, y, w, h;
186 int ox, oy; /* offset to virtual global coordinate system */ 213 int ox, oy; /* offset to virtual global coordinate system */
187 int faces; 214 int faces; tileid *face2tile; // [faceid]
188 mapface *face; 215 int texs; maptex *tex; // [tileid]
189
190 int texs;
191 maptex *tex;
192 216
193 int32_t rows; 217 int32_t rows;
194 maprow *row; 218 maprow *row;
195} *CFPlus__Map; 219} *CFPlus__Map;
196 220
… …
216 return ptr; 240 return ptr;
217} 241}
218 242
219#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 243#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)) 244#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
245
246static void
247need_facenum (struct map *self, faceid face)
248{
249 while (self->faces <= face)
250 {
251 Append (tileid, self->face2tile, self->faces, self->faces);
252 self->faces *= 2;
253 }
254}
255
256static void
257need_texid (struct map *self, int texid)
258{
259 while (self->texs <= texid)
260 {
261 Append (maptex, self->tex, self->texs, self->texs);
262 self->texs *= 2;
263 }
264}
221 265
222static maprow * 266static maprow *
223map_get_row (CFPlus__Map self, int y) 267map_get_row (CFPlus__Map self, int y)
224{ 268{
225 if (0 > y) 269 if (0 > y)
… …
294static void 338static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 339map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 340{
297 int x, y; 341 int x, y;
298 maprow *row; 342 maprow *row;
343 mapcell *cell;
299 344
300 for (y = y0; y < y0 + h; y++) 345 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 346 if (y >= 0)
302 { 347 {
303 if (y >= self->rows) 348 if (y >= self->rows)
… …
309 if (x >= row->c0) 354 if (x >= row->c0)
310 { 355 {
311 if (x >= row->c1) 356 if (x >= row->c1)
312 break; 357 break;
313 358
314 row->col[x - row->c0].darkness = 0; 359 cell = row->col + x - row->c0;
360
361 cell->darkness = 0;
362 cell->stat_hp = 0;
363 cell->flags = 0;
364 cell->player = 0;
315 } 365 }
316 } 366 }
367}
368
369typedef struct {
370 tileid tile;
371 uint8_t x, y, level;
372} smooth_key;
373
374static void
375smooth_or_bits (HV *hv, smooth_key *key, IV bits)
376{
377 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
378
379 if (SvIOK (*sv))
380 SvIV_set (*sv, SvIVX (*sv) | bits);
381 else
382 sv_setiv (*sv, bits);
317} 383}
318 384
319static void 385static void
320music_finished (void) 386music_finished (void)
321{ 387{
… …
356 n |= n >> 8; 422 n |= n >> 8;
357 n |= n >> 16; 423 n |= n >> 16;
358 424
359 return n + 1; 425 return n + 1;
360} 426}
427
428/* SDL should provide this, really. */
429#define SDLK_MODIFIER_MIN 300
430#define SDLK_MODIFIER_MAX 314
361 431
362MODULE = CFPlus PACKAGE = CFPlus 432MODULE = CFPlus PACKAGE = CFPlus
363 433
364PROTOTYPES: ENABLE 434PROTOTYPES: ENABLE
365 435
… …
369 static const struct { 439 static const struct {
370 const char *name; 440 const char *name;
371 IV iv; 441 IV iv;
372 } *civ, const_iv[] = { 442 } *civ, const_iv[] = {
373# define const_iv(name) { # name, (IV)name } 443# define const_iv(name) { # name, (IV)name }
444 const_iv (SDLK_MODIFIER_MIN),
445 const_iv (SDLK_MODIFIER_MAX),
446
374 const_iv (SDL_ACTIVEEVENT), 447 const_iv (SDL_ACTIVEEVENT),
375 const_iv (SDL_KEYDOWN), 448 const_iv (SDL_KEYDOWN),
376 const_iv (SDL_KEYUP), 449 const_iv (SDL_KEYUP),
377 const_iv (SDL_MOUSEMOTION), 450 const_iv (SDL_MOUSEMOTION),
378 const_iv (SDL_MOUSEBUTTONDOWN), 451 const_iv (SDL_MOUSEBUTTONDOWN),
… …
387 const_iv (SDL_EVENT_RESERVEDA), 460 const_iv (SDL_EVENT_RESERVEDA),
388 const_iv (SDL_EVENT_RESERVEDB), 461 const_iv (SDL_EVENT_RESERVEDB),
389 const_iv (SDL_VIDEORESIZE), 462 const_iv (SDL_VIDEORESIZE),
390 const_iv (SDL_VIDEOEXPOSE), 463 const_iv (SDL_VIDEOEXPOSE),
391 const_iv (SDL_USEREVENT), 464 const_iv (SDL_USEREVENT),
465
466 const_iv (SDL_APPINPUTFOCUS),
467 const_iv (SDL_APPMOUSEFOCUS),
468 const_iv (SDL_APPACTIVE),
469
392 const_iv (SDLK_KP0), 470 const_iv (SDLK_KP0),
393 const_iv (SDLK_KP1), 471 const_iv (SDLK_KP1),
394 const_iv (SDLK_KP2), 472 const_iv (SDLK_KP2),
395 const_iv (SDLK_KP3), 473 const_iv (SDLK_KP3),
396 const_iv (SDLK_KP4), 474 const_iv (SDLK_KP4),
… …
451 const_iv (SDLK_BREAK), 529 const_iv (SDLK_BREAK),
452 const_iv (SDLK_MENU), 530 const_iv (SDLK_MENU),
453 const_iv (SDLK_POWER), 531 const_iv (SDLK_POWER),
454 const_iv (SDLK_EURO), 532 const_iv (SDLK_EURO),
455 const_iv (SDLK_UNDO), 533 const_iv (SDLK_UNDO),
534
456 const_iv (KMOD_NONE), 535 const_iv (KMOD_NONE),
536 const_iv (KMOD_SHIFT),
457 const_iv (KMOD_LSHIFT), 537 const_iv (KMOD_LSHIFT),
458 const_iv (KMOD_RSHIFT), 538 const_iv (KMOD_RSHIFT),
539 const_iv (KMOD_CTRL),
459 const_iv (KMOD_LCTRL), 540 const_iv (KMOD_LCTRL),
460 const_iv (KMOD_RCTRL), 541 const_iv (KMOD_RCTRL),
542 const_iv (KMOD_ALT),
461 const_iv (KMOD_LALT), 543 const_iv (KMOD_LALT),
462 const_iv (KMOD_RALT), 544 const_iv (KMOD_RALT),
545 const_iv (KMOD_META),
463 const_iv (KMOD_LMETA), 546 const_iv (KMOD_LMETA),
464 const_iv (KMOD_RMETA), 547 const_iv (KMOD_RMETA),
465 const_iv (KMOD_NUM), 548 const_iv (KMOD_NUM),
466 const_iv (KMOD_CAPS), 549 const_iv (KMOD_CAPS),
467 const_iv (KMOD_MODE), 550 const_iv (KMOD_MODE),
468 const_iv (KMOD_CTRL),
469 const_iv (KMOD_SHIFT),
470 const_iv (KMOD_ALT),
471 const_iv (KMOD_META)
472# undef const_iv 551# undef const_iv
473 }; 552 };
474 553
475 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 554 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
476 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 555 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
556
557 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
558 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
477} 559}
560
561void
562weaken (SV *rv)
563 PROTOTYPE: $
564 CODE:
565 sv_rvweaken (rv);
478 566
479int 567int
480in_destruct () 568in_destruct ()
481 CODE: 569 CODE:
482 RETVAL = PL_main_cv == Nullcv; 570 RETVAL = PL_main_cv == Nullcv;
… …
553 RETVAL = !!SDL_SetVideoMode ( 641 RETVAL = !!SDL_SetVideoMode (
554 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 642 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
555 ); 643 );
556 if (RETVAL) 644 if (RETVAL)
557 { 645 {
646 av_clear (texture_av);
647
558 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 648 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
559# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 649# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
560# include "glfunc.h" 650# include "glfunc.h"
561# undef GL_FUNC 651# undef GL_FUNC
652
562 } 653 }
563 OUTPUT: 654 OUTPUT:
564 RETVAL 655 RETVAL
565 656
566void 657void
… …
585 case SDL_KEYDOWN: 676 case SDL_KEYDOWN:
586 case SDL_KEYUP: 677 case SDL_KEYUP:
587 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 678 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
588 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 679 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
589 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 680 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
681 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
590 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 682 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
591 break; 683 break;
592 684
593 case SDL_ACTIVEEVENT: 685 case SDL_ACTIVEEVENT:
594 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 686 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
639Mix_AllocateChannels (int numchans = -1) 731Mix_AllocateChannels (int numchans = -1)
640 732
641void 733void
642lowdelay (int fd, int val = 1) 734lowdelay (int fd, int val = 1)
643 CODE: 735 CODE:
736 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
737
738void
739win32_proxy_info ()
740 PPCODE:
741{
644#ifndef _WIN32 742#ifdef _WIN32
645 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 743 char buffer[2048];
744 DWORD buflen;
745
746 EXTEND (SP, 3);
747
748 buflen = sizeof (buffer);
749 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
750 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
751 {
752 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
753
754 buflen = sizeof (buffer);
755 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
756 {
757 PUSHs (newSVpv (buffer, 0));
758
759 buflen = sizeof (buffer);
760 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
761 PUSHs (newSVpv (buffer, 0));
762 }
763 }
646#endif 764#endif
765}
647 766
648void 767void
649add_font (char *file) 768add_font (char *file)
650 CODE: 769 CODE:
651 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 770 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
755 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 874 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
756#endif 875#endif
757 _exit (1); 876 _exit (1);
758 877
759void 878void
760_exit (int retval) 879_exit (int retval = 0)
761 CODE: 880 CODE:
881#ifdef WIN32
882 ExitThread (retval); // unclean, please beam me up
883#else
762 _exit (retval); 884 _exit (retval);
885#endif
763 886
764MODULE = CFPlus PACKAGE = CFPlus::Font 887MODULE = CFPlus PACKAGE = CFPlus::Font
765 888
766CFPlus::Font 889CFPlus::Font
767new_from_file (SV *class, char *path, int id = 0) 890new_from_file (SV *class, char *path, int id = 0)
… …
1014xy_to_index (CFPlus::Layout self, int x, int y) 1137xy_to_index (CFPlus::Layout self, int x, int y)
1015 CODE: 1138 CODE:
1016{ 1139{
1017 int index, trailing; 1140 int index, trailing;
1018 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1141 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1019 RETVAL = index; 1142 RETVAL = index + trailing;
1020} 1143}
1021 OUTPUT: 1144 OUTPUT:
1022 RETVAL 1145 RETVAL
1023 1146
1024void 1147void
… …
1030 1153
1031 EXTEND (SP, 3); 1154 EXTEND (SP, 3);
1032 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1155 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1033 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1156 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1034 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1157 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1158}
1159
1160void
1161index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1162 PPCODE:
1163{
1164 int line, x;
1165
1166 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1167 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1168
1169 EXTEND (SP, 2);
1170 PUSHs (sv_2mortal (newSViv (line - 1)));
1171 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1172}
1173
1174void
1175line_x_to_index (CFPlus::Layout self, int line, int x)
1176 PPCODE:
1177{
1178 PangoLayoutLine *lp;
1179 int index, trailing;
1180
1181 if (line < 0)
1182 XSRETURN_EMPTY;
1183
1184 if (!(lp = pango_layout_get_line (self->pl, line)))
1185 XSRETURN_EMPTY; /* do better */
1186
1187 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1188
1189 EXTEND (SP, 2);
1190 if (GIMME_V == G_SCALAR)
1191 PUSHs (sv_2mortal (newSViv (index + trailing)));
1192 else
1193 {
1194 PUSHs (sv_2mortal (newSViv (index)));
1195 PUSHs (sv_2mortal (newSViv (trailing)));
1196 }
1035} 1197}
1036 1198
1037void 1199void
1038render (CFPlus::Layout self, float x, float y, int flags = 0) 1200render (CFPlus::Layout self, float x, float y, int flags = 0)
1039 PPCODE: 1201 PPCODE:
… …
1133} 1295}
1134 1296
1135MODULE = CFPlus PACKAGE = CFPlus::Map 1297MODULE = CFPlus PACKAGE = CFPlus::Map
1136 1298
1137CFPlus::Map 1299CFPlus::Map
1138new (SV *class, int map_width, int map_height) 1300new (SV *class)
1139 CODE: 1301 CODE:
1140 New (0, RETVAL, 1, struct map); 1302 New (0, RETVAL, 1, struct map);
1141 RETVAL->x = 0; 1303 RETVAL->x = 0;
1142 RETVAL->y = 0; 1304 RETVAL->y = 0;
1143 RETVAL->w = map_width; 1305 RETVAL->w = 0;
1144 RETVAL->h = map_height; 1306 RETVAL->h = 0;
1145 RETVAL->ox = 0; 1307 RETVAL->ox = 0;
1146 RETVAL->oy = 0; 1308 RETVAL->oy = 0;
1147 RETVAL->faces = 8192; 1309 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1148 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1310 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1149 RETVAL->texs = 8192;
1150 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1151 RETVAL->rows = 0; 1311 RETVAL->rows = 0;
1152 RETVAL->row = 0; 1312 RETVAL->row = 0;
1153 OUTPUT: 1313 OUTPUT:
1154 RETVAL 1314 RETVAL
1155 1315
1156void 1316void
1157DESTROY (CFPlus::Map self) 1317DESTROY (CFPlus::Map self)
1158 CODE: 1318 CODE:
1159{ 1319{
1160 map_clear (self); 1320 map_clear (self);
1161 Safefree (self->face); 1321 Safefree (self->face2tile);
1162 Safefree (self->tex); 1322 Safefree (self->tex);
1163 Safefree (self); 1323 Safefree (self);
1164} 1324}
1165 1325
1166void 1326void
1327resize (CFPlus::Map self, int map_width, int map_height)
1328 CODE:
1329 self->w = map_width;
1330 self->h = map_height;
1331
1332void
1167clear (CFPlus::Map self) 1333clear (CFPlus::Map self)
1168 CODE: 1334 CODE:
1169 map_clear (self); 1335 map_clear (self);
1170 1336
1171void 1337void
1172set_face (CFPlus::Map self, int face, int texid) 1338set_tileid (CFPlus::Map self, int face, int tile)
1173 CODE: 1339 CODE:
1174{ 1340{
1175 while (self->faces <= face) 1341 need_facenum (self, face); self->face2tile [face] = tile;
1176 { 1342 need_texid (self, tile);
1177 Append (mapface, self->face, self->faces, self->faces); 1343}
1178 self->faces *= 2;
1179 }
1180 1344
1181 self->face [face] = texid; 1345void
1346set_smooth (CFPlus::Map self, int face, int smooth, int level)
1347 CODE:
1348{
1349 tileid texid;
1350 maptex *tex;
1351
1352 if (face < 0 || face >= self->faces)
1353 return;
1354
1355 if (smooth < 0 || smooth >= self->faces)
1356 return;
1357
1358 texid = self->face2tile [face];
1359
1360 if (!texid)
1361 return;
1362
1363 tex = self->tex + texid;
1364 tex->smoothtile = self->face2tile [smooth];
1365 tex->smoothlevel = level;
1182} 1366}
1183 1367
1184void 1368void
1185set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1369set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1186 CODE: 1370 CODE:
1187{ 1371{
1188 while (self->texs <= texid) 1372 need_texid (self, texid);
1189 {
1190 Append (maptex, self->tex, self->texs, self->texs);
1191 self->texs *= 2;
1192 }
1193 1373
1194 { 1374 {
1195 maptex *tex = self->tex + texid; 1375 maptex *tex = self->tex + texid;
1196 1376
1197 tex->name = name; 1377 tex->name = name;
… …
1239void 1419void
1240scroll (CFPlus::Map self, int dx, int dy) 1420scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1421 CODE:
1242{ 1422{
1243 if (dx > 0) 1423 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1424 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1425 else if (dx < 0)
1246 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1426 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1247 1427
1248 if (dy > 0) 1428 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1429 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1430 else if (dy < 0)
1251 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1431 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1252 1432
1253 self->ox += dx; self->x += dx; 1433 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1434 self->oy += dy; self->y += dy;
1255 1435
1256 while (self->y < 0) 1436 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1449 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1450 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1451 mapcell *cell;
1272 int x, y, flags; 1452 int x, y, flags;
1273 1453
1274 while (data < data_end) 1454 while (data < data_end - 1)
1275 { 1455 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1456 flags = (data [0] << 8) + data [1]; data += 2;
1277 1457
1278 x = self->x + ((flags >> 10) & 63); 1458 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1459 y = self->y + ((flags >> 4) & 63);
… …
1282 1462
1283 if (flags & 15) 1463 if (flags & 15)
1284 { 1464 {
1285 if (!cell->darkness) 1465 if (!cell->darkness)
1286 { 1466 {
1467 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1468 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1469 }
1293 1470
1294 //TODO: don't trust server data to be in-range(!) 1471 //TODO: don't trust server data to be in-range(!)
1295 1472
1296 if (flags & 8) 1473 if (flags & 8)
… …
1300 uint8_t ext, cmd; 1477 uint8_t ext, cmd;
1301 1478
1302 do 1479 do
1303 { 1480 {
1304 ext = *data++; 1481 ext = *data++;
1305 cmd = ext & 0x7f; 1482 cmd = ext & 0x3f;
1306 1483
1307 if (ext < 4) 1484 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1485 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1486 else if (cmd == 5) // health
1487 {
1488 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 1489 cell->stat_hp = *data++;
1490 }
1491 else if (cmd == 6) // monster width
1492 cell->stat_width = *data++ + 1;
1493 else if (cmd == 0x47)
1494 {
1495 if (*data == 4)
1496 ; // decode player count
1497
1498 data += *data + 1;
1499 }
1500 else if (cmd == 8) // cell flags
1501 cell->flags = *data++;
1502 else if (ext & 0x40) // unknown, multibyte => skip
1503 data += *data + 1;
1504 else
1505 data++;
1311 } 1506 }
1312 while (cmd & 0x80); 1507 while (ext & 0x80);
1313 } 1508 }
1314 else 1509 else
1315 cell->darkness = *data++ + 1; 1510 cell->darkness = *data++ + 1;
1316 } 1511 }
1317 1512
1318 if (flags & 4) 1513 if (flags & 4)
1319 { 1514 {
1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1515 faceid face = (data [0] << 8) + data [1]; data += 2;
1516 need_facenum (self, face);
1517 cell->tile [0] = self->face2tile [face];
1321 } 1518 }
1322 1519
1323 if (flags & 2) 1520 if (flags & 2)
1324 { 1521 {
1325 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1522 faceid face = (data [0] << 8) + data [1]; data += 2;
1523 need_facenum (self, face);
1524 cell->tile [1] = self->face2tile [face];
1326 } 1525 }
1327 1526
1328 if (flags & 1) 1527 if (flags & 1)
1329 { 1528 {
1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1529 faceid face = (data [0] << 8) + data [1]; data += 2;
1530 need_facenum (self, face);
1531 cell->tile [2] = self->face2tile [face];
1331 } 1532 }
1332 } 1533 }
1333 else 1534 else
1334 cell->darkness = 0; 1535 cell->darkness = 0;
1335 } 1536 }
… …
1365 { 1566 {
1366 mapcell *cell = row->col + (x - row->c0); 1567 mapcell *cell = row->col + (x - row->c0);
1367 1568
1368 for (z = 0; z <= 0; z++) 1569 for (z = 0; z <= 0; z++)
1369 { 1570 {
1370 mapface face = cell->face [z];
1371
1372 if (face)
1373 {
1374 maptex tex = self->tex [face]; 1571 maptex tex = self->tex [cell->tile [z]];
1375 int a0 = 255 - tex.a; 1572 int a0 = 255 - tex.a;
1376 int a1 = tex.a; 1573 int a1 = tex.a;
1377 1574
1378 r = (r * a0 + tex.r * a1) / 255; 1575 r = (r * a0 + tex.r * a1) / 255;
1379 g = (g * a0 + tex.g * a1) / 255; 1576 g = (g * a0 + tex.g * a1) / 255;
1380 b = (b * a0 + tex.b * a1) / 255; 1577 b = (b * a0 + tex.b * a1) / 255;
1381 a = (a * a0 + tex.a * a1) / 255; 1578 a = (a * a0 + tex.a * a1) / 255;
1382 }
1383 } 1579 }
1384 } 1580 }
1385 1581
1386 *map++ = (r ) 1582 *map++ = (r )
1387 | (g << 8) 1583 | (g << 8)
… …
1394} 1590}
1395 OUTPUT: 1591 OUTPUT:
1396 RETVAL 1592 RETVAL
1397 1593
1398void 1594void
1399draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1595draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1400 CODE: 1596 CODE:
1401{ 1597{
1402 int vx, vy; 1598 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1599 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1600 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1601 smooth_key skey;
1403 int x, y, z; 1602 int x, y, z;
1404 int last_name; 1603 int last_name;
1405 mapface face;
1406 1604
1407 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1605 // thats current max. sorry.
1408 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1606 if (sw > 255) sw = 255;
1607 if (sh > 255) sh = 255;
1409 1608
1410 /* 1609 // clear key, in case of extra padding
1411 int vx = self->vx = self->w >= sw 1610 memset (&skey, 0, sizeof (skey));
1412 ? self->x + (self->w - sw) / 2
1413 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1414
1415 int vy = self->vy = self->h >= sh
1416 ? self->y + (self->h - sh) / 2
1417 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1418 */
1419 1611
1420 glColor4ub (255, 255, 255, 255); 1612 glColor4ub (255, 255, 255, 255);
1421 1613
1422 glEnable (GL_BLEND); 1614 glEnable (GL_BLEND);
1423 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1615 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1426 1618
1427 glBegin (GL_QUADS); 1619 glBegin (GL_QUADS);
1428 1620
1429 last_name = 0; 1621 last_name = 0;
1430 1622
1623 mx += self->x;
1624 my += self->y;
1625
1626 // first pass: determine smooth_max
1627 // rather ugly, if you ask me
1628 // could also be stored inside mapcell and updated on change
1629 memset (smooth_max, 0, sizeof (smooth_max));
1630
1631 for (y = 0; y < sh; y++)
1632 if (0 <= y + my && y + my < self->rows)
1633 {
1634 maprow *row = self->row + (y + my);
1635
1636 for (x = 0; x < sw; x++)
1637 if (row->c0 <= x + mx && x + mx < row->c1)
1638 {
1639 mapcell *cell = row->col + (x + mx - row->c0);
1640
1641 smooth_max[x + 1][y + 1] =
1642 MAX (self->tex [cell->tile [0]].smoothlevel,
1643 MAX (self->tex [cell->tile [1]].smoothlevel,
1644 self->tex [cell->tile [2]].smoothlevel));
1645 }
1646 }
1647
1431 for (z = 0; z < 3; z++) 1648 for (z = 0; z <= 2; z++)
1649 {
1650 memset (smooth_level, 0, sizeof (smooth_level));
1651
1432 for (y = 0; y < sh; y++) 1652 for (y = 0; y < sh; y++)
1433 if (0 <= y + vy && y + vy < self->rows) 1653 if (0 <= y + my && y + my < self->rows)
1434 { 1654 {
1435 maprow *row = self->row + (y + vy); 1655 maprow *row = self->row + (y + my);
1436 1656
1437 for (x = 0; x < sw; x++) 1657 for (x = 0; x < sw; x++)
1438 if (row->c0 <= x + vx && x + vx < row->c1) 1658 if (row->c0 <= x + mx && x + mx < row->c1)
1439 { 1659 {
1440 mapcell *cell = row->col + (x + vx - row->c0); 1660 mapcell *cell = row->col + (x + mx - row->c0);
1441
1442 face = cell->face [z]; 1661 tileid tile = cell->tile [z];
1443 1662
1444 if (face) 1663 if (tile)
1664 {
1665 maptex tex = self->tex [tile];
1666 int px = (x + 1) * T - tex.w;
1667 int py = (y + 1) * T - tex.h;
1668
1669 // suppressing texture state switches here
1670 // is only moderately effective, but worth the extra effort
1671 if (last_name != tex.name)
1672 {
1673 if (!tex.name)
1674 tex = self->tex [2]; /* missing, replace by noface */
1675
1676 glEnd ();
1677 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1678 glBegin (GL_QUADS);
1679 }
1680
1681 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1682 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1683 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1684 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1685
1686 if (cell->flags && z == 2)
1687 {
1688 if (cell->flags & 1)
1689 {
1690 maptex tex = self->tex [1];
1691 int px = x * T + T * 2 / 32;
1692 int py = y * T - T * 6 / 32;
1693
1694 glEnd ();
1695 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1696 glBegin (GL_QUADS);
1697
1698 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1699 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1700 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1701 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1702 }
1703 }
1704
1705 // update smooth hash
1706 if (tex.smoothtile)
1707 {
1708 skey.tile = tex.smoothtile;
1709 skey.level = tex.smoothlevel;
1710
1711 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1712
1713 // add bits to current tile and all neighbours. skey.x|y is
1714 // shifted +1|+1 so we always stay positive.
1715
1716 // bits is ___n cccc CCCC bbbb
1717 // n do not draw borders&corners
1718 // c draw these corners, but...
1719 // C ... not these
1720 // b draw these borders
1721
1722 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1723 // ┃· ·· ·┃ ━━
1724
1725 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1726 // ·· ·· ·┏ ┓·
1727
1728 // full tile
1729 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1730
1731 // borders
1732 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1733 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1734 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1735 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1736
1737 // corners
1738 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1739 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1740 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1741 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1742 }
1743 }
1744 }
1745 }
1746
1747 // go through all smoothlevels, lowest to highest, then draw.
1748 // this is basically counting sort
1749 {
1750 int w, b;
1751
1752 for (w = 0; w < 256 / 32; ++w)
1753 {
1754 uint32_t smask = smooth_level [w];
1755 if (smask)
1756 for (b = 0; b < 32; ++b)
1757 if (smask & (((uint32_t)1) << b))
1445 { 1758 {
1446 maptex tex = self->tex [face]; 1759 int level = (w << 5) | b;
1760 HE *he;
1447 1761
1448 int px = (x + 1) * 32 - tex.w; 1762 hv_iterinit (smooth);
1449 int py = (y + 1) * 32 - tex.h; 1763 while ((he = hv_iternext (smooth)))
1450
1451 if (last_name != tex.name)
1452 { 1764 {
1765 smooth_key *skey = (smooth_key *)HeKEY (he);
1766 IV bits = SvIVX (HeVAL (he));
1767
1768 if (!(bits & 0x1000)
1769 && skey->level == level
1770 && level > smooth_max [skey->x][skey->y])
1771 {
1772 maptex tex = self->tex [skey->tile];
1773 int px = (((int)skey->x) - 1) * T;
1774 int py = (((int)skey->y) - 1) * T;
1775 int border = bits & 15;
1776 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1777 float dx = tex.s * .0625f; // 16 images/row
1778 float dy = tex.t * .5f ; // 2 images/column
1779
1780 // this time naively avoiding texture state changes
1781 // save gobs of state changes.
1782 if (last_name != tex.name)
1783 {
1784 if (!tex.name)
1785 continue; // smoothing not yet available
1786
1453 glEnd (); 1787 glEnd ();
1454 last_name = tex.name;
1455 glBindTexture (GL_TEXTURE_2D, last_name); 1788 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1456 glBegin (GL_QUADS); 1789 glBegin (GL_QUADS);
1790 }
1791
1792 if (border)
1793 {
1794 float ox = border * dx;
1795
1796 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1797 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1798 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1799 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1800 }
1801
1802 if (corner)
1803 {
1804 float ox = corner * dx;
1805
1806 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1807 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1808 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1809 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1810 }
1811 }
1457 } 1812 }
1458
1459 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1460 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1461 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1462 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1463 } 1813 }
1464 }
1465 } 1814 }
1815 }
1816
1817 hv_clear (smooth);
1818 }
1466 1819
1467 glEnd (); 1820 glEnd ();
1468 1821
1469 glDisable (GL_TEXTURE_2D); 1822 glDisable (GL_TEXTURE_2D);
1470 glDisable (GL_BLEND); 1823 glDisable (GL_BLEND);
1471 1824
1825 // top layer: overlays such as the health bar
1472 for (y = 0; y < sh; y++) 1826 for (y = 0; y < sh; y++)
1473 if (0 <= y + vy && y + vy < self->rows) 1827 if (0 <= y + my && y + my < self->rows)
1474 { 1828 {
1475 maprow *row = self->row + (y + vy); 1829 maprow *row = self->row + (y + my);
1476 1830
1477 for (x = 0; x < sw; x++) 1831 for (x = 0; x < sw; x++)
1478 if (row->c0 <= x + vx && x + vx < row->c1) 1832 if (row->c0 <= x + mx && x + mx < row->c1)
1479 { 1833 {
1480 mapcell *cell = row->col + (x + vx - row->c0); 1834 mapcell *cell = row->col + (x + mx - row->c0);
1481 1835
1482 int px = x * 32; 1836 int px = x * T;
1483 int py = y * 32; 1837 int py = y * T;
1484 1838
1485 if (cell->stat_hp) 1839 if (cell->stat_hp)
1486 { 1840 {
1841 int width = cell->stat_width * T;
1842 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1843
1487 glColor3ub (0, 0, 0); 1844 glColor3ub (0, 0, 0);
1488 glRectf (px + 1, py + 1, px + 31, py + 4); 1845 glRectf (px + 1, py - thick - 2,
1846 px + width - 1, py);
1489 1847
1490 glColor3ub (0, 255, 0); 1848 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1491 glBegin (GL_LINES);
1492 glVertex2f (px + 2, py + 2.5f); 1849 glRectf (px + 2,
1493 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f); 1850 py - thick - 1,
1494 glEnd (); 1851 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1495 } 1852 }
1496 } 1853 }
1497 } 1854 }
1498} 1855}
1499 1856
… …
1556 glDisable (GL_BLEND); 1913 glDisable (GL_BLEND);
1557 glDisable (GL_TEXTURE_2D); 1914 glDisable (GL_TEXTURE_2D);
1558} 1915}
1559 1916
1560void 1917void
1561fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1918fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1562 PPCODE: 1919 PPCODE:
1563{ 1920{
1564 int vx, vy;
1565 int x, y; 1921 int x, y;
1566 int sw4 = (sw + 3) & ~3; 1922 int sw4 = (sw + 3) & ~3;
1567 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1923 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1568 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1924 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1569 1925
1570 memset (darkness, 255, sw4 * sh); 1926 memset (darkness, 255, sw4 * sh);
1571 SvPOK_only (darkness_sv); 1927 SvPOK_only (darkness_sv);
1572 SvCUR_set (darkness_sv, sw4 * sh); 1928 SvCUR_set (darkness_sv, sw4 * sh);
1573 1929
1574 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1930 mx += self->x;
1575 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1931 my += self->y;
1576 1932
1577 for (y = 0; y < sh; y++) 1933 for (y = 0; y < sh; y++)
1578 if (0 <= y + vy && y + vy < self->rows) 1934 if (0 <= y + my && y + my < self->rows)
1579 { 1935 {
1580 maprow *row = self->row + (y + vy); 1936 maprow *row = self->row + (y + my);
1581 1937
1582 for (x = 0; x < sw; x++) 1938 for (x = 0; x < sw; x++)
1583 if (row->c0 <= x + vx && x + vx < row->c1) 1939 if (row->c0 <= x + mx && x + mx < row->c1)
1584 { 1940 {
1585 mapcell *cell = row->col + (x + vx - row->c0); 1941 mapcell *cell = row->col + (x + mx - row->c0);
1586 1942
1587 darkness[y * sw4 + x] = cell->darkness 1943 darkness[y * sw4 + x] = cell->darkness
1588 ? 255 - (cell->darkness - 1) 1944 ? 255 - (cell->darkness - 1)
1589 : 255 - FOW_DARKNESS; 1945 : 255 - FOW_DARKNESS;
1590 } 1946 }
… …
1630 if (row && row->c0 <= x && x < row->c1) 1986 if (row && row->c0 <= x && x < row->c1)
1631 { 1987 {
1632 mapcell *cell = row->col + (x - row->c0); 1988 mapcell *cell = row->col + (x - row->c0);
1633 uint8_t flags = 0; 1989 uint8_t flags = 0;
1634 1990
1635 if (cell->face [0]) flags |= 1; 1991 if (cell->tile [0]) flags |= 1;
1636 if (cell->face [1]) flags |= 2; 1992 if (cell->tile [1]) flags |= 2;
1637 if (cell->face [2]) flags |= 4; 1993 if (cell->tile [2]) flags |= 4;
1638 1994
1639 *data++ = flags; 1995 *data++ = flags;
1640 1996
1641 if (flags & 1) 1997 if (flags & 1)
1642 { 1998 {
1999 tileid tile = cell->tile [0];
1643 *data++ = cell->face [0] >> 8; 2000 *data++ = tile >> 8;
1644 *data++ = cell->face [0]; 2001 *data++ = tile;
1645 } 2002 }
1646 2003
1647 if (flags & 2) 2004 if (flags & 2)
1648 { 2005 {
2006 tileid tile = cell->tile [1];
1649 *data++ = cell->face [1] >> 8; 2007 *data++ = tile >> 8;
1650 *data++ = cell->face [1]; 2008 *data++ = tile;
1651 } 2009 }
1652 2010
1653 if (flags & 4) 2011 if (flags & 4)
1654 { 2012 {
2013 tileid tile = cell->tile [2];
1655 *data++ = cell->face [2] >> 8; 2014 *data++ = tile >> 8;
1656 *data++ = cell->face [2]; 2015 *data++ = tile;
1657 } 2016 }
1658 } 2017 }
1659 else 2018 else
1660 *data++ = 0; 2019 *data++ = 0;
1661 } 2020 }
… …
1701 { 2060 {
1702 uint8_t flags = *data++; 2061 uint8_t flags = *data++;
1703 2062
1704 if (flags) 2063 if (flags)
1705 { 2064 {
1706 mapface face[3] = { 0, 0, 0 };
1707
1708 mapcell *cell = row_get_cell (row, x); 2065 mapcell *cell = row_get_cell (row, x);
2066 tileid tile[3] = { 0, 0, 0 };
1709 2067
1710 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2068 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1711 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2069 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1712 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2070 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1713 2071
1714 if (cell->darkness == 0) 2072 if (cell->darkness == 0)
1715 { 2073 {
1716 cell->darkness = 0; 2074 cell->darkness = 0;
1717 2075
1718 for (z = 0; z <= 2; z++) 2076 for (z = 0; z <= 2; z++)
1719 { 2077 {
1720 cell->face[z] = face[z]; 2078 tileid t = tile [z];
1721 2079
1722 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2080 if (t >= self->texs || (t && !self->tex [t].name))
2081 {
1723 XPUSHs (sv_2mortal (newSViv (face[z]))); 2082 XPUSHs (sv_2mortal (newSViv (t)));
2083 need_texid (self, t);
2084 }
2085
2086 cell->tile [z] = t;
1724 } 2087 }
1725 } 2088 }
1726 } 2089 }
1727 } 2090 }
1728 } 2091 }
… …
1877# undef const_iv 2240# undef const_iv
1878 }; 2241 };
1879 2242
1880 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2243 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1881 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2244 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2245
2246 texture_av = newAV ();
2247 AvREAL_off (texture_av);
1882} 2248}
1883 2249
1884char * 2250char *
1885gl_vendor () 2251gl_vendor ()
1886 CODE: 2252 CODE:
… …
2035 2401
2036void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2402void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2037 2403
2038int glGenTexture () 2404int glGenTexture ()
2039 CODE: 2405 CODE:
2040{ 2406 RETVAL = gen_texture ();
2041 GLuint name;
2042 glGenTextures (1, &name);
2043 RETVAL = name;
2044}
2045 OUTPUT: 2407 OUTPUT:
2046 RETVAL 2408 RETVAL
2047 2409
2048void glDeleteTexture (int name) 2410void glDeleteTexture (int name)
2049 CODE: 2411 CODE:
2050{
2051 GLuint name_ = name;
2052 glDeleteTextures (1, &name_); 2412 del_texture (name);
2053} 2413
2054
2055int glGenList () 2414int glGenList ()
2056 CODE: 2415 CODE:
2057 RETVAL = glGenLists (1); 2416 RETVAL = glGenLists (1);
2058 OUTPUT: 2417 OUTPUT:
2059 RETVAL 2418 RETVAL

Diff Legend

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