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.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.187 by root, Sat Apr 21 23:36:20 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
8#endif 9#endif
9 10
10#include "EXTERN.h" 11#include "EXTERN.h"
11#include "perl.h" 12#include "perl.h"
12#include "XSUB.h" 13#include "XSUB.h"
13 14
14#ifdef _WIN32 15#ifdef _WIN32
15# undef pipe 16# undef pipe
16#endif 17#endif
17 18
19#include <assert.h>
18#include <math.h> 20#include <math.h>
19#include <string.h> 21#include <string.h>
20#include <stdio.h> 22#include <stdio.h>
21#include <stdlib.h> 23#include <stdlib.h>
22 24
… …
37# include <sys/types.h> 39# include <sys/types.h>
38# include <sys/socket.h> 40# include <sys/socket.h>
39# include <netinet/in.h> 41# include <netinet/in.h>
40# include <netinet/tcp.h> 42# include <netinet/tcp.h>
41# include <inttypes.h> 43# 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 44#endif
50 45
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 47
53#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
54 49
55#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
… …
160 155
161 *w = rect.width; 156 *w = rect.width;
162 *h = rect.height; 157 *h = rect.height;
163} 158}
164 159
160typedef uint16_t tileid;
165typedef uint16_t mapface; 161typedef uint16_t faceid;
166 162
167typedef struct { 163typedef struct {
168 GLint name; 164 int name;
169 int w, h; 165 int w, h;
170 float s, t; 166 float s, t;
171 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
168 tileid smoothtile;
169 uint8_t smoothlevel;
172} maptex; 170} maptex;
173 171
174typedef struct { 172typedef struct {
175 uint32_t player; 173 uint32_t player;
176 mapface face[3]; 174 tileid tile[3];
177 uint16_t darkness; 175 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags; 176 uint8_t stat_width, stat_hp, flags, smoothmax;
179} mapcell; 177} mapcell;
180 178
181typedef struct { 179typedef struct {
182 int32_t c0, c1; 180 int32_t c0, c1;
183 mapcell *col; 181 mapcell *col;
184} maprow; 182} maprow;
185 183
186typedef struct map { 184typedef struct map {
187 int x, y, w, h; 185 int x, y, w, h;
188 int ox, oy; /* offset to virtual global coordinate system */ 186 int ox, oy; /* offset to virtual global coordinate system */
189 int faces; 187 int faces; tileid *face2tile; // [faceid]
190 mapface *face; 188 int texs; maptex *tex; // [tileid]
191
192 int texs;
193 maptex *tex;
194 189
195 int32_t rows; 190 int32_t rows;
196 maprow *row; 191 maprow *row;
197} *CFPlus__Map; 192} *CFPlus__Map;
198 193
… …
218 return ptr; 213 return ptr;
219} 214}
220 215
221#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))
222#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}
223 238
224static maprow * 239static maprow *
225map_get_row (CFPlus__Map self, int y) 240map_get_row (CFPlus__Map self, int y)
226{ 241{
227 if (0 > y) 242 if (0 > y)
… …
322 cell->player = 0; 337 cell->player = 0;
323 } 338 }
324 } 339 }
325} 340}
326 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
327static void 358static void
328music_finished (void) 359music_finished (void)
329{ 360{
330 SDL_UserEvent ev; 361 SDL_UserEvent ev;
331 362
… …
365 n |= n >> 16; 396 n |= n >> 16;
366 397
367 return n + 1; 398 return n + 1;
368} 399}
369 400
401/* SDL should provide this, really. */
402#define SDLK_MODIFIER_MIN 300
403#define SDLK_MODIFIER_MAX 314
404
405static AV *texture_av;
406
370MODULE = CFPlus PACKAGE = CFPlus 407MODULE = CFPlus PACKAGE = CFPlus
371 408
372PROTOTYPES: ENABLE 409PROTOTYPES: ENABLE
373 410
374BOOT: 411BOOT:
375{ 412{
413 texture_av = newAV ();
414 AvREAL_off (texture_av);
415
376 HV *stash = gv_stashpv ("CFPlus", 1); 416 HV *stash = gv_stashpv ("CFPlus", 1);
377 static const struct { 417 static const struct {
378 const char *name; 418 const char *name;
379 IV iv; 419 IV iv;
380 } *civ, const_iv[] = { 420 } *civ, const_iv[] = {
381# define const_iv(name) { # name, (IV)name } 421# define const_iv(name) { # name, (IV)name }
422 const_iv (SDLK_MODIFIER_MIN),
423 const_iv (SDLK_MODIFIER_MAX),
424
382 const_iv (SDL_ACTIVEEVENT), 425 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 426 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 427 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 428 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 429 const_iv (SDL_MOUSEBUTTONDOWN),
… …
395 const_iv (SDL_EVENT_RESERVEDA), 438 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 439 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 440 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 441 const_iv (SDL_VIDEOEXPOSE),
399 const_iv (SDL_USEREVENT), 442 const_iv (SDL_USEREVENT),
443
444 const_iv (SDL_APPINPUTFOCUS),
445 const_iv (SDL_APPMOUSEFOCUS),
446 const_iv (SDL_APPACTIVE),
447
400 const_iv (SDLK_KP0), 448 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 449 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 450 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 451 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 452 const_iv (SDLK_KP4),
… …
459 const_iv (SDLK_BREAK), 507 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 508 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 509 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 510 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 511 const_iv (SDLK_UNDO),
512
464 const_iv (KMOD_NONE), 513 const_iv (KMOD_NONE),
514 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 515 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 516 const_iv (KMOD_RSHIFT),
517 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 518 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 519 const_iv (KMOD_RCTRL),
520 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 521 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 522 const_iv (KMOD_RALT),
523 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 524 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 525 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 526 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 527 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 528 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 529# undef const_iv
481 }; 530 };
482 531
483 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 532 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 533 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
534
535 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
536 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485} 537}
538
539void
540weaken (SV *rv)
541 PROTOTYPE: $
542 CODE:
543 sv_rvweaken (rv);
486 544
487int 545int
488in_destruct () 546in_destruct ()
489 CODE: 547 CODE:
490 RETVAL = PL_main_cv == Nullcv; 548 RETVAL = PL_main_cv == Nullcv;
… …
593 case SDL_KEYDOWN: 651 case SDL_KEYDOWN:
594 case SDL_KEYUP: 652 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 653 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 654 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 655 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
656 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 657 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 658 break;
600 659
601 case SDL_ACTIVEEVENT: 660 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 661 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
647Mix_AllocateChannels (int numchans = -1) 706Mix_AllocateChannels (int numchans = -1)
648 707
649void 708void
650lowdelay (int fd, int val = 1) 709lowdelay (int fd, int val = 1)
651 CODE: 710 CODE:
652#ifndef _WIN32
653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 711 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654#endif
655 712
656void 713void
657win32_proxy_info () 714win32_proxy_info ()
658 PPCODE: 715 PPCODE:
659{ 716{
… …
794 _exit (1); 851 _exit (1);
795 852
796void 853void
797_exit (int retval = 0) 854_exit (int retval = 0)
798 CODE: 855 CODE:
856#ifdef WIN32
857 ExitThread (retval); // unclean, please beam me up
858#else
799 _exit (retval); 859 _exit (retval);
860#endif
800 861
801MODULE = CFPlus PACKAGE = CFPlus::Font 862MODULE = CFPlus PACKAGE = CFPlus::Font
802 863
803CFPlus::Font 864CFPlus::Font
804new_from_file (SV *class, char *path, int id = 0) 865new_from_file (SV *class, char *path, int id = 0)
… …
1051xy_to_index (CFPlus::Layout self, int x, int y) 1112xy_to_index (CFPlus::Layout self, int x, int y)
1052 CODE: 1113 CODE:
1053{ 1114{
1054 int index, trailing; 1115 int index, trailing;
1055 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1116 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1056 RETVAL = index; 1117 RETVAL = index + trailing;
1057} 1118}
1058 OUTPUT: 1119 OUTPUT:
1059 RETVAL 1120 RETVAL
1060 1121
1061void 1122void
… …
1067 1128
1068 EXTEND (SP, 3); 1129 EXTEND (SP, 3);
1069 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1130 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1131 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1132 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1133}
1134
1135void
1136index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1137 PPCODE:
1138{
1139 int line, x;
1140
1141 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1142 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1143
1144 EXTEND (SP, 2);
1145 PUSHs (sv_2mortal (newSViv (line - 1)));
1146 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1147}
1148
1149void
1150line_x_to_index (CFPlus::Layout self, int line, int x)
1151 PPCODE:
1152{
1153 PangoLayoutLine *lp;
1154 int index, trailing;
1155
1156 if (line < 0)
1157 XSRETURN_EMPTY;
1158
1159 if (!(lp = pango_layout_get_line (self->pl, line)))
1160 XSRETURN_EMPTY; /* do better */
1161
1162 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1163
1164 EXTEND (SP, 2);
1165 if (GIMME_V == G_SCALAR)
1166 PUSHs (sv_2mortal (newSViv (index + trailing)));
1167 else
1168 {
1169 PUSHs (sv_2mortal (newSViv (index)));
1170 PUSHs (sv_2mortal (newSViv (trailing)));
1171 }
1072} 1172}
1073 1173
1074void 1174void
1075render (CFPlus::Layout self, float x, float y, int flags = 0) 1175render (CFPlus::Layout self, float x, float y, int flags = 0)
1076 PPCODE: 1176 PPCODE:
… …
1170} 1270}
1171 1271
1172MODULE = CFPlus PACKAGE = CFPlus::Map 1272MODULE = CFPlus PACKAGE = CFPlus::Map
1173 1273
1174CFPlus::Map 1274CFPlus::Map
1175new (SV *class, int map_width, int map_height) 1275new (SV *class)
1176 CODE: 1276 CODE:
1177 New (0, RETVAL, 1, struct map); 1277 New (0, RETVAL, 1, struct map);
1178 RETVAL->x = 0; 1278 RETVAL->x = 0;
1179 RETVAL->y = 0; 1279 RETVAL->y = 0;
1180 RETVAL->w = map_width; 1280 RETVAL->w = 0;
1181 RETVAL->h = map_height; 1281 RETVAL->h = 0;
1182 RETVAL->ox = 0; 1282 RETVAL->ox = 0;
1183 RETVAL->oy = 0; 1283 RETVAL->oy = 0;
1184 RETVAL->faces = 8192; 1284 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1185 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1285 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1186 RETVAL->texs = 8192;
1187 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1188 RETVAL->rows = 0; 1286 RETVAL->rows = 0;
1189 RETVAL->row = 0; 1287 RETVAL->row = 0;
1190 OUTPUT: 1288 OUTPUT:
1191 RETVAL 1289 RETVAL
1192 1290
1193void 1291void
1194DESTROY (CFPlus::Map self) 1292DESTROY (CFPlus::Map self)
1195 CODE: 1293 CODE:
1196{ 1294{
1197 map_clear (self); 1295 map_clear (self);
1198 Safefree (self->face); 1296 Safefree (self->face2tile);
1199 Safefree (self->tex); 1297 Safefree (self->tex);
1200 Safefree (self); 1298 Safefree (self);
1201} 1299}
1202 1300
1203void 1301void
1302resize (CFPlus::Map self, int map_width, int map_height)
1303 CODE:
1304 self->w = map_width;
1305 self->h = map_height;
1306
1307void
1204clear (CFPlus::Map self) 1308clear (CFPlus::Map self)
1205 CODE: 1309 CODE:
1206 map_clear (self); 1310 map_clear (self);
1207 1311
1208void 1312void
1209set_face (CFPlus::Map self, int face, int texid) 1313set_tileid (CFPlus::Map self, int face, int tile)
1210 CODE: 1314 CODE:
1211{ 1315{
1212 while (self->faces <= face) 1316 need_facenum (self, face); self->face2tile [face] = tile;
1213 { 1317 need_texid (self, tile);
1214 Append (mapface, self->face, self->faces, self->faces); 1318}
1215 self->faces *= 2;
1216 }
1217 1319
1218 self->face [face] = texid; 1320void
1321set_smooth (CFPlus::Map self, int face, int smooth, int level)
1322 CODE:
1323{
1324 tileid texid;
1325 maptex *tex;
1326
1327 if (face < 0 || face >= self->faces)
1328 return;
1329
1330 if (smooth < 0 || smooth >= self->faces)
1331 return;
1332
1333 texid = self->face2tile [face];
1334
1335 if (!texid)
1336 return;
1337
1338 tex = self->tex + texid;
1339 tex->smoothtile = self->face2tile [smooth];
1340 tex->smoothlevel = level;
1219} 1341}
1220 1342
1221void 1343void
1222set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1344set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1223 CODE: 1345 CODE:
1224{ 1346{
1225 while (self->texs <= texid) 1347 need_texid (self, texid);
1226 {
1227 Append (maptex, self->tex, self->texs, self->texs);
1228 self->texs *= 2;
1229 }
1230 1348
1231 { 1349 {
1232 maptex *tex = self->tex + texid; 1350 maptex *tex = self->tex + texid;
1233 1351
1234 tex->name = name; 1352 tex->name = name;
… …
1278 CODE: 1396 CODE:
1279{ 1397{
1280 if (dx > 0) 1398 if (dx > 0)
1281 map_blank (self, self->x, self->y, dx, self->h); 1399 map_blank (self, self->x, self->y, dx, self->h);
1282 else if (dx < 0) 1400 else if (dx < 0)
1283 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1401 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1284 1402
1285 if (dy > 0) 1403 if (dy > 0)
1286 map_blank (self, self->x, self->y, self->w, dy); 1404 map_blank (self, self->x, self->y, self->w, dy);
1287 else if (dy < 0) 1405 else if (dy < 0)
1288 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1406 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1289 1407
1290 self->ox += dx; self->x += dx; 1408 self->ox += dx; self->x += dx;
1291 self->oy += dy; self->y += dy; 1409 self->oy += dy; self->y += dy;
1292 1410
1293 while (self->y < 0) 1411 while (self->y < 0)
… …
1345 cell->stat_width = 1; 1463 cell->stat_width = 1;
1346 cell->stat_hp = *data++; 1464 cell->stat_hp = *data++;
1347 } 1465 }
1348 else if (cmd == 6) // monster width 1466 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1; 1467 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width 1468 else if (cmd == 0x47)
1351 { 1469 {
1352 if (*data == 4) 1470 if (*data == 4)
1353 ; // decode player tag 1471 ; // decode player count
1354 1472
1355 data += *data + 1; 1473 data += *data + 1;
1356 } 1474 }
1357 else if (cmd == 8) // cell flags 1475 else if (cmd == 8) // cell flags
1358 cell->flags = *data++; 1476 cell->flags = *data++;
… …
1367 cell->darkness = *data++ + 1; 1485 cell->darkness = *data++ + 1;
1368 } 1486 }
1369 1487
1370 if (flags & 4) 1488 if (flags & 4)
1371 { 1489 {
1372 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1490 faceid face = (data [0] << 8) + data [1]; data += 2;
1491 need_facenum (self, face);
1492 cell->tile [0] = self->face2tile [face];
1373 } 1493 }
1374 1494
1375 if (flags & 2) 1495 if (flags & 2)
1376 { 1496 {
1377 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1497 faceid face = (data [0] << 8) + data [1]; data += 2;
1498 need_facenum (self, face);
1499 cell->tile [1] = self->face2tile [face];
1378 } 1500 }
1379 1501
1380 if (flags & 1) 1502 if (flags & 1)
1381 { 1503 {
1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1504 faceid face = (data [0] << 8) + data [1]; data += 2;
1505 need_facenum (self, face);
1506 cell->tile [2] = self->face2tile [face];
1383 } 1507 }
1384 } 1508 }
1385 else 1509 else
1386 cell->darkness = 0; 1510 cell->darkness = 0;
1387 } 1511 }
… …
1417 { 1541 {
1418 mapcell *cell = row->col + (x - row->c0); 1542 mapcell *cell = row->col + (x - row->c0);
1419 1543
1420 for (z = 0; z <= 0; z++) 1544 for (z = 0; z <= 0; z++)
1421 { 1545 {
1422 mapface face = cell->face [z];
1423
1424 if (face)
1425 {
1426 maptex tex = self->tex [face]; 1546 maptex tex = self->tex [cell->tile [z]];
1427 int a0 = 255 - tex.a; 1547 int a0 = 255 - tex.a;
1428 int a1 = tex.a; 1548 int a1 = tex.a;
1429 1549
1430 r = (r * a0 + tex.r * a1) / 255; 1550 r = (r * a0 + tex.r * a1) / 255;
1431 g = (g * a0 + tex.g * a1) / 255; 1551 g = (g * a0 + tex.g * a1) / 255;
1432 b = (b * a0 + tex.b * a1) / 255; 1552 b = (b * a0 + tex.b * a1) / 255;
1433 a = (a * a0 + tex.a * a1) / 255; 1553 a = (a * a0 + tex.a * a1) / 255;
1434 }
1435 } 1554 }
1436 } 1555 }
1437 1556
1438 *map++ = (r ) 1557 *map++ = (r )
1439 | (g << 8) 1558 | (g << 8)
… …
1446} 1565}
1447 OUTPUT: 1566 OUTPUT:
1448 RETVAL 1567 RETVAL
1449 1568
1450void 1569void
1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1570draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1452 CODE: 1571 CODE:
1453{ 1572{
1454 int vx, vy; 1573 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1574 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1575 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1576 smooth_key skey;
1455 int x, y, z; 1577 int x, y, z;
1456 int last_name; 1578 int last_name;
1457 mapface face;
1458 1579
1459 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1580 // thats current max. sorry.
1460 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1581 if (sw > 255) sw = 255;
1582 if (sh > 255) sh = 255;
1461 1583
1462 /* 1584 // clear key, in case of extra padding
1463 int vx = self->vx = self->w >= sw 1585 memset (&skey, 0, sizeof (skey));
1464 ? self->x + (self->w - sw) / 2
1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1466
1467 int vy = self->vy = self->h >= sh
1468 ? self->y + (self->h - sh) / 2
1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1470 */
1471 1586
1472 glColor4ub (255, 255, 255, 255); 1587 glColor4ub (255, 255, 255, 255);
1473 1588
1474 glEnable (GL_BLEND); 1589 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1590 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1478 1593
1479 glBegin (GL_QUADS); 1594 glBegin (GL_QUADS);
1480 1595
1481 last_name = 0; 1596 last_name = 0;
1482 1597
1598 mx += self->x;
1599 my += self->y;
1600
1601 // first pass: determine smooth_max
1602 // rather ugly, if you ask me
1603 // could also be stored inside mapcell and updated on change
1604 memset (smooth_max, 0, sizeof (smooth_max));
1605
1606 for (y = 0; y < sh; y++)
1607 if (0 <= y + my && y + my < self->rows)
1608 {
1609 maprow *row = self->row + (y + my);
1610
1611 for (x = 0; x < sw; x++)
1612 if (row->c0 <= x + mx && x + mx < row->c1)
1613 {
1614 mapcell *cell = row->col + (x + mx - row->c0);
1615
1616 smooth_max[x + 1][y + 1] =
1617 MAX (self->tex [cell->tile [0]].smoothlevel,
1618 MAX (self->tex [cell->tile [1]].smoothlevel,
1619 self->tex [cell->tile [2]].smoothlevel));
1620 }
1621 }
1622
1483 for (z = 0; z < 3; z++) 1623 for (z = 0; z <= 2; z++)
1624 {
1625 memset (smooth_level, 0, sizeof (smooth_level));
1626
1484 for (y = 0; y < sh; y++) 1627 for (y = 0; y < sh; y++)
1485 if (0 <= y + vy && y + vy < self->rows) 1628 if (0 <= y + my && y + my < self->rows)
1486 { 1629 {
1487 maprow *row = self->row + (y + vy); 1630 maprow *row = self->row + (y + my);
1488 1631
1489 for (x = 0; x < sw; x++) 1632 for (x = 0; x < sw; x++)
1490 if (row->c0 <= x + vx && x + vx < row->c1) 1633 if (row->c0 <= x + mx && x + mx < row->c1)
1491 { 1634 {
1492 mapcell *cell = row->col + (x + vx - row->c0); 1635 mapcell *cell = row->col + (x + mx - row->c0);
1493
1494 face = cell->face [z]; 1636 tileid tile = cell->tile [z];
1637
1638 if (tile)
1639 {
1640 maptex tex = self->tex [tile];
1641 int px = (x + 1) * T - tex.w;
1642 int py = (y + 1) * T - tex.h;
1495 1643
1496 if (face && face < self->texs) 1644 // suppressing texture state switches here
1645 // is only moderately effective, but worth the extra effort
1646 if (last_name != tex.name)
1647 {
1648 if (!tex.name)
1649 tex = self->tex [2]; /* missing, replace by noface */
1650
1651 glEnd ();
1652 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1653 glBegin (GL_QUADS);
1654 }
1655
1656 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1657 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1658 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1659 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1660
1661 if (cell->flags && z == 2)
1662 {
1663 if (cell->flags & 1)
1664 {
1665 maptex tex = self->tex [1];
1666 int px = x * T + T * 2 / 32;
1667 int py = y * T - T * 6 / 32;
1668
1669 glEnd ();
1670 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1671 glBegin (GL_QUADS);
1672
1673 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1674 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1675 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1676 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1677 }
1678 }
1679
1680 // update smooth hash
1681 if (tex.smoothtile)
1682 {
1683 skey.tile = tex.smoothtile;
1684 skey.level = tex.smoothlevel;
1685
1686 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1687
1688 // add bits to current tile and all neighbours. skey.x|y is
1689 // shifted +1|+1 so we always stay positive.
1690
1691 // bits is ___n cccc CCCC bbbb
1692 // n do not draw borders&corners
1693 // c draw these corners, but...
1694 // C ... not these
1695 // b draw these borders
1696
1697 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1698 // ┃· ·· ·┃ ━━
1699
1700 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1701 // ·· ·· ·┏ ┓·
1702
1703 // full tile
1704 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1705
1706 // borders
1707 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1708 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1709 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1710 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1711
1712 // corners
1713 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1714 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1715 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1716 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1717 }
1718 }
1719 }
1720 }
1721
1722 // go through all smoothlevels, lowest to highest, then draw.
1723 // this is basically counting sort
1724 {
1725 int w, b;
1726
1727 for (w = 0; w < 256 / 32; ++w)
1728 {
1729 uint32_t smask = smooth_level [w];
1730 if (smask)
1731 for (b = 0; b < 32; ++b)
1732 if (smask & (((uint32_t)1) << b))
1497 { 1733 {
1498 maptex tex = self->tex [face]; 1734 int level = (w << 5) | b;
1499 int px = (x + 1) * 32 - tex.w; 1735 HE *he;
1500 int py = (y + 1) * 32 - tex.h;
1501 1736
1502 if (last_name != tex.name) 1737 hv_iterinit (smooth);
1738 while ((he = hv_iternext (smooth)))
1503 { 1739 {
1740 smooth_key *skey = (smooth_key *)HeKEY (he);
1741 IV bits = SvIVX (HeVAL (he));
1742
1743 if (!(bits & 0x1000)
1744 && skey->level == level
1745 && level >= smooth_max [skey->x][skey->y])
1746 {
1747 maptex tex = self->tex [skey->tile];
1748 int px = (((int)skey->x) - 1) * T;
1749 int py = (((int)skey->y) - 1) * T;
1750 int border = bits & 15;
1751 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1752 float dx = tex.s * .0625f; // 16 images/row
1753 float dy = tex.t * .5f ; // 2 images/column
1754
1755 // this time naively avoiding texture state changes
1756 // save gobs of state changes.
1757 if (last_name != tex.name)
1758 {
1759 if (!tex.name)
1760 continue; // smoothing not yet available
1761
1504 glEnd (); 1762 glEnd ();
1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1763 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1506 glBegin (GL_QUADS); 1764 glBegin (GL_QUADS);
1765 }
1766
1767 if (border)
1768 {
1769 float ox = border * dx;
1770
1771 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1772 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1773 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1774 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1775 }
1776
1777 if (corner)
1778 {
1779 float ox = corner * dx;
1780
1781 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1782 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1783 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1784 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1785 }
1507 } 1786 }
1508
1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1)
1518 {
1519 maptex tex = self->tex [1];
1520 int px = (x + 1) * 32 - tex.w + 2;
1521 int py = (y + 1) * 32 - tex.h - 6;
1522
1523 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525 glBegin (GL_QUADS);
1526
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531 } 1787 }
1532 } 1788 }
1533 }
1534 } 1789 }
1790 }
1791
1792 hv_clear (smooth);
1793 }
1535 1794
1536 glEnd (); 1795 glEnd ();
1537 1796
1538 glDisable (GL_TEXTURE_2D); 1797 glDisable (GL_TEXTURE_2D);
1539 glDisable (GL_BLEND); 1798 glDisable (GL_BLEND);
1540 1799
1541 // top layer: overlays such as the health bar 1800 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++) 1801 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows) 1802 if (0 <= y + my && y + my < self->rows)
1544 { 1803 {
1545 maprow *row = self->row + (y + vy); 1804 maprow *row = self->row + (y + my);
1546 1805
1547 for (x = 0; x < sw; x++) 1806 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1) 1807 if (row->c0 <= x + mx && x + mx < row->c1)
1549 { 1808 {
1550 mapcell *cell = row->col + (x + vx - row->c0); 1809 mapcell *cell = row->col + (x + mx - row->c0);
1551 1810
1552 int px = x * 32; 1811 int px = x * T;
1553 int py = y * 32; 1812 int py = y * T;
1554 1813
1555 if (cell->stat_hp) 1814 if (cell->stat_hp)
1556 { 1815 {
1557 int width = cell->stat_width * 32; 1816 int width = cell->stat_width * T;
1558 int thick = sh / 28 + 1 + cell->stat_width; 1817 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1559 1818
1560 glColor3ub (0, 0, 0); 1819 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2, 1820 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py); 1821 px + width - 1, py);
1563 1822
… …
1629 glDisable (GL_BLEND); 1888 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D); 1889 glDisable (GL_TEXTURE_2D);
1631} 1890}
1632 1891
1633void 1892void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1893fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1635 PPCODE: 1894 PPCODE:
1636{ 1895{
1637 int vx, vy;
1638 int x, y; 1896 int x, y;
1639 int sw4 = (sw + 3) & ~3; 1897 int sw4 = (sw + 3) & ~3;
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1898 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1899 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1642 1900
1643 memset (darkness, 255, sw4 * sh); 1901 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv); 1902 SvPOK_only (darkness_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh); 1903 SvCUR_set (darkness_sv, sw4 * sh);
1646 1904
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1905 mx += self->x;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1906 my += self->y;
1649 1907
1650 for (y = 0; y < sh; y++) 1908 for (y = 0; y < sh; y++)
1651 if (0 <= y + vy && y + vy < self->rows) 1909 if (0 <= y + my && y + my < self->rows)
1652 { 1910 {
1653 maprow *row = self->row + (y + vy); 1911 maprow *row = self->row + (y + my);
1654 1912
1655 for (x = 0; x < sw; x++) 1913 for (x = 0; x < sw; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1) 1914 if (row->c0 <= x + mx && x + mx < row->c1)
1657 { 1915 {
1658 mapcell *cell = row->col + (x + vx - row->c0); 1916 mapcell *cell = row->col + (x + mx - row->c0);
1659 1917
1660 darkness[y * sw4 + x] = cell->darkness 1918 darkness[y * sw4 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1) 1919 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS; 1920 : 255 - FOW_DARKNESS;
1663 } 1921 }
… …
1703 if (row && row->c0 <= x && x < row->c1) 1961 if (row && row->c0 <= x && x < row->c1)
1704 { 1962 {
1705 mapcell *cell = row->col + (x - row->c0); 1963 mapcell *cell = row->col + (x - row->c0);
1706 uint8_t flags = 0; 1964 uint8_t flags = 0;
1707 1965
1708 if (cell->face [0]) flags |= 1; 1966 if (cell->tile [0]) flags |= 1;
1709 if (cell->face [1]) flags |= 2; 1967 if (cell->tile [1]) flags |= 2;
1710 if (cell->face [2]) flags |= 4; 1968 if (cell->tile [2]) flags |= 4;
1711 1969
1712 *data++ = flags; 1970 *data++ = flags;
1713 1971
1714 if (flags & 1) 1972 if (flags & 1)
1715 { 1973 {
1974 tileid tile = cell->tile [0];
1716 *data++ = cell->face [0] >> 8; 1975 *data++ = tile >> 8;
1717 *data++ = cell->face [0]; 1976 *data++ = tile;
1718 } 1977 }
1719 1978
1720 if (flags & 2) 1979 if (flags & 2)
1721 { 1980 {
1981 tileid tile = cell->tile [1];
1722 *data++ = cell->face [1] >> 8; 1982 *data++ = tile >> 8;
1723 *data++ = cell->face [1]; 1983 *data++ = tile;
1724 } 1984 }
1725 1985
1726 if (flags & 4) 1986 if (flags & 4)
1727 { 1987 {
1988 tileid tile = cell->tile [2];
1728 *data++ = cell->face [2] >> 8; 1989 *data++ = tile >> 8;
1729 *data++ = cell->face [2]; 1990 *data++ = tile;
1730 } 1991 }
1731 } 1992 }
1732 else 1993 else
1733 *data++ = 0; 1994 *data++ = 0;
1734 } 1995 }
… …
1774 { 2035 {
1775 uint8_t flags = *data++; 2036 uint8_t flags = *data++;
1776 2037
1777 if (flags) 2038 if (flags)
1778 { 2039 {
1779 mapface face[3] = { 0, 0, 0 };
1780
1781 mapcell *cell = row_get_cell (row, x); 2040 mapcell *cell = row_get_cell (row, x);
2041 tileid tile[3] = { 0, 0, 0 };
1782 2042
1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2043 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2044 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2045 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1786 2046
1787 if (cell->darkness == 0) 2047 if (cell->darkness == 0)
1788 { 2048 {
1789 cell->darkness = 0; 2049 cell->darkness = 0;
1790 2050
1791 for (z = 0; z <= 2; z++) 2051 for (z = 0; z <= 2; z++)
1792 { 2052 {
1793 cell->face[z] = face[z]; 2053 tileid t = tile [z];
1794 2054
1795 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2055 if (t >= self->texs || (t && !self->tex [t].name))
2056 {
1796 XPUSHs (sv_2mortal (newSViv (face[z]))); 2057 XPUSHs (sv_2mortal (newSViv (t)));
2058 need_texid (self, t);
2059 }
2060
2061 cell->tile [z] = t;
1797 } 2062 }
1798 } 2063 }
1799 } 2064 }
1800 } 2065 }
1801 } 2066 }
… …
2110 2375
2111int glGenTexture () 2376int glGenTexture ()
2112 CODE: 2377 CODE:
2113{ 2378{
2114 GLuint name; 2379 GLuint name;
2380 if (AvFILL (texture_av) >= 0)
2381 name = (GLuint)av_pop (texture_av);
2382 else
2115 glGenTextures (1, &name); 2383 glGenTextures (1, &name);
2116 RETVAL = name; 2384 RETVAL = name;
2117} 2385}
2118 OUTPUT: 2386 OUTPUT:
2119 RETVAL 2387 RETVAL
2120 2388
2121void glDeleteTexture (int name) 2389void glDeleteTexture (int name)
2122 CODE: 2390 CODE:
2123{ 2391{
2124 GLuint name_ = name; 2392 /* make a half-assed attempt at returning the memory used by the texture */
2393 /* textures are frequently being reused by cfplus anyway */
2394 glBindTexture (GL_TEXTURE_2D, name);
2395 glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2396 av_push (texture_av, (SV *)name);
2125 glDeleteTextures (1, &name_); 2397 /*glDeleteTextures (1, &name_);*/
2126} 2398}
2127 2399
2128int glGenList () 2400int glGenList ()
2129 CODE: 2401 CODE:
2130 RETVAL = glGenLists (1); 2402 RETVAL = glGenLists (1);

Diff Legend

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