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.154 by root, Tue Sep 19 22:23:30 2006 UTC vs.
Revision 1.182 by root, Wed Apr 18 09:39:49 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
… …
159 155
160 *w = rect.width; 156 *w = rect.width;
161 *h = rect.height; 157 *h = rect.height;
162} 158}
163 159
160typedef uint16_t tileid;
164typedef uint16_t mapface; 161typedef uint16_t faceid;
165 162
166typedef struct { 163typedef struct {
167 GLint name; 164 int name;
168 int w, h; 165 int w, h;
169 float s, t; 166 float s, t;
170 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
171} maptex; 170} maptex;
172 171
173typedef struct { 172typedef struct {
174 uint32_t player; 173 uint32_t player;
175 mapface face[3]; 174 tileid tile[3];
176 uint16_t darkness; 175 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
178} mapcell; 177} mapcell;
179 178
180typedef struct { 179typedef struct {
181 int32_t c0, c1; 180 int32_t c0, c1;
182 mapcell *col; 181 mapcell *col;
183} maprow; 182} maprow;
184 183
185typedef struct map { 184typedef struct map {
186 int x, y, w, h; 185 int x, y, w, h;
187 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
188 int faces; 187 int faces; tileid *face2tile; // [faceid]
189 mapface *face; 188 int texs; maptex *tex; // [tileid]
190
191 int texs;
192 maptex *tex;
193 189
194 int32_t rows; 190 int32_t rows;
195 maprow *row; 191 maprow *row;
196} *CFPlus__Map; 192} *CFPlus__Map;
197 193
… …
217 return ptr; 213 return ptr;
218} 214}
219 215
220#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 216#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 217#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
218
219static void
220need_facenum (struct map *self, faceid face)
221{
222 while (self->faces <= face)
223 {
224 Append (tileid, self->face2tile, self->faces, self->faces);
225 self->faces *= 2;
226 }
227}
228
229static void
230need_texid (struct map *self, int texid)
231{
232 while (self->texs <= texid)
233 {
234 Append (maptex, self->tex, self->texs, self->texs);
235 self->texs *= 2;
236 }
237}
222 238
223static maprow * 239static maprow *
224map_get_row (CFPlus__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
225{ 241{
226 if (0 > y) 242 if (0 > y)
… …
321 cell->player = 0; 337 cell->player = 0;
322 } 338 }
323 } 339 }
324} 340}
325 341
342typedef struct {
343 tileid tile;
344 uint8_t x, y, level;
345} smooth_key;
346
347static void
348smooth_or_bits (HV *hv, smooth_key *key, IV bits)
349{
350 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
351
352 if (SvIOK (*sv))
353 SvIV_set (*sv, SvIVX (*sv) | bits);
354 else
355 sv_setiv (*sv, bits);
356}
357
326static void 358static void
327music_finished (void) 359music_finished (void)
328{ 360{
329 SDL_UserEvent ev; 361 SDL_UserEvent ev;
330 362
… …
363 n |= n >> 8; 395 n |= n >> 8;
364 n |= n >> 16; 396 n |= n >> 16;
365 397
366 return n + 1; 398 return n + 1;
367} 399}
400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
368 404
369MODULE = CFPlus PACKAGE = CFPlus 405MODULE = CFPlus PACKAGE = CFPlus
370 406
371PROTOTYPES: ENABLE 407PROTOTYPES: ENABLE
372 408
… …
376 static const struct { 412 static const struct {
377 const char *name; 413 const char *name;
378 IV iv; 414 IV iv;
379 } *civ, const_iv[] = { 415 } *civ, const_iv[] = {
380# define const_iv(name) { # name, (IV)name } 416# define const_iv(name) { # name, (IV)name }
417 const_iv (SDLK_MODIFIER_MIN),
418 const_iv (SDLK_MODIFIER_MAX),
419
381 const_iv (SDL_ACTIVEEVENT), 420 const_iv (SDL_ACTIVEEVENT),
382 const_iv (SDL_KEYDOWN), 421 const_iv (SDL_KEYDOWN),
383 const_iv (SDL_KEYUP), 422 const_iv (SDL_KEYUP),
384 const_iv (SDL_MOUSEMOTION), 423 const_iv (SDL_MOUSEMOTION),
385 const_iv (SDL_MOUSEBUTTONDOWN), 424 const_iv (SDL_MOUSEBUTTONDOWN),
… …
394 const_iv (SDL_EVENT_RESERVEDA), 433 const_iv (SDL_EVENT_RESERVEDA),
395 const_iv (SDL_EVENT_RESERVEDB), 434 const_iv (SDL_EVENT_RESERVEDB),
396 const_iv (SDL_VIDEORESIZE), 435 const_iv (SDL_VIDEORESIZE),
397 const_iv (SDL_VIDEOEXPOSE), 436 const_iv (SDL_VIDEOEXPOSE),
398 const_iv (SDL_USEREVENT), 437 const_iv (SDL_USEREVENT),
438
439 const_iv (SDL_APPINPUTFOCUS),
440 const_iv (SDL_APPMOUSEFOCUS),
441 const_iv (SDL_APPACTIVE),
442
399 const_iv (SDLK_KP0), 443 const_iv (SDLK_KP0),
400 const_iv (SDLK_KP1), 444 const_iv (SDLK_KP1),
401 const_iv (SDLK_KP2), 445 const_iv (SDLK_KP2),
402 const_iv (SDLK_KP3), 446 const_iv (SDLK_KP3),
403 const_iv (SDLK_KP4), 447 const_iv (SDLK_KP4),
… …
458 const_iv (SDLK_BREAK), 502 const_iv (SDLK_BREAK),
459 const_iv (SDLK_MENU), 503 const_iv (SDLK_MENU),
460 const_iv (SDLK_POWER), 504 const_iv (SDLK_POWER),
461 const_iv (SDLK_EURO), 505 const_iv (SDLK_EURO),
462 const_iv (SDLK_UNDO), 506 const_iv (SDLK_UNDO),
507
463 const_iv (KMOD_NONE), 508 const_iv (KMOD_NONE),
509 const_iv (KMOD_SHIFT),
464 const_iv (KMOD_LSHIFT), 510 const_iv (KMOD_LSHIFT),
465 const_iv (KMOD_RSHIFT), 511 const_iv (KMOD_RSHIFT),
512 const_iv (KMOD_CTRL),
466 const_iv (KMOD_LCTRL), 513 const_iv (KMOD_LCTRL),
467 const_iv (KMOD_RCTRL), 514 const_iv (KMOD_RCTRL),
515 const_iv (KMOD_ALT),
468 const_iv (KMOD_LALT), 516 const_iv (KMOD_LALT),
469 const_iv (KMOD_RALT), 517 const_iv (KMOD_RALT),
518 const_iv (KMOD_META),
470 const_iv (KMOD_LMETA), 519 const_iv (KMOD_LMETA),
471 const_iv (KMOD_RMETA), 520 const_iv (KMOD_RMETA),
472 const_iv (KMOD_NUM), 521 const_iv (KMOD_NUM),
473 const_iv (KMOD_CAPS), 522 const_iv (KMOD_CAPS),
474 const_iv (KMOD_MODE), 523 const_iv (KMOD_MODE),
475 const_iv (KMOD_CTRL),
476 const_iv (KMOD_SHIFT),
477 const_iv (KMOD_ALT),
478 const_iv (KMOD_META)
479# undef const_iv 524# undef const_iv
480 }; 525 };
481 526
482 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 527 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
483 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 528 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
529
530 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
531 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
484} 532}
533
534void
535weaken (SV *rv)
536 PROTOTYPE: $
537 CODE:
538 sv_rvweaken (rv);
485 539
486int 540int
487in_destruct () 541in_destruct ()
488 CODE: 542 CODE:
489 RETVAL = PL_main_cv == Nullcv; 543 RETVAL = PL_main_cv == Nullcv;
… …
592 case SDL_KEYDOWN: 646 case SDL_KEYDOWN:
593 case SDL_KEYUP: 647 case SDL_KEYUP:
594 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 648 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 649 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 650 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
651 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
597 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 652 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598 break; 653 break;
599 654
600 case SDL_ACTIVEEVENT: 655 case SDL_ACTIVEEVENT:
601 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 656 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
646Mix_AllocateChannels (int numchans = -1) 701Mix_AllocateChannels (int numchans = -1)
647 702
648void 703void
649lowdelay (int fd, int val = 1) 704lowdelay (int fd, int val = 1)
650 CODE: 705 CODE:
706 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
707
708void
709win32_proxy_info ()
710 PPCODE:
711{
651#ifndef _WIN32 712#ifdef _WIN32
652 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 713 char buffer[2048];
714 DWORD buflen;
715
716 EXTEND (SP, 3);
717
718 buflen = sizeof (buffer);
719 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
720 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
721 {
722 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
723
724 buflen = sizeof (buffer);
725 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
726 {
727 PUSHs (newSVpv (buffer, 0));
728
729 buflen = sizeof (buffer);
730 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
731 PUSHs (newSVpv (buffer, 0));
732 }
733 }
653#endif 734#endif
735}
654 736
655void 737void
656add_font (char *file) 738add_font (char *file)
657 CODE: 739 CODE:
658 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 740 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
762 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 844 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
763#endif 845#endif
764 _exit (1); 846 _exit (1);
765 847
766void 848void
767_exit (int retval) 849_exit (int retval = 0)
768 CODE: 850 CODE:
851#ifdef WIN32
852 ExitThread (retval); // unclean, please beam me up
853#else
769 _exit (retval); 854 _exit (retval);
855#endif
770 856
771MODULE = CFPlus PACKAGE = CFPlus::Font 857MODULE = CFPlus PACKAGE = CFPlus::Font
772 858
773CFPlus::Font 859CFPlus::Font
774new_from_file (SV *class, char *path, int id = 0) 860new_from_file (SV *class, char *path, int id = 0)
… …
1021xy_to_index (CFPlus::Layout self, int x, int y) 1107xy_to_index (CFPlus::Layout self, int x, int y)
1022 CODE: 1108 CODE:
1023{ 1109{
1024 int index, trailing; 1110 int index, trailing;
1025 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1111 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1026 RETVAL = index; 1112 RETVAL = index + trailing;
1027} 1113}
1028 OUTPUT: 1114 OUTPUT:
1029 RETVAL 1115 RETVAL
1030 1116
1031void 1117void
… …
1037 1123
1038 EXTEND (SP, 3); 1124 EXTEND (SP, 3);
1039 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1125 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1126 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1127 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1128}
1129
1130void
1131index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1132 PPCODE:
1133{
1134 int line, x;
1135
1136 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1137 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1138
1139 EXTEND (SP, 2);
1140 PUSHs (sv_2mortal (newSViv (line - 1)));
1141 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1142}
1143
1144void
1145line_x_to_index (CFPlus::Layout self, int line, int x)
1146 PPCODE:
1147{
1148 PangoLayoutLine *lp;
1149 int index, trailing;
1150
1151 if (line < 0)
1152 XSRETURN_EMPTY;
1153
1154 if (!(lp = pango_layout_get_line (self->pl, line)))
1155 XSRETURN_EMPTY; /* do better */
1156
1157 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1158
1159 EXTEND (SP, 2);
1160 if (GIMME_V == G_SCALAR)
1161 PUSHs (sv_2mortal (newSViv (index + trailing)));
1162 else
1163 {
1164 PUSHs (sv_2mortal (newSViv (index)));
1165 PUSHs (sv_2mortal (newSViv (trailing)));
1166 }
1042} 1167}
1043 1168
1044void 1169void
1045render (CFPlus::Layout self, float x, float y, int flags = 0) 1170render (CFPlus::Layout self, float x, float y, int flags = 0)
1046 PPCODE: 1171 PPCODE:
… …
1140} 1265}
1141 1266
1142MODULE = CFPlus PACKAGE = CFPlus::Map 1267MODULE = CFPlus PACKAGE = CFPlus::Map
1143 1268
1144CFPlus::Map 1269CFPlus::Map
1145new (SV *class, int map_width, int map_height) 1270new (SV *class)
1146 CODE: 1271 CODE:
1147 New (0, RETVAL, 1, struct map); 1272 New (0, RETVAL, 1, struct map);
1148 RETVAL->x = 0; 1273 RETVAL->x = 0;
1149 RETVAL->y = 0; 1274 RETVAL->y = 0;
1150 RETVAL->w = map_width; 1275 RETVAL->w = 0;
1151 RETVAL->h = map_height; 1276 RETVAL->h = 0;
1152 RETVAL->ox = 0; 1277 RETVAL->ox = 0;
1153 RETVAL->oy = 0; 1278 RETVAL->oy = 0;
1154 RETVAL->faces = 8192; 1279 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1280 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156 RETVAL->texs = 8192;
1157 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158 RETVAL->rows = 0; 1281 RETVAL->rows = 0;
1159 RETVAL->row = 0; 1282 RETVAL->row = 0;
1160 OUTPUT: 1283 OUTPUT:
1161 RETVAL 1284 RETVAL
1162 1285
1163void 1286void
1164DESTROY (CFPlus::Map self) 1287DESTROY (CFPlus::Map self)
1165 CODE: 1288 CODE:
1166{ 1289{
1167 map_clear (self); 1290 map_clear (self);
1168 Safefree (self->face); 1291 Safefree (self->face2tile);
1169 Safefree (self->tex); 1292 Safefree (self->tex);
1170 Safefree (self); 1293 Safefree (self);
1171} 1294}
1172 1295
1173void 1296void
1297resize (CFPlus::Map self, int map_width, int map_height)
1298 CODE:
1299 self->w = map_width;
1300 self->h = map_height;
1301
1302void
1174clear (CFPlus::Map self) 1303clear (CFPlus::Map self)
1175 CODE: 1304 CODE:
1176 map_clear (self); 1305 map_clear (self);
1177 1306
1178void 1307void
1179set_face (CFPlus::Map self, int face, int texid) 1308set_tileid (CFPlus::Map self, int face, int tile)
1180 CODE: 1309 CODE:
1181{ 1310{
1182 while (self->faces <= face) 1311 need_facenum (self, face); self->face2tile [face] = tile;
1183 { 1312 need_texid (self, tile);
1184 Append (mapface, self->face, self->faces, self->faces); 1313}
1185 self->faces *= 2;
1186 }
1187 1314
1188 self->face [face] = texid; 1315void
1316set_smooth (CFPlus::Map self, int face, int smooth, int level)
1317 CODE:
1318{
1319 tileid texid;
1320 maptex *tex;
1321
1322 if (face < 0 || face >= self->faces)
1323 return;
1324
1325 if (smooth < 0 || smooth >= self->faces)
1326 return;
1327
1328 texid = self->face2tile [face];
1329
1330 if (!texid)
1331 return;
1332
1333 tex = self->tex + texid;
1334 tex->smoothtile = self->face2tile [smooth];
1335 tex->smoothlevel = level;
1189} 1336}
1190 1337
1191void 1338void
1192set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1339set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1193 CODE: 1340 CODE:
1194{ 1341{
1195 while (self->texs <= texid) 1342 need_texid (self, texid);
1196 {
1197 Append (maptex, self->tex, self->texs, self->texs);
1198 self->texs *= 2;
1199 }
1200 1343
1201 { 1344 {
1202 maptex *tex = self->tex + texid; 1345 maptex *tex = self->tex + texid;
1203 1346
1204 tex->name = name; 1347 tex->name = name;
… …
1315 cell->stat_width = 1; 1458 cell->stat_width = 1;
1316 cell->stat_hp = *data++; 1459 cell->stat_hp = *data++;
1317 } 1460 }
1318 else if (cmd == 6) // monster width 1461 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1; 1462 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width 1463 else if (cmd == 0x47)
1321 { 1464 {
1322 if (*data == 4) 1465 if (*data == 4)
1323 ; // decode player tag 1466 ; // decode player count
1324 1467
1325 data += *data + 1; 1468 data += *data + 1;
1326 } 1469 }
1327 else if (cmd == 8) // cell flags 1470 else if (cmd == 8) // cell flags
1328 cell->flags = *data++; 1471 cell->flags = *data++;
… …
1333 } 1476 }
1334 while (ext & 0x80); 1477 while (ext & 0x80);
1335 } 1478 }
1336 else 1479 else
1337 cell->darkness = *data++ + 1; 1480 cell->darkness = *data++ + 1;
1338
1339 } 1481 }
1340 1482
1341 if (flags & 4) 1483 if (flags & 4)
1342 { 1484 {
1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1485 faceid face = (data [0] << 8) + data [1]; data += 2;
1486 need_facenum (self, face);
1487 cell->tile [0] = self->face2tile [face];
1344 } 1488 }
1345 1489
1346 if (flags & 2) 1490 if (flags & 2)
1347 { 1491 {
1348 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1492 faceid face = (data [0] << 8) + data [1]; data += 2;
1493 need_facenum (self, face);
1494 cell->tile [1] = self->face2tile [face];
1349 } 1495 }
1350 1496
1351 if (flags & 1) 1497 if (flags & 1)
1352 { 1498 {
1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1499 faceid face = (data [0] << 8) + data [1]; data += 2;
1500 need_facenum (self, face);
1501 cell->tile [2] = self->face2tile [face];
1354 } 1502 }
1355 } 1503 }
1356 else 1504 else
1357 {
1358 cell->darkness = 0; 1505 cell->darkness = 0;
1359 cell->stat_hp = 0;
1360 cell->flags = 0;
1361 cell->player = 0;
1362 }
1363 } 1506 }
1364} 1507}
1365 1508
1366SV * 1509SV *
1367mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1510mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1393 { 1536 {
1394 mapcell *cell = row->col + (x - row->c0); 1537 mapcell *cell = row->col + (x - row->c0);
1395 1538
1396 for (z = 0; z <= 0; z++) 1539 for (z = 0; z <= 0; z++)
1397 { 1540 {
1398 mapface face = cell->face [z];
1399
1400 if (face)
1401 {
1402 maptex tex = self->tex [face]; 1541 maptex tex = self->tex [cell->tile [z]];
1403 int a0 = 255 - tex.a; 1542 int a0 = 255 - tex.a;
1404 int a1 = tex.a; 1543 int a1 = tex.a;
1405 1544
1406 r = (r * a0 + tex.r * a1) / 255; 1545 r = (r * a0 + tex.r * a1) / 255;
1407 g = (g * a0 + tex.g * a1) / 255; 1546 g = (g * a0 + tex.g * a1) / 255;
1408 b = (b * a0 + tex.b * a1) / 255; 1547 b = (b * a0 + tex.b * a1) / 255;
1409 a = (a * a0 + tex.a * a1) / 255; 1548 a = (a * a0 + tex.a * a1) / 255;
1410 }
1411 } 1549 }
1412 } 1550 }
1413 1551
1414 *map++ = (r ) 1552 *map++ = (r )
1415 | (g << 8) 1553 | (g << 8)
… …
1422} 1560}
1423 OUTPUT: 1561 OUTPUT:
1424 RETVAL 1562 RETVAL
1425 1563
1426void 1564void
1427draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1565draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1428 CODE: 1566 CODE:
1429{ 1567{
1430 int vx, vy; 1568 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1569 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1570 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1571 smooth_key skey;
1431 int x, y, z; 1572 int x, y, z;
1432 int last_name; 1573 int last_name;
1433 mapface face;
1434 1574
1435 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1575 // thats current max. sorry.
1436 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1576 if (sw > 255) sw = 255;
1577 if (sh > 255) sh = 255;
1437 1578
1438 /* 1579 // clear key, in case of extra padding
1439 int vx = self->vx = self->w >= sw 1580 memset (&skey, 0, sizeof (skey));
1440 ? self->x + (self->w - sw) / 2
1441 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1442
1443 int vy = self->vy = self->h >= sh
1444 ? self->y + (self->h - sh) / 2
1445 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1446 */
1447 1581
1448 glColor4ub (255, 255, 255, 255); 1582 glColor4ub (255, 255, 255, 255);
1449 1583
1450 glEnable (GL_BLEND); 1584 glEnable (GL_BLEND);
1451 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1585 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1454 1588
1455 glBegin (GL_QUADS); 1589 glBegin (GL_QUADS);
1456 1590
1457 last_name = 0; 1591 last_name = 0;
1458 1592
1593 mx += self->x;
1594 my += self->y;
1595
1596 // first pass: determine smooth_max
1597 // rather ugly, if you ask me
1598 // could also be stored inside mapcell and updated on change
1599 memset (smooth_max, 0, sizeof (smooth_max));
1600
1601 for (y = 0; y < sh; y++)
1602 if (0 <= y + my && y + my < self->rows)
1603 {
1604 maprow *row = self->row + (y + my);
1605
1606 for (x = 0; x < sw; x++)
1607 if (row->c0 <= x + mx && x + mx < row->c1)
1608 {
1609 mapcell *cell = row->col + (x + mx - row->c0);
1610
1611 smooth_max[x + 1][y + 1] =
1612 MAX (self->tex [cell->tile [0]].smoothlevel,
1613 MAX (self->tex [cell->tile [1]].smoothlevel,
1614 self->tex [cell->tile [2]].smoothlevel));
1615 }
1616 }
1617
1459 for (z = 0; z < 3; z++) 1618 for (z = 0; z <= 2; z++)
1619 {
1620 memset (smooth_level, 0, sizeof (smooth_level));
1621
1460 for (y = 0; y < sh; y++) 1622 for (y = 0; y < sh; y++)
1461 if (0 <= y + vy && y + vy < self->rows) 1623 if (0 <= y + my && y + my < self->rows)
1462 { 1624 {
1463 maprow *row = self->row + (y + vy); 1625 maprow *row = self->row + (y + my);
1464 1626
1465 for (x = 0; x < sw; x++) 1627 for (x = 0; x < sw; x++)
1466 if (row->c0 <= x + vx && x + vx < row->c1) 1628 if (row->c0 <= x + mx && x + mx < row->c1)
1467 { 1629 {
1468 mapcell *cell = row->col + (x + vx - row->c0); 1630 mapcell *cell = row->col + (x + mx - row->c0);
1469
1470 face = cell->face [z]; 1631 tileid tile = cell->tile [z];
1632
1633 if (tile)
1634 {
1635 maptex tex = self->tex [tile];
1636 int px = (x + 1) * T - tex.w;
1637 int py = (y + 1) * T - tex.h;
1471 1638
1472 if (face && face < self->texs) 1639 // suppressing texture state switches here
1640 // is only moderately effective, but worth the extra effort
1641 if (last_name != tex.name)
1642 {
1643 if (!tex.name)
1644 tex = self->tex [2]; /* missing, replace by noface */
1645
1646 glEnd ();
1647 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1648 glBegin (GL_QUADS);
1649 }
1650
1651 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1652 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1653 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1654 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1655
1656 if (cell->flags && z == 2)
1657 {
1658 if (cell->flags & 1)
1659 {
1660 maptex tex = self->tex [1];
1661 int px = x * T + T * 2 / 32;
1662 int py = y * T - T * 6 / 32;
1663
1664 glEnd ();
1665 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1666 glBegin (GL_QUADS);
1667
1668 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1669 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1670 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1671 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1672 }
1673 }
1674
1675 // update smooth hash
1676 if (tex.smoothtile)
1677 {
1678 skey.tile = tex.smoothtile;
1679 skey.level = tex.smoothlevel;
1680
1681 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1682
1683 // add bits to current tile and all neighbours. skey.x|y is
1684 // shifted +1|+1 so we always stay positive.
1685
1686 // bits is ___n cccc CCCC bbbb
1687 // n do not draw borders&corners
1688 // c draw these corners, but...
1689 // C ... not these
1690 // b draw these borders
1691
1692 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1693 // ┃· ·· ·┃ ━━
1694
1695 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1696 // ·· ·· ·┏ ┓·
1697
1698 // full tile
1699 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1700
1701 // borders
1702 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1703 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1704 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1705 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1706
1707 // corners
1708 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1709 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1710 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1711 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1712 }
1713 }
1714 }
1715 }
1716
1717 // go through all smoothlevels, lowest to highest, then draw.
1718 // this is basically counting sort
1719 {
1720 int w, b;
1721
1722 for (w = 0; w < 256 / 32; ++w)
1723 {
1724 uint32_t smask = smooth_level [w];
1725 if (smask)
1726 for (b = 0; b < 32; ++b)
1727 if (smask & (((uint32_t)1) << b))
1473 { 1728 {
1474 maptex tex = self->tex [face]; 1729 int level = (w << 5) | b;
1475 int px = (x + 1) * 32 - tex.w; 1730 HE *he;
1476 int py = (y + 1) * 32 - tex.h;
1477 1731
1478 if (last_name != tex.name) 1732 hv_iterinit (smooth);
1733 while ((he = hv_iternext (smooth)))
1479 { 1734 {
1735 smooth_key *skey = (smooth_key *)HeKEY (he);
1736 IV bits = SvIVX (HeVAL (he));
1737
1738 if (!(bits & 0x1000)
1739 && skey->level == level
1740 && level >= smooth_max [skey->x][skey->y])
1741 {
1742 maptex tex = self->tex [skey->tile];
1743 int px = (((int)skey->x) - 1) * T;
1744 int py = (((int)skey->y) - 1) * T;
1745 int border = bits & 15;
1746 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1747 float dx = tex.s * .0625f; // 16 images/row
1748 float dy = tex.t * .5f ; // 2 images/column
1749
1750 // this time naively avoiding texture state changes
1751 // save gobs of state changes.
1752 if (last_name != tex.name)
1753 {
1754 if (!tex.name)
1755 continue; // smoothing not yet available
1756
1480 glEnd (); 1757 glEnd ();
1481 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1758 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1482 glBegin (GL_QUADS); 1759 glBegin (GL_QUADS);
1760 }
1761
1762 if (border)
1763 {
1764 float ox = border * dx;
1765
1766 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1767 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1768 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1769 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1770 }
1771
1772 if (corner)
1773 {
1774 float ox = corner * dx;
1775
1776 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1777 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1778 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1779 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1780 }
1483 } 1781 }
1484
1485 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1486 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1487 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1488 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1489 }
1490
1491 if (cell->flags && z == 2)
1492 {
1493 if (cell->flags & 1)
1494 {
1495 maptex tex = self->tex [1];
1496 int px = (x + 1) * 32 - tex.w + 2;
1497 int py = (y + 1) * 32 - tex.h - 6;
1498
1499 glEnd ();
1500 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1501 glBegin (GL_QUADS);
1502
1503 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1504 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1505 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1506 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1507 } 1782 }
1508 } 1783 }
1509 }
1510 } 1784 }
1785 }
1786
1787 hv_clear (smooth);
1788 }
1511 1789
1512 glEnd (); 1790 glEnd ();
1513 1791
1514 glDisable (GL_TEXTURE_2D); 1792 glDisable (GL_TEXTURE_2D);
1515 glDisable (GL_BLEND); 1793 glDisable (GL_BLEND);
1516 1794
1517 // top layer: overlays such as the health bar 1795 // top layer: overlays such as the health bar
1518 for (y = 0; y < sh; y++) 1796 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows) 1797 if (0 <= y + my && y + my < self->rows)
1520 { 1798 {
1521 maprow *row = self->row + (y + vy); 1799 maprow *row = self->row + (y + my);
1522 1800
1523 for (x = 0; x < sw; x++) 1801 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1) 1802 if (row->c0 <= x + mx && x + mx < row->c1)
1525 { 1803 {
1526 mapcell *cell = row->col + (x + vx - row->c0); 1804 mapcell *cell = row->col + (x + mx - row->c0);
1527 1805
1528 int px = x * 32; 1806 int px = x * T;
1529 int py = y * 32; 1807 int py = y * T;
1530 1808
1531 if (cell->stat_hp) 1809 if (cell->stat_hp)
1532 { 1810 {
1533 int width = cell->stat_width * 32; 1811 int width = cell->stat_width * T;
1534 int thick = sh / 28 + 1 + cell->stat_width; 1812 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1535 1813
1536 glColor3ub (0, 0, 0); 1814 glColor3ub (0, 0, 0);
1537 glRectf (px + 1, py - thick - 2, 1815 glRectf (px + 1, py - thick - 2,
1538 px + width - 1, py); 1816 px + width - 1, py);
1539 1817
… …
1605 glDisable (GL_BLEND); 1883 glDisable (GL_BLEND);
1606 glDisable (GL_TEXTURE_2D); 1884 glDisable (GL_TEXTURE_2D);
1607} 1885}
1608 1886
1609void 1887void
1610fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1888fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1611 PPCODE: 1889 PPCODE:
1612{ 1890{
1613 int vx, vy;
1614 int x, y; 1891 int x, y;
1615 int sw4 = (sw + 3) & ~3; 1892 int sw4 = (sw + 3) & ~3;
1616 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1893 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1617 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1894 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1618 1895
1619 memset (darkness, 255, sw4 * sh); 1896 memset (darkness, 255, sw4 * sh);
1620 SvPOK_only (darkness_sv); 1897 SvPOK_only (darkness_sv);
1621 SvCUR_set (darkness_sv, sw4 * sh); 1898 SvCUR_set (darkness_sv, sw4 * sh);
1622 1899
1623 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1900 mx += self->x;
1624 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1901 my += self->y;
1625 1902
1626 for (y = 0; y < sh; y++) 1903 for (y = 0; y < sh; y++)
1627 if (0 <= y + vy && y + vy < self->rows) 1904 if (0 <= y + my && y + my < self->rows)
1628 { 1905 {
1629 maprow *row = self->row + (y + vy); 1906 maprow *row = self->row + (y + my);
1630 1907
1631 for (x = 0; x < sw; x++) 1908 for (x = 0; x < sw; x++)
1632 if (row->c0 <= x + vx && x + vx < row->c1) 1909 if (row->c0 <= x + mx && x + mx < row->c1)
1633 { 1910 {
1634 mapcell *cell = row->col + (x + vx - row->c0); 1911 mapcell *cell = row->col + (x + mx - row->c0);
1635 1912
1636 darkness[y * sw4 + x] = cell->darkness 1913 darkness[y * sw4 + x] = cell->darkness
1637 ? 255 - (cell->darkness - 1) 1914 ? 255 - (cell->darkness - 1)
1638 : 255 - FOW_DARKNESS; 1915 : 255 - FOW_DARKNESS;
1639 } 1916 }
… …
1679 if (row && row->c0 <= x && x < row->c1) 1956 if (row && row->c0 <= x && x < row->c1)
1680 { 1957 {
1681 mapcell *cell = row->col + (x - row->c0); 1958 mapcell *cell = row->col + (x - row->c0);
1682 uint8_t flags = 0; 1959 uint8_t flags = 0;
1683 1960
1684 if (cell->face [0]) flags |= 1; 1961 if (cell->tile [0]) flags |= 1;
1685 if (cell->face [1]) flags |= 2; 1962 if (cell->tile [1]) flags |= 2;
1686 if (cell->face [2]) flags |= 4; 1963 if (cell->tile [2]) flags |= 4;
1687 1964
1688 *data++ = flags; 1965 *data++ = flags;
1689 1966
1690 if (flags & 1) 1967 if (flags & 1)
1691 { 1968 {
1969 tileid tile = cell->tile [0];
1692 *data++ = cell->face [0] >> 8; 1970 *data++ = tile >> 8;
1693 *data++ = cell->face [0]; 1971 *data++ = tile;
1694 } 1972 }
1695 1973
1696 if (flags & 2) 1974 if (flags & 2)
1697 { 1975 {
1976 tileid tile = cell->tile [1];
1698 *data++ = cell->face [1] >> 8; 1977 *data++ = tile >> 8;
1699 *data++ = cell->face [1]; 1978 *data++ = tile;
1700 } 1979 }
1701 1980
1702 if (flags & 4) 1981 if (flags & 4)
1703 { 1982 {
1983 tileid tile = cell->tile [2];
1704 *data++ = cell->face [2] >> 8; 1984 *data++ = tile >> 8;
1705 *data++ = cell->face [2]; 1985 *data++ = tile;
1706 } 1986 }
1707 } 1987 }
1708 else 1988 else
1709 *data++ = 0; 1989 *data++ = 0;
1710 } 1990 }
… …
1750 { 2030 {
1751 uint8_t flags = *data++; 2031 uint8_t flags = *data++;
1752 2032
1753 if (flags) 2033 if (flags)
1754 { 2034 {
1755 mapface face[3] = { 0, 0, 0 };
1756
1757 mapcell *cell = row_get_cell (row, x); 2035 mapcell *cell = row_get_cell (row, x);
2036 tileid tile[3] = { 0, 0, 0 };
1758 2037
1759 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2038 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1760 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2039 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1761 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2040 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1762 2041
1763 if (cell->darkness == 0) 2042 if (cell->darkness == 0)
1764 { 2043 {
1765 cell->darkness = 0; 2044 cell->darkness = 0;
1766 2045
1767 for (z = 0; z <= 2; z++) 2046 for (z = 0; z <= 2; z++)
1768 { 2047 {
1769 cell->face[z] = face[z]; 2048 tileid t = tile [z];
1770 2049
1771 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2050 if (t >= self->texs || (t && !self->tex [t].name))
2051 {
1772 XPUSHs (sv_2mortal (newSViv (face[z]))); 2052 XPUSHs (sv_2mortal (newSViv (t)));
2053 need_texid (self, t);
2054 }
2055
2056 cell->tile [z] = t;
1773 } 2057 }
1774 } 2058 }
1775 } 2059 }
1776 } 2060 }
1777 } 2061 }

Diff Legend

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